From fc89e8643bd80051686ba4f29ae22ab05e01700d Mon Sep 17 00:00:00 2001 From: sss Date: Sat, 16 Dec 2017 23:21:29 +0300 Subject: [PATCH] applications-17.12.0:ver.bump --- .../applications/kleopatra/files/qt5.patch | 35 +++++++++++++++++++ desktop/kde/applications/kleopatra/pspec.xml | 3 ++ 2 files changed, 38 insertions(+) create mode 100644 desktop/kde/applications/kleopatra/files/qt5.patch diff --git a/desktop/kde/applications/kleopatra/files/qt5.patch b/desktop/kde/applications/kleopatra/files/qt5.patch new file mode 100644 index 0000000000..66c59623b4 --- /dev/null +++ b/desktop/kde/applications/kleopatra/files/qt5.patch @@ -0,0 +1,35 @@ +diff -Nuar a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2017-12-08 04:01:41.000000000 +0300 ++++ b/CMakeLists.txt 2017-12-16 23:06:41.830377891 +0300 +@@ -12,7 +12,7 @@ + set(KF5_VERSION "5.39.0") + set(KMIME_VERSION "5.7.0") + set(LIBKLEO_VERSION "5.7.0") +-set(QT_REQUIRED_VERSION "5.8.0") ++set(QT_REQUIRED_VERSION "5.7.1") + set(GPGME_REQUIRED_VERSION "1.8.0") + + find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) +diff -Nuar a/src/utils/systemtrayicon.cpp b/src/utils/systemtrayicon.cpp +--- a/src/utils/systemtrayicon.cpp 2017-12-06 14:46:42.000000000 +0300 ++++ b/src/utils/systemtrayicon.cpp 2017-12-16 23:14:33.923343827 +0300 +@@ -174,7 +174,9 @@ + case QEvent::Close: + doMainWindowClosed(static_cast(o)); + // fall through: ++#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) + Q_FALLTHROUGH(); ++#endif + case QEvent::Show: + case QEvent::DeferredDelete: + QMetaObject::invokeMethod(this, "slotEnableDisableActions", Qt::QueuedConnection); +@@ -185,7 +187,9 @@ + case QEvent::Close: + doAttentionWindowClosed(static_cast(o)); + // fall through: ++#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) + Q_FALLTHROUGH(); ++#endif + case QEvent::Show: + case QEvent::DeferredDelete: + QMetaObject::invokeMethod(this, "slotEnableDisableActions", Qt::QueuedConnection); diff --git a/desktop/kde/applications/kleopatra/pspec.xml b/desktop/kde/applications/kleopatra/pspec.xml index a1f5235342..53201c300d 100644 --- a/desktop/kde/applications/kleopatra/pspec.xml +++ b/desktop/kde/applications/kleopatra/pspec.xml @@ -27,6 +27,9 @@ gpgme-devel kitemmodels-devel + + qt5.patch +