summaryrefslogtreecommitdiffstats
path: root/kde/post-install
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-02-16 21:19:53 +0100
committer Eric Hameleers <alien@slackware.com>2015-02-16 21:19:53 +0100
commitd594a1771148862d9baedd18f56e8611b519355f (patch)
tree1e1aeb04a7ca38ff15ce7c1995b39bf14aec7f56 /kde/post-install
parent745b2101bdd138708e9e93c50d8f8b142d22ba56 (diff)
downloadktown-d594a1771148862d9baedd18f56e8611b519355f.tar.gz
ktown-d594a1771148862d9baedd18f56e8611b519355f.tar.xz
kde-workspace: stripped so that it can co-exist with plasma-workspace
Plasma 5 still needs this package, for kget and because kdeartwork fails to compile if kde-workspace is absent. The stripped package contains the bare minimum and none of its files are found in plasma-desktop.
Diffstat (limited to 'kde/post-install')
-rw-r--r--kde/post-install/kde-workspace.post-install54
-rw-r--r--kde/post-install/kde-workspace/config/Xsession2
-rw-r--r--kde/post-install/kde-workspace/xinit/xinitrc.kde4
3 files changed, 18 insertions, 42 deletions
diff --git a/kde/post-install/kde-workspace.post-install b/kde/post-install/kde-workspace.post-install
index 5cbabf5..5b168b1 100644
--- a/kde/post-install/kde-workspace.post-install
+++ b/kde/post-install/kde-workspace.post-install
@@ -5,47 +5,23 @@ mkdir -p $PKG/etc/X11/xinit
cat $CWD/post-install/kde-workspace/xinit/xinitrc.kde > $PKG/etc/X11/xinit/xinitrc.kde
chmod 0755 $PKG/etc/X11/xinit/xinitrc.kde
-# Setup config files for KDM:
-$PKG/usr/bin/genkdmconf --no-old --no-old-scripts --no-backup --in $PKG/usr/share/config/kdm
-
-# Add Slackware's standard xsessions path to kdmrc and remove the redundant
-# xsession files for XFCE (those are installed by the xcfe package):
-if ! grep -q "SessionsDirs=/usr/share/xsessions" $PKG/usr/share/config/kdm/kdmrc ; then
- sed -i -e "/SessionsDirs=/s#SessionsDirs=\(.*\)\$#SessionsDirs=/usr/share/xsessions,\1#" $PKG/usr/share/config/kdm/kdmrc
-fi
-rm $PKG/usr/share/apps/kdm/sessions/xfce*.desktop
-
-# Similarly, allow other login managers to show KDE Plasma desktop sessions:
-mkdir -p $PKG/usr/share/xsessions
-mv $PKG/usr/share/apps/kdm/sessions/kde-plasma*.desktop \
- $PKG/usr/share/xsessions/
-
-# Not allowing root to login at the console is just plain silly. If they
-# have physical access to the machine, what's the point of trying to stop
-# this? Even the kdmrc file says this is supposed to be the default.
-sed -i 's/AllowRootLogin=false/AllowRootLogin=true/' \
- $PKG/usr/share/config/kdm/kdmrc
-# We are also not ready to create a separate 'kdm' non-root user:
-sed -i 's/GreeterUID=kdm/#&/' \
- $PKG/usr/share/config/kdm/kdmrc
-
-# Add a .new suffix so we don't mangle an existing file:
-mv $PKG/usr/share/config/kdm/kdmrc $PKG/usr/share/config/kdm/kdmrc.new
+# This is fubar:
+rm -f $PKG/usr/share/icons/hicolor/index.theme
-cp -a $PKG/usr/share/config/kdm/Xsession $PKG/usr/share/config/kdm/Xsession.orig
-cat $CWD/post-install/kde-workspace/config/Xsession | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \
- > $PKG/usr/share/config/kdm/Xsession
+# Rename the startkde script so that it does not conflict with plasma-workspace:
+mv $PKG/usr/bin/startkde $PKG/usr/bin/startkde4
-# Add a .new suffix so we don't mangle an existing file:
-mv $PKG/usr/share/config/kdm/backgroundrc $PKG/usr/share/config/kdm/backgroundrc.new
+# Remove symlinks that clash with plasma-workspace:
+for SOFILE in libksgrd libksignalplotter liblsofui libprocesscore libprocessui libtaskmanager ; do
+ rm $PKG/usr/lib${LIBDIRSUFFIX}/${SOFILE}.so
+done
-# Move the KDM files someplace FHS compliant:
-mkdir -p $PKG/etc/kde
-mv $PKG/usr/share/config/kdm $PKG/etc/kde
-( cd $PKG/usr/share/config ; ln -sf ../../../etc/kde/kdm . )
+# Remove include files that clash with plasma-workspace:
+for INCDIR in ksysguard taskmanager ; do
+ rm -r $PKG/usr/include/${INCDIR}
+done
-# Move the polkit dbus configuration files to the proper place:
-mv $PKG/etc/kde/dbus-1 $PKG/etc/
+# Remove the dbus and polkit dbus files that clash woth plasma-workspace:
+rm -r $PKG/etc/kde/dbus-1 $PKG/etc/dbus-1 $PKG/usr/share/dbus-1
+rm -r $PKG/usr/share/polkit-1
-# This is fubar:
-rm -f $PKG/usr/share/icons/hicolor/index.theme
diff --git a/kde/post-install/kde-workspace/config/Xsession b/kde/post-install/kde-workspace/config/Xsession
index 736f5d5..c52783e 100644
--- a/kde/post-install/kde-workspace/config/Xsession
+++ b/kde/post-install/kde-workspace/config/Xsession
@@ -79,7 +79,7 @@ case $session in
exec $HOME/.xsession
;;
default)
- exec /usr/bin/startkde
+ exec /usr/bin/startkde4
;;
*)
eval exec "$session"
diff --git a/kde/post-install/kde-workspace/xinit/xinitrc.kde b/kde/post-install/kde-workspace/xinit/xinitrc.kde
index a33eb06..fe5b8b1 100644
--- a/kde/post-install/kde-workspace/xinit/xinitrc.kde
+++ b/kde/post-install/kde-workspace/xinit/xinitrc.kde
@@ -26,7 +26,7 @@ fi
# Start the window manager:
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
- ck-launch-session startkde
+ ck-launch-session startkde4
else
- startkde
+ startkde4
fi