From b361c7158c1c895f45f6c74be56643083042d764 Mon Sep 17 00:00:00 2001 From: sss Date: Sat, 16 Dec 2017 13:32:52 +0300 Subject: [PATCH] kcontacts:ver.bump --- .../applications/kcontacts/files/qt5.patch | 25 +++++++++++++++++++ desktop/kde/applications/kcontacts/pspec.xml | 5 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 desktop/kde/applications/kcontacts/files/qt5.patch diff --git a/desktop/kde/applications/kcontacts/files/qt5.patch b/desktop/kde/applications/kcontacts/files/qt5.patch new file mode 100644 index 0000000000..b6e50bcfde --- /dev/null +++ b/desktop/kde/applications/kcontacts/files/qt5.patch @@ -0,0 +1,25 @@ +diff -Nuar a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2017-12-08 04:01:29.000000000 +0300 ++++ b/CMakeLists.txt 2017-12-16 13:20:44.507808201 +0300 +@@ -4,7 +4,7 @@ + project(KContacts VERSION ${PIM_VERSION}) + + # ECM setup +-set(QT_REQUIRED_VERSION "5.8.0") ++set(QT_REQUIRED_VERSION "5.7.1") + set(KF5_VERSION "5.39.0") + + find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) +diff -Nuar a/src/vcardparser/vcardparser.cpp b/src/vcardparser/vcardparser.cpp +--- a/src/vcardparser/vcardparser.cpp 2017-12-02 10:20:32.000000000 +0300 ++++ b/src/vcardparser/vcardparser.cpp 2017-12-16 13:28:28.299774737 +0300 +@@ -183,7 +183,9 @@ + start = pos + 1; + } + // fall-through intended ++#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) + Q_FALLTHROUGH(); ++#endif + case StateAfterParamValue: + if (ch == ';') { + state = StateParamKey; diff --git a/desktop/kde/applications/kcontacts/pspec.xml b/desktop/kde/applications/kcontacts/pspec.xml index 8de9d0e4da..c4ff4168b0 100644 --- a/desktop/kde/applications/kcontacts/pspec.xml +++ b/desktop/kde/applications/kcontacts/pspec.xml @@ -22,6 +22,9 @@ kio-devel extra-cmake-modules + + qt5.patch + @@ -58,7 +61,7 @@ - 2017-12-15 + 2017-12-16 17.12.0 Version bump. Mustafa Cinasal