[neon/snap-packaging/plasma-desktop-session] /: Remove references to gnome related services and session
Kevin Ottens
null at kde.org
Wed Jun 12 20:35:49 BST 2024
Git commit 3bf6608e909319dea3c068eac27486f07672b5f7 by Kevin Ottens.
Committed on 12/06/2024 at 19:35.
Pushed by ervin into branch 'master'.
Remove references to gnome related services and session
D +0 -25 scripts/run-plasma-session.sh
M +5 -3 scripts/run-session.sh
M +1 -302 snap/snapcraft.yaml
https://invent.kde.org/neon/snap-packaging/plasma-desktop-session/-/commit/3bf6608e909319dea3c068eac27486f07672b5f7
diff --git a/scripts/run-plasma-session.sh b/scripts/run-plasma-session.sh
deleted file mode 100755
index 8f4f33e..0000000
--- a/scripts/run-plasma-session.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -x
-
-# If xdg-user-dirs-update exists in $PATH, run it
-if command -v xdg-user-dirs-update >/dev/null; then
- xdg-user-dirs-update
-fi
-
-# Ensure socket directories exist and have the right permissions
-mkdir -p /tmp/.X11-unix /tmp/.ICE-unix
-chmod 01777 /tmp/.X11-unix /tmp/.ICE-unix
-
-# Create the runtime directory
-mkdir -p --mode=700 $XDG_RUNTIME_DIR
-chmod 700 $XDG_RUNTIME_DIR
-
-export PULSE_SERVER=unix:/run/user/`id -u`/pulse/native
-export XDG_CURRENT_DESKTOP=KDE
-
-if ! grep "^snap$" $HOME/.hidden 2>&1 > /dev/null; then
- echo "snap" >> $HOME/.hidden
-fi
-
-exec /usr/bin/startplasma-wayland
diff --git a/scripts/run-session.sh b/scripts/run-session.sh
index 358f482..8f4f33e 100755
--- a/scripts/run-session.sh
+++ b/scripts/run-session.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+set -x
+
# If xdg-user-dirs-update exists in $PATH, run it
if command -v xdg-user-dirs-update >/dev/null; then
xdg-user-dirs-update
@@ -11,13 +13,13 @@ chmod 01777 /tmp/.X11-unix /tmp/.ICE-unix
# Create the runtime directory
mkdir -p --mode=700 $XDG_RUNTIME_DIR
+chmod 700 $XDG_RUNTIME_DIR
export PULSE_SERVER=unix:/run/user/`id -u`/pulse/native
-export GNOME_SHELL_SESSION_MODE=ubuntu
-export XDG_CURRENT_DESKTOP=ubuntu:GNOME
+export XDG_CURRENT_DESKTOP=KDE
if ! grep "^snap$" $HOME/.hidden 2>&1 > /dev/null; then
echo "snap" >> $HOME/.hidden
fi
-exec /usr/bin/gnome-session --builtin --session=ubuntu
+exec /usr/bin/startplasma-wayland
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9d60175..7b209da 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -21,22 +21,8 @@ environment:
XDG_STATE_HOME: $SNAP_USER_COMMON/.local/state
apps:
- ubuntu-desktop-session:
- command: run-session.sh
- slots:
- - wayland
- - x11
- plugs:
- - account-control
- - locale-control
- - time-control
- - timeserver-control
- - timezone-control
- - shell-session-locale-files
- - desktop-launch
-
plasma-desktop-session:
- command: run-plasma-session.sh
+ command: run-session.sh
slots:
- wayland
- x11
@@ -99,90 +85,12 @@ apps:
plugs:
- alsa
- gnome-terminal-server:
- command: run.sh /usr/libexec/gnome-terminal-server
- daemon: dbus
- passthrough:
- daemon-scope: user
- activates-on:
- - dbus-gnome-terminal
-
- screencast-service:
- command: run.sh /usr/bin/gjs -m /usr/share/gnome-shell/org.gnome.Shell.Screencast
- daemon: dbus
- passthrough:
- daemon-scope: user
- activates-on:
- - dbus-gnome-shell-screencast
-
- nautilus-service:
- command: run.sh /usr/bin/nautilus --gapplication-service
- daemon: dbus
- passthrough:
- daemon-scope: user
- activates-on:
- - dbus-gnome-nautilus
-
- xdg-desktop-portal-gnome:
- command: run.sh /usr/libexec/xdg-desktop-portal-gnome
- daemon: dbus
- passthrough:
- daemon-scope: user
- activates-on:
- - dbus-freedesktop-impl-portal-gnome
- restart-delay: 1s
-
- #xdg-desktop-portal-gtk:
- # command: run.sh /usr/libexec/xdg-desktop-portal-gtk
- # daemon: dbus
- # passthrough:
- # daemon-scope: user
- # activates-on:
- # - dbus-freedesktop-impl-portal-gtk
- # restart-delay: 1s
-
- ibus-service:
- command: run.sh /usr/bin/ibus-daemon --panel disable
- daemon: dbus
- passthrough:
- daemon-scope: user
- activates-on:
- - dbus-ibus
-
- ibus-gtk3-service:
- command: run.sh /usr/libexec/ibus-extension-gtk3
- daemon: dbus
- passthrough:
- daemon-scope: user
- activates-on:
- - dbus-ibus-gtk3
-
- ibus-portal-service:
- command: run.sh /usr/libexec/ibus-portal
- daemon: dbus
- passthrough:
- daemon-scope: user
- activates-on:
- - dbus-ibus-portal
-
- colord:
- command: run.sh /usr/libexec/colord-session
- daemon: dbus
- passthrough:
- daemon-scope: user
- activates-on:
- - dbus-colord
-
plugs:
avahi-control: null
bluez: null
bluetooth-control: null
cups-control: null
desktop-launch: null
- dot-local-share-nautilus:
- interface: personal-files
- write:
- - $HOME/.local/share/nautilus
dot-hidden:
interface: personal-files
write:
@@ -214,7 +122,6 @@ plugs:
- /etc/alsa
- /etc/fonts
- /etc/glvnd
- - /etc/gnome/defaults.list
- /etc/gtk-3.0
- /etc/pulse
- /etc/shells
@@ -344,18 +251,6 @@ slots:
interface: dbus
bus: session
name: org.freedesktop.PowerManagement
- dbus-canonical-unity:
- interface: dbus
- bus: session
- name: com.canonical.Unity
- dbus-freedesktop-impl-portal-gnome:
- interface: dbus
- bus: session
- name: org.freedesktop.impl.portal.desktop.gnome
- dbus-freedesktop-impl-portal-gtk:
- interface: dbus
- bus: session
- name: org.freedesktop.impl.portal.desktop.gtk
dbus-freedesktop-screensaver:
interface: dbus
bus: session
@@ -364,190 +259,10 @@ slots:
interface: dbus
bus: session
name: org.freedesktop.secrets
- dbus-gnome-cc:
- interface: dbus
- bus: session
- name: org.gnome.ControlCenter
- dbus-gnome-cc-search:
- interface: dbus
- bus: session
- name: org.gnome.ControlCenter.SearchProvider
- dbus-gnome-keyring:
- interface: dbus
- bus: session
- name: org.gnome.keyring
- dbus-gnome-keyring-sysprompter:
- interface: dbus
- bus: session
- name: org.gnome.keyring.SystemPrompter
- dbus-gnome-magnifier:
- interface: dbus
- bus: session
- name: org.gnome.Magnifier
- dbus-gnome-mutter-displayconfig:
- interface: dbus
- bus: session
- name: org.gnome.Mutter.DisplayConfig
- dbus-gnome-mutter-idlemonitor:
- interface: dbus
- bus: session
- name: org.gnome.Mutter.IdleMonitor
- dbus-gnome-mutter-remotedesktop:
- interface: dbus
- bus: session
- name: org.gnome.Mutter.RemoteDesktop
- dbus-gnome-mutter-screencast:
- interface: dbus
- bus: session
- name: org.gnome.Mutter.ScreenCast
- dbus-gnome-panel:
- interface: dbus
- bus: session
- name: org.gnome.Panel
- dbus-gnome-screensaver:
- interface: dbus
- bus: session
- name: org.gnome.ScreenSaver
- dbus-gnome-sessionmanager:
- interface: dbus
- bus: session
- name: org.gnome.SessionManager
- dbus-gsd:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon
- dbus-gsd-a11ysettings:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.A11ySettings
- dbus-gsd-color:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.Color
- dbus-gsd-datetime:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.Datetime
- dbus-gsd-housekeeping:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.Housekeeping
- dbus-gsd-keyboard:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.Keyboard
- dbus-gsd-mediakeys:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.MediaKeys
- dbus-gsd-power:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.Power
- dbus-gsd-printnotifications:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.PrintNotifications
- dbus-gsd-rfkill:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.Rfkill
- dbus-gsd-screensaverproxy:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.ScreensaverProxy
- dbus-gsd-sharing:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.Sharing
- dbus-gsd-smartcard:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.Smartcard
- dbus-gsd-sound:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.Sound
- dbus-gsd-usbprotection:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.UsbProtection
- dbus-gsd-wacom:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.Wacom
- dbus-gsd-wwan:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.Wwan
- dbus-gsd-xsettings:
- interface: dbus
- bus: session
- name: org.gnome.SettingsDaemon.XSettings
- dbus-gnome-nautilus:
- interface: dbus
- bus: session
- name: org.gnome.Nautilus
- dbus-gnome-shell:
- interface: dbus
- bus: session
- name: org.gnome.Shell
- dbus-gnome-shell-audio:
- interface: dbus
- bus: session
- name: org.gnome.Shell.AudioDeviceSelection
- dbus-gnome-shell-introspect:
- interface: dbus
- bus: session
- name: org.gnome.Shell.Introspect
- dbus-gnome-shell-portal:
- interface: dbus
- bus: session
- name: org.gnome.Shell.Portal
- dbus-gnome-shell-screencast:
- interface: dbus
- bus: session
- name: org.gnome.Shell.Screencast
- dbus-gnome-shell-screenshot:
- interface: dbus
- bus: session
- name: org.gnome.Shell.Screenshot
- dbus-gnome-shell-wacom:
- interface: dbus
- bus: session
- name: org.gnome.Shell.Wacom.PadOsd
- dbus-gnome-settings:
- interface: dbus
- bus: session
- name: org.gnome.Settings
- dbus-gnome-terminal:
- interface: dbus
- bus: session
- name: org.gnome.Terminal
- dbus-gtk-mountoperationhandler:
- interface: dbus
- bus: session
- name: org.gtk.MountOperationHandler
- dbus-gtk-notifications:
- interface: dbus
- bus: session
- name: org.gtk.Notifications
- dbus-gtk-settings:
- interface: dbus
- bus: session
- name: org.gtk.Settings
dbus-kde-statusnotifier:
interface: dbus
bus: session
name: org.kde.StatusNotifierWatcher
- dbus-desktop-icons:
- interface: dbus
- bus: session
- name: com.rastersoft.ding
- dbus-desktop-icons-extension:
- interface: dbus
- bus: session
- name: com.rastersoft.dingextension
dbus-pulseaudio-server:
interface: dbus
bus: session
@@ -560,22 +275,6 @@ slots:
interface: dbus
name: org.freedesktop.ReserveDevice1
bus: session
- dbus-ibus:
- interface: dbus
- name: org.freedesktop.IBus
- bus: session
- dbus-ibus-gtk3:
- interface: dbus
- name: org.freedesktop.IBus.Panel.Extension.Gtk3
- bus: session
- dbus-ibus-portal:
- interface: dbus
- name: org.freedesktop.portal.IBus
- bus: session
- dbus-colord:
- interface: dbus
- name: org.freedesktop.ColorHelper
- bus: session
parts:
scripts:
More information about the Neon-commits
mailing list