rpm/kdelibs4support
SHA256
1
0
Fork 0
forked from pool/kdelibs4support
Code Pull Requests Activity

Accepting request 486382 from home:wolfi323:test

Browse Source 
- Drop use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch as we don't build against Qt 5.5.1 any more

OBS-URL: https://build.opensuse.org/request/show/486382
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdelibs4support?expand=0&rev=134
This commit is contained in:
Fabian Vogt 2017-04-08 12:18:44 +00:00 committed by Git OBS Bridge
parent c37b8527fb
commit 5daa1b60bd
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kdelibs4support.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 7 11:16:04 UTC 2017 - wbauer@tmo.at
- Drop use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch
as we don't build against Qt 5.5.1 any more
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Mar 19 14:50:31 CET 2017 - lbeltrame@kde.org Sun Mar 19 14:50:31 CET 2017 - lbeltrame@kde.org

6
kdelibs4support.spec
View File

@ -76,9 +76,6 @@ Group: System/GUI/KDE
Url: http://www.kde.org Url: http://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/portingAids/%{name}-%{version}.tar.xz Source: http://download.kde.org/stable/frameworks/%{_tar_path}/portingAids/%{name}-%{version}.tar.xz
Source1: baselibs.conf Source1: baselibs.conf
# 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#95.310
Patch0: use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -191,9 +188,6 @@ KDEDIRS environment variable correctly. Development files.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%if 0%{?is_opensuse} || 0%{?suse_version} > 1315
%patch0 -p1
%endif
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build

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

@ -1,13 +0,0 @@
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();
QGuiApplication::setDesktopSettingsAware(false);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1)
QGuiApplication::setFallbackSessionManagementEnabled(false);
#endif