zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kde-apps: Remove obsolete qtbase no-session patches

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2021-03-06 22:11:36 +01:00
parent b3e1efd9c3
commit 98edd71492
6 changed files with 0 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
recipes-kde/apps/ark/ark.bb
View File

@@ -29,7 +29,6 @@ DEPENDS += "\
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "0baf950fc330b7e7cd3a825415592579b31d6308e9e7db5cada28747e6a61edd"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \
${datadir}/config.kcfg \

48
recipes-kde/apps/ark/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
View File

@@ -1,48 +0,0 @@
From b7285c71f5b04bc55441217bf963078b38d6bad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 11 Oct 2015 21:41:27 +0200
Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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>
---
app/main.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/main.cpp b/app/main.cpp
index 0396400..5924683 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -206,6 +206,7 @@ int main(int argc, char **argv)
// This is needed to prevent Dolphin from freezing when opening an archive.
KDBusService dbusService(KDBusService::Multiple | KDBusService::NoExitOnFailure);
+#ifndef QT_NO_SESSIONMANAGER
// Session restoring.
if (application.isSessionRestored()) {
if (!KMainWindow::canBeRestored(1)) {
@@ -218,8 +219,9 @@ int main(int argc, char **argv)
delete window;
return -1;
}
- } else { // New ark window (no restored session).
-
+ } else // New ark window (no restored session).
+#endif
+ {
// Open any given URLs.
const QStringList urls = parser.positionalArguments();
--
2.5.5

46
recipes-kde/apps/khelpcenter/files/0001-fix-build-for-qtbase-without-session-management.patch
View File

@@ -1,46 +0,0 @@
From bf1ddc0831cf20839a4738b6b534e4e50691fd60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 4 Feb 2015 13:54:14 +0100
Subject: [PATCH] fix build for qtbase without session management
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
application.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/application.cpp b/application.cpp
index 373910a..1e8a247 100644
--- a/application.cpp
+++ b/application.cpp
@@ -66,10 +66,12 @@ void Application::activate(const QStringList& args, const QString &workingDirect
if( !mMainWindow )
{
+#ifndef QT_NO_SESSIONMANAGER
if (qApp->isSessionRestored()) {
// The kRestoreMainWindows call will do the rest.
return;
}
+#endif
mMainWindow = new MainWindow;
}
@@ -112,10 +114,12 @@ extern "C" int Q_DECL_EXPORT kdemain( int argc, char **argv )
QObject::connect( &service, &KDBusService::activateRequested, &app, &Application::activate );
+#ifndef QT_NO_SESSIONMANAGER
if ( app.isSessionRestored() )
{
kRestoreMainWindows<MainWindow>();
}
+#endif
return app.exec();
}
--
2.5.5

1
recipes-kde/apps/khelpcenter/khelpcenter.bb
View File

@@ -29,7 +29,6 @@ DEPENDS += " \
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "bddd9e63127adc9b04d757998da79c91b55a89ef3d24b87c435b11c36b04bad7"
SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

43
recipes-kde/apps/kwalletmanager/files/0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch
View File

@@ -1,43 +0,0 @@
From 6ec28a23f2850f6e06e3637b8af2bb956f5a448b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 11 Oct 2015 18:21:50 +0200
Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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/manager/kwalletmanager.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/manager/kwalletmanager.cpp b/src/manager/kwalletmanager.cpp
index 2672c7c..c505d23 100644
--- a/src/manager/kwalletmanager.cpp
+++ b/src/manager/kwalletmanager.cpp
@@ -100,12 +100,14 @@ void KWalletManager::configUI() {
break;
}
}
+#ifndef QT_NO_SESSIONMANAGER
if (!isOpen && qApp->isSessionRestored()) {
delete _tray;
_tray = nullptr;
QTimer::singleShot(0, qApp, SLOT(quit()));
return;
}
+#endif
} else {
_tray = nullptr;
}
--
2.1.0

1
recipes-kde/apps/kwalletmanager/kwalletmanager.bb
View File

@@ -25,7 +25,6 @@ DEPENDS += " \
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "3c76f5c4a62b8ad1cab6532537120e5b4a4dca936b68d3a97ef10283ce1d9d0a"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \
${datadir}/dbus-1 \