From 73f840488f9b685a6bbf7d73bd54d05dc74f3e2c Mon Sep 17 00:00:00 2001 From: sss Date: Sat, 16 Dec 2017 22:27:06 +0300 Subject: [PATCH] applications-17.12.0:ver.bump --- .../applications/libkdepim/files/qt5.patch | 25 +++++++++++++++++++ desktop/kde/applications/libkdepim/pspec.xml | 7 ++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 desktop/kde/applications/libkdepim/files/qt5.patch diff --git a/desktop/kde/applications/libkdepim/files/qt5.patch b/desktop/kde/applications/libkdepim/files/qt5.patch new file mode 100644 index 0000000000..3b7feda924 --- /dev/null +++ b/desktop/kde/applications/libkdepim/files/qt5.patch @@ -0,0 +1,25 @@ +diff -Nuar a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2017-12-08 04:04:03.000000000 +0300 ++++ b/CMakeLists.txt 2017-12-16 22:15:57.334597567 +0300 +@@ -25,7 +25,7 @@ + + set(LIBKDEPIM_LIB_VERSION ${PIM_VERSION}) + set(AKONADICONTACT_LIB_VERSION "5.7.0") +-set(QT_REQUIRED_VERSION "5.8.0") ++set(QT_REQUIRED_VERSION "5.7.1") + set(KLDAP_LIB_VERSION "5.7.0") + set(KCONTACTS_LIB_VERSION "5.7.0") + set(AKONADISEARCH_LIB_VERSION "5.7.0") +diff -Nuar a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp +--- a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp 2017-12-04 13:20:38.000000000 +0300 ++++ b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp 2017-12-16 22:23:46.137563740 +0300 +@@ -498,7 +498,9 @@ + break; + } + //else: fall-through to the CompletionPopup case ++#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) + Q_FALLTHROUGH(); ++#endif + + case KCompletion::CompletionPopup: + { diff --git a/desktop/kde/applications/libkdepim/pspec.xml b/desktop/kde/applications/libkdepim/pspec.xml index 303117a143..dc89aa3ba8 100644 --- a/desktop/kde/applications/libkdepim/pspec.xml +++ b/desktop/kde/applications/libkdepim/pspec.xml @@ -45,6 +45,9 @@ akonadi-search-devel akonadi-mime-devel + + qt5.patch + @@ -101,9 +104,9 @@ - 2017-12-15 + 2017-12-16 17.12.0 - Version bump. + Version bump Mustafa Cinasal muscnsl@gmail.com