summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-10-19 12:41:34 +0200
committer Eric Hameleers <alien@slackware.com>2019-10-19 12:41:34 +0200
commit627960636f443cdf9f2f4cb9e6d1664792d498ad (patch)
treeb9765da3fdd97f47400c33b798e6a1b8e2fb4cd5
parentda8bd0830301dae2ea93d359855e1928a2ba8c46 (diff)
downloadktown-627960636f443cdf9f2f4cb9e6d1664792d498ad.tar.gz
ktown-627960636f443cdf9f2f4cb9e6d1664792d498ad.tar.xz
KDE plasma: rebuilt plasma-workspace
The newest Plasma desktop is no longer started with /usr/bin/startkde but with /usr/bin/startplasma-x11 and so the custom X startup scripts that are installed with the plasma-workspace package needed to be updated.
-rw-r--r--kde/build/plasma-workspace1
-rw-r--r--kde/post-install/plasma-workspace/xinit/xinitrc.plasma13
-rw-r--r--kde/post-install/plasma-workspace/xsession/plasma-safe.desktop4
3 files changed, 10 insertions, 8 deletions
diff --git a/kde/build/plasma-workspace b/kde/build/plasma-workspace
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/plasma-workspace
@@ -0,0 +1 @@
+2
diff --git a/kde/post-install/plasma-workspace/xinit/xinitrc.plasma b/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
index ff3c8a1..b0a920f 100644
--- a/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
+++ b/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
@@ -9,24 +9,25 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
if [ -f $sysresources ]; then
- xrdb -merge $sysresources
+ xrdb -merge $sysresources
fi
if [ -f $sysmodmap ]; then
- xmodmap $sysmodmap
+ xmodmap $sysmodmap
fi
if [ -f $userresources ]; then
- xrdb -merge $userresources
+ xrdb -merge $userresources
fi
if [ -f $usermodmap ]; then
- xmodmap $usermodmap
+ xmodmap $usermodmap
fi
# Start the window manager:
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
- ck-launch-session dbus-launch --sh-syntax --exit-with-session startkde
+ ck-launch-session dbus-launch --sh-syntax --exit-with-session startplasma-x11
else
- dbus-launch --sh-syntax --exit-with-session startkde
+ dbus-launch --sh-syntax --exit-with-session startplasma-x11
fi
+
diff --git a/kde/post-install/plasma-workspace/xsession/plasma-safe.desktop b/kde/post-install/plasma-workspace/xsession/plasma-safe.desktop
index 9a3f9c7..f82cda4 100644
--- a/kde/post-install/plasma-workspace/xsession/plasma-safe.desktop
+++ b/kde/post-install/plasma-workspace/xsession/plasma-safe.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
Type=XSession
-Exec=/usr/bin/startkde --failsafe
-TryExec=/usr/bin/startkde
+Exec=/usr/bin/startplasma-x11 --failsafe
+TryExec=/usr/bin/startplasma-x11
DesktopNames=KDE
Name=Plasma (Failsafe)
Comment=Plasma by KDE (Failsafe)