[neon/snap-packaging/plasma-core-desktop] /: Remove the cleanup-activation-environment step

[Kevin Ottens]

Git commit 608ee99afb060f5b178a1b863c78824117fb293e by Kevin Ottens.
Committed on 08/08/2024 at 22:16.
Pushed by ervin into branch 'master'.

Remove the cleanup-activation-environment step

With the patched KDBusAddons this is not necessary anymore.

M  +0    -18   hooks/006-add-plasma-session.chroot
D  +0    -27   static/usr/bin/cleanup-activation-environment.sh

https://invent.kde.org/neon/snap-packaging/plasma-core-desktop/-/commit/608ee99afb060f5b178a1b863c78824117fb293e

diff --git a/hooks/006-add-plasma-session.chroot b/hooks/006-add-plasma-session.chroot
index 7d786cb..40858af 100755
--- a/hooks/006-add-plasma-session.chroot
+++ b/hooks/006-add-plasma-session.chroot
@@ -182,21 +182,3 @@ sed -i "/^ReadWritePaths=/ a \\  /var/lib/extrausers/ \\\\" \
 rm /usr/sbin/NetworkManager
 rm /usr/lib/systemd/system/NetworkManager*.service
 
-# Clean up the systemd and dbus activation environment at beginning
-# of startup (just after startplasma pushed its own environment)
-# this is necessary to avoid the desktop-launch routine wrongfully
-# thinking it's run from a confined snap
-cat >/usr/lib/systemd/user/plasma-env-cleanup.service<<EOF
-[Unit]
-Description=KDE Plasma Activation Environments Cleanups
-PartOf=graphical-session.target
-Before=plasma-kwin_wayland.service
-
-[Service]
-ExecStart=/usr/bin/cleanup-activation-environment.sh
-Type=oneshot
-Slice=session.slice
-EOF
-
-mkdir /usr/lib/systemd/user/plasma-workspace-wayland.target.wants
-ln -s /usr/lib/systemd/user/plasma-env-cleanup.service /usr/lib/systemd/user/plasma-workspace-wayland.target.wants
diff --git a/static/usr/bin/cleanup-activation-environment.sh b/static/usr/bin/cleanup-activation-environment.sh
deleted file mode 100755
index 8978473..0000000
--- a/static/usr/bin/cleanup-activation-environment.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -x
-
-dbus-update-activation-environment --systemd SNAP="" _KDE_APPLICATIONS_AS_FORKING=1
-
-systemctl --user unset-environment \
-    SNAP \
-    SNAP_ARCH \
-    SNAP_COMMON \
-    SNAP_CONTEXT \
-    SNAP_COOKIE \
-    SNAP_DATA \
-    SNAP_EUID \
-    SNAP_INSTANCE_KEY \
-    SNAP_INSTANCE_NAME \
-    SNAP_LIBRARY_PATH \
-    SNAP_NAME \
-    SNAP_REAL_HOME \
-    SNAP_REEXEC \
-    SNAP_REVISION \
-    SNAP_SAVE_DATA \
-    SNAP_UID \
-    SNAP_USER_COMMON \
-    SNAP_USER_DATA \
-    SNAP_VERSION
-