From b470c06f7d87927b503eabd545b2e6ac6de07908 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Mon, 28 Sep 2020 15:33:49 +0100
Subject: [PATCH] Explicitly scope units to graphical-session.target

This means on logout we'll be gracefully closed down.

All of these are closing down properly anyway, but this makes things a
bit more explicit in case you managed to log out at an awkward point.
---
 gmenu-dbusmenu-proxy/plasma-gmenudbusmenuproxy.service.in | 1 +
 krunner/plasma-krunner.service.in                         | 1 +
 ksmserver/plasma-ksmserver.service.in                     | 1 +
 runners/baloo/org.kde.baloorunner.service.in              | 1 +
 shell/plasma-plasmashell.service.in                       | 1 +
 startkde/kcminit/plasma-kcminit-phase1.service.in         | 1 +
 startkde/kcminit/plasma-kcminit.service.in                | 1 +
 startkde/systemd/plasma-ksplash-ready.service.in          | 1 +
 xembed-sni-proxy/plasma-xembedsniproxy.service.in         | 1 +
 9 files changed, 9 insertions(+)

diff --git a/gmenu-dbusmenu-proxy/plasma-gmenudbusmenuproxy.service.in b/gmenu-dbusmenu-proxy/plasma-gmenudbusmenuproxy.service.in
index 3ab9b84b8..ba9193b52 100644
--- a/gmenu-dbusmenu-proxy/plasma-gmenudbusmenuproxy.service.in
+++ b/gmenu-dbusmenu-proxy/plasma-gmenudbusmenuproxy.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=Proxies GTK DBus menus to a Plasma readable format
+PartOf=graphical-session.target
 
 [Service]
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/gmenudbusmenuproxy
diff --git a/krunner/plasma-krunner.service.in b/krunner/plasma-krunner.service.in
index e808f5f0c..34360d2f6 100644
--- a/krunner/plasma-krunner.service.in
+++ b/krunner/plasma-krunner.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=KRunner
+PartOf=graphical-session.target
 
 [Service]
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/krunner
diff --git a/ksmserver/plasma-ksmserver.service.in b/ksmserver/plasma-ksmserver.service.in
index 199f0a57c..9dcbdfcf0 100644
--- a/ksmserver/plasma-ksmserver.service.in
+++ b/ksmserver/plasma-ksmserver.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=KDE Session Management Server
 Wants=plasma-kcminit.service
+PartOf=graphical-session.target
 
 [Service]
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/ksmserver
diff --git a/runners/baloo/org.kde.baloorunner.service.in b/runners/baloo/org.kde.baloorunner.service.in
index 324310f98..ce56ceef0 100644
--- a/runners/baloo/org.kde.baloorunner.service.in
+++ b/runners/baloo/org.kde.baloorunner.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.kde.runners.baloo
 Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/baloorunner
+PartOf=graphical-session.target
diff --git a/shell/plasma-plasmashell.service.in b/shell/plasma-plasmashell.service.in
index 82e6ec74c..f3e7c5e52 100644
--- a/shell/plasma-plasmashell.service.in
+++ b/shell/plasma-plasmashell.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=KDE Plasma Workspace
 Wants=plasma-ksmserver.service plasma-kcminit.service
+PartOf=graphical-session.target
 
 [Service]
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasmashell --no-respawn
diff --git a/startkde/kcminit/plasma-kcminit-phase1.service.in b/startkde/kcminit/plasma-kcminit-phase1.service.in
index e8cd7b6c7..b8bc81101 100644
--- a/startkde/kcminit/plasma-kcminit-phase1.service.in
+++ b/startkde/kcminit/plasma-kcminit-phase1.service.in
@@ -2,6 +2,7 @@
 Description=KDE Configuration Module Initialization (Phase 1)
 Requires=plasma-kcminit.service
 After=plasma-kcminit.service plasma-kded.service
+PartOf=graphical-session.target
 
 [Service]
 Type=oneshot
diff --git a/startkde/kcminit/plasma-kcminit.service.in b/startkde/kcminit/plasma-kcminit.service.in
index 6376ee763..45d2e0d78 100644
--- a/startkde/kcminit/plasma-kcminit.service.in
+++ b/startkde/kcminit/plasma-kcminit.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=KDE Config Module Initialization
+PartOf=graphical-session.target
 
 [Service]
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kcminit_startup
diff --git a/startkde/systemd/plasma-ksplash-ready.service.in b/startkde/systemd/plasma-ksplash-ready.service.in
index 943330aa8..3f6744f37 100644
--- a/startkde/systemd/plasma-ksplash-ready.service.in
+++ b/startkde/systemd/plasma-ksplash-ready.service.in
@@ -2,6 +2,7 @@
 Description=KSplash "ready" Stage
 Wants=plasma-core.target
 After=plasma-core.target
+PartOf=graphical-session.target
 
 [Service]
 Type=oneshot
diff --git a/xembed-sni-proxy/plasma-xembedsniproxy.service.in b/xembed-sni-proxy/plasma-xembedsniproxy.service.in
index 125f5cf94..fd916f401 100644
--- a/xembed-sni-proxy/plasma-xembedsniproxy.service.in
+++ b/xembed-sni-proxy/plasma-xembedsniproxy.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=Handle legacy xembed system tray icons
+PartOf=graphical-session.target
 
 [Service]
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/xembedsniproxy