From 5f6d3353c60764b6d748c32cd5af75bb22d728b03530a1bb90d00a033570ec2a Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 22 Feb 2016 16:19:50 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdelibs4support?expand=0&rev=84 --- kdelibs4support.changes | 6 ++++++ kdelibs4support.spec | 6 ++++++ ...ackSessionManagementEnabled-API-with-5.5.1.patch | 13 +++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch diff --git a/kdelibs4support.changes b/kdelibs4support.changes index 9e8933d..6559579 100644 --- a/kdelibs4support.changes +++ b/kdelibs4support.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 22 16:16:03 UTC 2016 - hrvoje.senjan@gmail.com + +- Add and enable use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch + on 42.1 Leap only, for now (kde#354724, boo#955280) + ------------------------------------------------------------------- Wed Feb 17 22:07:24 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kdelibs4support.spec b/kdelibs4support.spec index f3a1b7e..d7b8cf4 100644 --- a/kdelibs4support.spec +++ b/kdelibs4support.spec @@ -78,6 +78,9 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/portingAi Source1: baselibs.conf # PATCH-FIX-UPSTREAM fix-session-saving.patch -- kde#354724, boo#955280 Patch0: fix-session-saving.patch +# PATCH-FIX-UPSTREAM use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch -- We can enable usage of setFallbackSessionManagementEnabled function +# with Qt 5.5.1, as we have the qtbase patch backported. For now only apppy patch on 42.1 Leap, as TW doesn't have that patch yet -- #354724, boo#955280 +Patch1: use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -191,6 +194,9 @@ KDEDIRS environment variable correctly. Development files. %prep %setup -q %patch0 -p1 +%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} +%patch1 -p1 +%endif %build %cmake_kf5 -d build diff --git a/use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch b/use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch new file mode 100644 index 0000000..8eadb43 --- /dev/null +++ b/use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch @@ -0,0 +1,13 @@ +diff --git a/src/kdeui/kapplication.cpp b/src/kdeui/kapplication.cpp +index 54fd1de..631dc2b 100644 +--- a/src/kdeui/kapplication.cpp ++++ b/src/kdeui/kapplication.cpp +@@ -380,7 +380,7 @@ void KApplicationPrivate::init(bool GUIenabled) + parseCommandLine(); + + QApplication::setDesktopSettingsAware(false); +-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) ++#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1) + QGuiApplication::setFallbackSessionManagementEnabled(false); + #endif +