diff --git a/kdelibs4support.changes b/kdelibs4support.changes index 62d3e7a..8aad09e 100644 --- a/kdelibs4support.changes +++ b/kdelibs4support.changes @@ -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 diff --git a/kdelibs4support.spec b/kdelibs4support.spec index bd5ecca..10bd183 100644 --- a/kdelibs4support.spec +++ b/kdelibs4support.spec @@ -76,9 +76,6 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/portingAids/%{name}-%{version}.tar.xz 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 %description @@ -191,9 +188,6 @@ KDEDIRS environment variable correctly. Development files. %lang_package %prep %setup -q -%if 0%{?is_opensuse} || 0%{?suse_version} > 1315 -%patch0 -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 deleted file mode 100644 index ec98626..0000000 --- a/use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch +++ /dev/null @@ -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 -