kde-kf5: Remove obsolete qtbase no-session patches

We enable qtbase session-management explicitly now

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch

@@ -1,138 +0,0 @@
-From 4a7075fadc37994e3cea0b0f008fc3bfd26ffd9c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Mon, 8 Dec 2014 13:13:15 +0100
-Subject: [PATCH 2/3] fix build for QT_NO_SESSIONMANAGER
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-
----
- src/kdeui/kapplication.cpp       | 10 ++++++++++
- src/kdeui/ksessionmanager.cpp    |  2 ++
- src/kdeui/ksessionmanager.h      |  2 ++
- src/kdeui/kuniqueapplication.cpp |  4 ++++
- 4 files changed, 18 insertions(+)
-
-diff --git a/src/kdeui/kapplication.cpp b/src/kdeui/kapplication.cpp
-index f42d6bd..83452f1 100644
---- a/src/kdeui/kapplication.cpp
-+++ b/src/kdeui/kapplication.cpp
-@@ -502,7 +502,11 @@ KApplication *KApplication::kApplication()
- 
- KConfig *KApplication::sessionConfig()
- {
-+#ifdef QT_NO_SESSIONMANAGER
-+    return NULL;
-+#else
-     return KConfigGui::sessionConfig();
-+#endif
- }
- 
- void KApplication::reparseConfiguration()
-@@ -552,6 +556,7 @@ void KApplication::commitData(QSessionManager &sm)
-     d->session_save = true;
-     bool canceled = false;
- 
-+#ifndef QT_NO_SESSIONMANAGER
-     foreach (KSessionManager *it, KSessionManager::sessionClients()) {
-         if ((canceled = !it->commitData(sm))) {
-             break;
-@@ -605,9 +610,11 @@ void KApplication::commitData(QSessionManager &sm)
-     if (canceled) {
-         sm.cancel();
-     }
-+#endif // QT_NO_SESSIONMANAGER
-     d->session_save = false;
- }
- 
-+#ifndef QT_NO_SESSIONMANAGER
- #if HAVE_X11 && QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- static void checkRestartVersion(QSessionManager &sm)
- {
-@@ -642,6 +649,7 @@ static void checkRestartVersion(QSessionManager &sm)
-     }
- }
- #endif // HAVE_X11
-+#endif // QT_NO_SESSIONMANAGER
- 
- void KApplication::saveState(QSessionManager &sm)
- {
-@@ -649,6 +657,7 @@ void KApplication::saveState(QSessionManager &sm)
- #ifdef __GNUC__
- #warning TODO: QSessionManager::handle() is gone in Qt5!
- #endif
-+#ifndef QT_NO_SESSIONMANAGER
- #if HAVE_X11 && QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-     static bool firstTime = true;
-     mySmcConnection = (SmcConn) sm.handle();
-@@ -725,6 +734,7 @@ void KApplication::saveState(QSessionManager &sm)
- #else
-     Q_UNUSED(sm);
- #endif
-+#endif // QT_NO_SESSIONMANAGER
-     d->session_save = false;
- }
- 
-diff --git a/src/kdeui/ksessionmanager.cpp b/src/kdeui/ksessionmanager.cpp
-index 3d5edd5..f6cf6ee 100644
---- a/src/kdeui/ksessionmanager.cpp
-+++ b/src/kdeui/ksessionmanager.cpp
-@@ -32,6 +32,7 @@ KSessionManager::~KSessionManager()
-     sessionClients().removeAll(this);
- }
- 
-+#ifndef QT_NO_SESSIONMANAGER
- bool KSessionManager::saveState(QSessionManager &)
- {
-     return true;
-@@ -41,6 +42,7 @@ bool KSessionManager::commitData(QSessionManager &)
- {
-     return true;
- }
-+#endif // QT_NO_SESSIONMANAGER
- 
- QList<KSessionManager *> &KSessionManager::sessionClients()
- {
-diff --git a/src/kdeui/ksessionmanager.h b/src/kdeui/ksessionmanager.h
-index e7462a4..bea2243 100644
---- a/src/kdeui/ksessionmanager.h
-+++ b/src/kdeui/ksessionmanager.h
-@@ -62,6 +62,7 @@ public:
- 
-        @deprecated Since 5.0 connect to the signal QGuiApplication::saveStateRequest(QSessionManager &)
-      */
-+#ifndef QT_NO_SESSIONMANAGER
-     virtual bool saveState(QSessionManager &sm);
-     /**
-        See QApplication::commitData() for documentation.
-@@ -75,6 +76,7 @@ public:
-        @deprecated Since 5.0 connect to the signal QGuiApplication::commitDataRequest(QSessionManager &)
-      */
-     virtual bool commitData(QSessionManager &sm);
-+#endif QT_NO_SESSIONMANAGER
- 
-     static QList<KSessionManager *> &sessionClients();
- 
-diff --git a/src/kdeui/kuniqueapplication.cpp b/src/kdeui/kuniqueapplication.cpp
-index 1d7b3f0..b225f8b 100644
---- a/src/kdeui/kuniqueapplication.cpp
-+++ b/src/kdeui/kuniqueapplication.cpp
-@@ -349,7 +349,11 @@ void KUniqueApplication::Private::_k_newInstanceNoFork()
- 
- bool KUniqueApplication::restoringSession()
- {
-+#ifdef QT_NO_SESSIONMANAGER
-+    return false;
-+#else
-     return d->firstInstance && isSessionRestored();
-+#endif
- }
- 
- int KUniqueApplication::newInstance()
--- 
-1.8.3.1
-

recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb

@@ -13,5 +13,5 @@ DEPENDS += " \
 "
 
 SRC_URI += " \
-	file://0003-only-build-kf5-config-for-native.patch \
+	file://0002-only-build-kf5-config-for-native.patch \
 "

recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb

@@ -37,7 +37,7 @@ DEPENDS += " \
 "
 
 SRC_URI += " \
-	file://0004-Hack-away-SSL-configure-check.patch \
+	file://0003-Hack-away-SSL-configure-check.patch \
 "
 # uncomment for broken gelib getaddr / AI_PASSIVE
 #EXTRA_OECMAKE += "-DHAVE_GOOD_GETADDRINFO=OFF"

recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc

@@ -14,5 +14,4 @@ EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
 SRC_URI += " \
 	file://0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch \
-	file://0002-fix-build-for-QT_NO_SESSIONMANAGER.patch \
 "

recipes-kde/kf5/tier1/kconfig/files/0001-kconfiggui-do-only-compile-in-case-sessions-are-aval.patch

@@ -1,35 +0,0 @@
-From d372a1593e1d22e84034ac3ea14d401d5ae4ef71 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 17 Jun 2015 10:00:25 +0200
-Subject: [PATCH 1/2] kconfiggui: do only compile in case sessions are
- avaliable
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/gui/kconfiggui.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gui/kconfiggui.cpp b/src/gui/kconfiggui.cpp
-index 67b6009..e313ff4 100644
---- a/src/gui/kconfiggui.cpp
-+++ b/src/gui/kconfiggui.cpp
-@@ -25,6 +25,7 @@
- 
- #include <kconfig.h>
- 
-+#ifndef QT_NO_SESSIONMANAGER
- static QString configName(const QString &id, const QString &key)
- {
-     return(QLatin1String("session/") + QGuiApplication::applicationName() +
-@@ -77,3 +78,4 @@ QString KConfigGui::sessionConfigName()
-     }
- }
- #endif
-+#endif // QT_NO_SESSIONMANAGER
--- 
-1.9.3

recipes-kde/kf5/tier1/kconfig/kconfig.inc

@@ -16,9 +16,6 @@ inherit kde-kf5 cmake_lib
 PV = "${KF5_VERSION}"
 SRC_URI[sha256sum] = "f948718ac87f573b14bbf73e4af02d488f023cfcf011425af7cdbc0cefca510a"
 
-# REVISIT remove ugly hack for wayland-only environments
-SRC_URI += "file://0001-kconfiggui-do-only-compile-in-case-sessions-are-aval.patch"
-
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
 # native executables

recipes-kde/kf5/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch

@@ -1,46 +0,0 @@
-From e770efcd3bcdbf0e885c8db2df10fa1bd09b4c06 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 11 Oct 2015 17:56:45 +0200
-Subject: [PATCH] fix build for QT_NO_SESSIONMANAGER
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- src/file/extractor/main.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/file/extractor/main.cpp b/src/file/extractor/main.cpp
-index cf9fec7..7c12646 100644
---- a/src/file/extractor/main.cpp
-+++ b/src/file/extractor/main.cpp
-@@ -29,7 +29,9 @@
- #include <QStandardPaths>
- 
- #include <QApplication>
-+#ifndef QT_NO_SESSIONMANAGER
- #include <QSessionManager>
-+#endif
- 
- int main(int argc, char* argv[])
- {
-@@ -49,11 +51,13 @@ int main(int argc, char* argv[])
- 
-     app.setQuitOnLastWindowClosed(false);
- 
-+#ifndef QT_NO_SESSIONMANAGER
-     auto disableSessionManagement = [](QSessionManager &sm) {
-         sm.setRestartHint(QSessionManager::RestartNever);
-     };
-     QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
-     QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
-+#endif
- 
-     Baloo::App appObject;
-     return app.exec();
--- 
-2.1.0
-