From 7f049b32b70d5ec5ec10842894b451b51dc1223f Mon Sep 17 00:00:00 2001 From: sss Date: Sun, 17 Dec 2017 00:20:47 +0300 Subject: [PATCH] applications-17.12.0:ver.bump --- .../applications/mailimporter/files/qt5.patch | 25 +++++++++++++++++++ .../kde/applications/mailimporter/pspec.xml | 5 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 desktop/kde/applications/mailimporter/files/qt5.patch diff --git a/desktop/kde/applications/mailimporter/files/qt5.patch b/desktop/kde/applications/mailimporter/files/qt5.patch new file mode 100644 index 0000000000..b790813d83 --- /dev/null +++ b/desktop/kde/applications/mailimporter/files/qt5.patch @@ -0,0 +1,25 @@ +diff -Nuar a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2017-12-08 04:04:19.000000000 +0300 ++++ b/CMakeLists.txt 2017-12-17 00:13:48.399087354 +0300 +@@ -28,7 +28,7 @@ + + set(AKONADIMIME_LIB_VERSION "5.7.0") + set(KDEPIM_LIB_VERSION "5.7.0") +-set(QT_REQUIRED_VERSION "5.8.0") ++set(QT_REQUIRED_VERSION "5.7.1") + set(KMIME_LIB_VERSION "5.7.0") + set(AKONADI_VERSION "5.7.0") + +diff -Nuar a/src/mailimporter/filters/filterlnotes.cpp b/src/mailimporter/filters/filterlnotes.cpp +--- a/src/mailimporter/filters/filterlnotes.cpp 2017-12-04 13:20:16.000000000 +0300 ++++ b/src/mailimporter/filters/filterlnotes.cpp 2017-12-17 00:18:28.129067170 +0300 +@@ -132,7 +132,9 @@ + tempfile->setAutoRemove(false); + tempfile->open(); + // fall through ++#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) + Q_FALLTHROUGH(); ++#endif + // inside a message state + case 1: + if (ch == 0x0c) { diff --git a/desktop/kde/applications/mailimporter/pspec.xml b/desktop/kde/applications/mailimporter/pspec.xml index f153b750de..40190607d4 100644 --- a/desktop/kde/applications/mailimporter/pspec.xml +++ b/desktop/kde/applications/mailimporter/pspec.xml @@ -51,6 +51,9 @@ akonadi-mime-devel akonadi-contacts-devel + + qt5.patch + @@ -91,7 +94,7 @@ - 2017-12-15 + 2017-12-16 17.12.0 Version bump. Mustafa Cinasal