pool/kdelibs4support
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdelibs4support?expand=0&rev=84

Browse Source
This commit is contained in:
Hrvoje Senjan 2016-02-22 16:19:50 +00:00 committed by Git OBS Bridge
parent 5771116c3c
commit 5f6d3353c6
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kdelibs4support.changes
View File

@ -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

6
kdelibs4support.spec
View File

@ -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

13
use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch Normal file
View File

@ -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