File 0001-Revert-startkde-Close-systemd-session-when... of Package plasma6-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-startkde-Close-systemd-session-when-startplas.patch of Package plasma6-workspace (Revision 27e1798cc5c6f5bcd7038553157a3291)

Currently displaying revision 27e1798cc5c6f5bcd7038553157a3291 , Show latest

From c0624a8bddc2843a1652ea96e6bd1ab231becc8a Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Thu, 6 Jun 2024 23:35:15 +0300
Subject: [PATCH 1/2] Revert "startkde: Close systemd session when startplasma
 exits"

This code worked a bit too aggressively; on a live upgrade from 6.0 to 6.1,
systemd will reload and immediately quit the whole session.

BUG: 488032

This reverts commit 0ff2e9a70ccfa96b82fd6d2ea5a0a8545a5e3a60.
---
 startkde/startplasma.cpp                    |  4 ----
 startkde/systemd/CMakeLists.txt             |  2 +-
 startkde/systemd/plasma-sentinel.service.in | 10 ----------
 startkde/systemd/plasma-workspace.target    |  7 +------
 startkde/waitforname/waiter.cpp             |  4 +---
 5 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 startkde/systemd/plasma-sentinel.service.in

diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index a071356df2..7b82d72464 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
@@ -643,10 +643,6 @@ bool startPlasmaSession(bool wayland)
     reloadSystemd();
     OrgKdeKSplashInterface iface(QStringLiteral("org.kde.KSplash"), QStringLiteral("/KSplash"), QDBusConnection::sessionBus());
     iface.setStage(QStringLiteral("startPlasma"));
-
-    // this is used by plasma-sentinel to check when this procses exits and cleanup
-    QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.startplasma"));
-
     // finally, give the session control to the session manager
     // see kdebase/ksmserver for the description of the rest of the startup sequence
     // if the KDEWM environment variable has been set, then it will be used as KDE's
diff --git a/startkde/systemd/CMakeLists.txt b/startkde/systemd/CMakeLists.txt
index 44759ab4c7..2f5d30e845 100644
--- a/startkde/systemd/CMakeLists.txt
+++ b/startkde/systemd/CMakeLists.txt
@@ -1,6 +1,6 @@
 ecm_install_configured_files(INPUT plasma-ksplash-ready.service.in @ONLY
                                                    DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR})
-ecm_install_configured_files(INPUT plasma-sentinel.service.in @ONLY DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR})
+
 install(FILES plasma-core.target DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR})
 install(FILES plasma-workspace.target DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR})
 install(FILES plasma-workspace-wayland.target DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR})
diff --git a/startkde/systemd/plasma-sentinel.service.in b/startkde/systemd/plasma-sentinel.service.in
deleted file mode 100644
index 7c5effe4b9..0000000000
--- a/startkde/systemd/plasma-sentinel.service.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Close Plasma session when session leader quits
-PartOf=graphical-session.target
-RefuseManualStart=yes
-RefuseManualStop=yes
-
-[Service]
-Type=exec
-ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasma_waitforname org.kde.startplasma --unregistered --timeout 0
-Slice=session.slice
diff --git a/startkde/systemd/plasma-workspace.target b/startkde/systemd/plasma-workspace.target
index 5bf135a50e..4eaf37aec4 100644
--- a/startkde/systemd/plasma-workspace.target
+++ b/startkde/systemd/plasma-workspace.target
@@ -1,13 +1,8 @@
 [Unit]
 Description=KDE Plasma Workspace
 Requires=plasma-core.target graphical-session.target
-Wants=plasma-sentinel.service plasma-restoresession.service plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service plasma-powerdevil.service plasma-ksplash-ready.service plasma-polkit-agent.service kde-baloo.service plasma-foreground-booster.service plasma-kwallet-pam.service plasma-kglobalaccel.service xdg-desktop-autostart.target
+Wants=plasma-restoresession.service plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service plasma-powerdevil.service plasma-ksplash-ready.service plasma-polkit-agent.service kde-baloo.service plasma-foreground-booster.service plasma-kwallet-pam.service plasma-kglobalaccel.service xdg-desktop-autostart.target
 BindsTo=graphical-session.target
-
-# Close plasma-workspace if startplasma exits
-BindsTo=plasma-sentinel.service
-After=plasma-sentinel.service
-
 Before=graphical-session.target xdg-desktop-autostart.target plasma-ksplash-ready.service plasma-restoresession.service
 RefuseManualStart=yes
 StopWhenUnneeded=true
diff --git a/startkde/waitforname/waiter.cpp b/startkde/waitforname/waiter.cpp
index 3ad636ceb4..2c122e4d36 100644
--- a/startkde/waitforname/waiter.cpp
+++ b/startkde/waitforname/waiter.cpp
@@ -13,8 +13,6 @@
 
 #include <unistd.h>
 
-#include <chrono>
-
 #include "debug_p.h"
 #include "waiter.h"
 
@@ -64,7 +62,7 @@ Waiter::Waiter(int argc, char **argv)
     }
     if (timeout > 0) {
         mTimeoutTimer.setSingleShot(true);
-        mTimeoutTimer.setInterval(std::chrono::seconds(timeout));
+        mTimeoutTimer.setInterval(timeout * 1000);
         connect(&mTimeoutTimer, &QTimer::timeout, this, &Waiter::timeout);
         mTimeoutTimer.start();
     }
-- 
2.45.1

Places

File 0001-Revert-startkde-Close-systemd-session-when-startplas.patch of Package plasma6-workspace (Revision 27e1798cc5c6f5bcd7038553157a3291)

Places