Attempt more KDE fixes

selkies-project · Sep 3, 2023 · b07c55c · b07c55c
1 parent ac5ae03
commit b07c55c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -277,7 +277,6 @@ Pin-Priority: -1" > /etc/apt/preferences.d/firefox-nosnap && \
         kaccounts-providers \
         kactivities-bin \
         kaddressbook \
-        kamera \
         kate \
         kcalc \
         kcharselect \
@@ -292,7 +291,6 @@ Pin-Priority: -1" > /etc/apt/preferences.d/firefox-nosnap && \
         kdf \
         kdialog \
         kget \
-        kgamma5 \
         kgpg \
         khelpcenter \
         kimageformat-plugins \
@@ -334,7 +332,6 @@ Pin-Priority: -1" > /etc/apt/preferences.d/firefox-nosnap && \
         plasma-widgets-addons \
         policykit-desktop-privileges \
         polkit-kde-agent-1 \
-        powerdevil \
         print-manager \
         qapt-deb-installer \
         qml-module-org-kde-runnermodel \

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -23,8 +23,6 @@ export PATH="${PATH}:/usr/local/games:/usr/games:/opt/VirtualGL/bin"
 # Add LibreOffice to library path
 export LD_LIBRARY_PATH="/usr/lib/libreoffice/program:${LD_LIBRARY_PATH}"
 
-# Start DBus without systemd
-sudo /etc/init.d/dbus start
 # Configure environment for selkies-gstreamer utilities
 source /opt/gstreamer/gst-env
 
@@ -48,16 +46,13 @@ if [ "${NOVNC_ENABLE,,}" = "true" ]; then
   /opt/noVNC/utils/novnc_proxy --vnc localhost:5900 --listen 8080 --heartbeat 10 &
 fi
 
-# Choose startplasma-x11 or startkde for KDE startup
-if [ -x "$(command -v startplasma-x11)" ]; then export KDE_START="startplasma-x11"; else export KDE_START="startkde"; fi
-
 # Use VirtualGL to run the KDE desktop environment with OpenGL if the GPU is available, otherwise use OpenGL with llvmpipe
 if [ -n "$(nvidia-smi --query-gpu=uuid --format=csv | sed -n 2p)" ]; then
   export VGL_DISPLAY="${VGL_DISPLAY:-egl}"
   export VGL_REFRESHRATE="$REFRESH"
-  vglrun +wm $KDE_START &
+  vglrun +wm /usr/bin/dbus-launch /usr/bin/startplasma-x11 &
 else
-  $KDE_START &
+  /usr/bin/dbus-launch /usr/bin/startplasma-x11 &
 fi
 
 # Add custom processes right below this line, or within `supervisord.conf` to perform service management similar to systemd