Updated 'testing' in preparation for June '18 release of Plasma 5.13

12 files changed, 69 insertions, 39 deletions

diff --git a/kde/post-install/audiocd-kio4.post-install b/kde/post-install/audiocd-kio4.post-install
new file mode 100644
index 0000000..ec32ab1
--- /dev/null
+++ b/kde/post-install/audiocd-kio4.post-install
@@ -0,0 +1,6 @@
+# These are provided by audiocd-kio and not needed in the kdelibs4 based pkg:
+rm -r $PKG/usr/include
+rm -r $PKG/usr/share/config.kcfg
+# Remove symlink shared with KF5 based pkg:
+rm $PKG/usr/lib${LIBDIRSUFFIX}/libaudiocdplugins.so
+
diff --git a/kde/post-install/dolphin.post-install b/kde/post-install/dolphin.post-install
new file mode 100644
index 0000000..8b0f9e1
--- /dev/null
+++ b/kde/post-install/dolphin.post-install
@@ -0,0 +1,14 @@
+# Add a 'run dolphin as root' menu entry:
+mkdir -p $PKG/usr/share/applications
+cat <<EOT > $PKG/usr/share/applications/org.kde.dolphinsu.desktop
+[Desktop Entry]
+Name=File Manager - Super User Mode
+Exec=dbus-launch dolphin -qwindowtitle "%c" "%u"
+Icon=system-file-manager
+Type=Application
+X-DocPath=dolphin/index.html
+Categories=Qt;KDE;System;FileManager;
+Terminal=false
+MimeType=inode/directory;
+X-KDE-SubstituteUID=true
+EOT
diff --git a/kde/post-install/kde-runtime.post-install b/kde/post-install/kde-runtime.post-install
index fbdacfa..f138174 100644
--- a/kde/post-install/kde-runtime.post-install
+++ b/kde/post-install/kde-runtime.post-install
@@ -1,5 +1,5 @@
 # Create a symlink in /usr/bin to the kdesu binary
-( cd $PKG/usr/bin ; ln -s /usr/lib${LIBDIRSUFFIX}/kde4/libexec/kdesu . )
+( cd $PKG/usr/bin ; ln -s /usr/lib${LIBDIRSUFFIX}/kde4/libexec/kdesu kdesu4 )
 
 # Remove the hicolor icon theme index.theme so it doesn't clobber the real one
 rm -f $PKG/usr/share/icons/hicolor/index.theme
diff --git a/kde/post-install/kdepimlibs4.post-install b/kde/post-install/kdepimlibs4.post-install
index ae30cc8..0cd6c30 100644
--- a/kde/post-install/kdepimlibs4.post-install
+++ b/kde/post-install/kdepimlibs4.post-install
@@ -1,3 +1,4 @@
 # Remove files that clash with the Frameworks version of kdepimlibs:
 rm -r $PKG/usr/bin
+rm -r $PKG/usr/share/akonadi
 rm -r $PKG/usr/share/config.kcfg
diff --git a/kde/post-install/kdesu.post-install b/kde/post-install/kdesu.post-install
new file mode 100644
index 0000000..52402f5
--- /dev/null
+++ b/kde/post-install/kdesu.post-install
@@ -0,0 +1,4 @@
+# Create a symlink in /usr/bin to the KF5 kdesu binary
+mkdir -p $PKG/usr/bin
+( cd $PKG/usr/bin ; ln -s /usr/lib${LIBDIRSUFFIX}/kf5/kdesu kdesu )
+
diff --git a/kde/post-install/kde-baseapps.post-install b/kde/post-install/kservice.post-install
index 3ae4e1c..a014f3b 100644
--- a/kde/post-install/kde-baseapps.post-install
+++ b/kde/post-install/kservice.post-install
@@ -1,9 +1,9 @@
 # Add profile scripts
 mkdir -p $PKG/etc/profile.d
-cat $CWD/post-install/kde-baseapps/profile.d/kde.sh \
+cat $CWD/post-install/kservice/profile.d/kde.sh \
   | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \
   > $PKG/etc/profile.d/kde.sh
-cat $CWD/post-install/kde-baseapps/profile.d/kde.csh \
+cat $CWD/post-install/kservice/profile.d/kde.csh \
   | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \
   > $PKG/etc/profile.d/kde.csh
 chmod 0755 $PKG/etc/profile.d/*
diff --git a/kde/post-install/kde-baseapps/profile.d/kde.csh b/kde/post-install/kservice/profile.d/kde.csh
index ce8f0c3..cce370c 100644
--- a/kde/post-install/kde-baseapps/profile.d/kde.csh
+++ b/kde/post-install/kservice/profile.d/kde.csh
@@ -12,7 +12,11 @@ else
 endif
 
 if ( ! $?XDG_RUNTIME_DIR ) then
-    setenv XDG_RUNTIME_DIR /run/user/$USER
+    # Using /run/user would be more in line with XDG specs, but in that case
+    # we should mount /run as tmpfs and add this to the Slackware rc scripts:
+    # mkdir /run/user ; chmod 1777 /run/user
+    # setenv XDG_RUNTIME_DIR /run/user/$USER
+    setenv XDG_RUNTIME_DIR /tmp/xdg-runtime-$USER
     mkdir -p $XDG_RUNTIME_DIR
     chown $USER $XDG_RUNTIME_DIR
     chmod 700 $XDG_RUNTIME_DIR
diff --git a/kde/post-install/kde-baseapps/profile.d/kde.sh b/kde/post-install/kservice/profile.d/kde.sh
index dfc93bd..9448c34 100644
--- a/kde/post-install/kde-baseapps/profile.d/kde.sh
+++ b/kde/post-install/kservice/profile.d/kde.sh
@@ -10,7 +10,11 @@ else
   XDG_CONFIG_DIRS=/etc/xdg:/etc/kde/xdg
 fi
 if [ "$XDG_RUNTIME_DIR" = "" ]; then
-  XDG_RUNTIME_DIR=/run/user/$USER
+  # Using /run/user would be more in line with XDG specs, but in that case
+  # we should mount /run as tmpfs and add this to the Slackware rc scripts:
+  # mkdir /run/user ; chmod 1777 /run/user
+  # XDG_RUNTIME_DIR=/run/user/$USER
+  XDG_RUNTIME_DIR=/tmp/xdg-runtime-$USER
   mkdir -p $XDG_RUNTIME_DIR
   chown $USER $XDG_RUNTIME_DIR
   chmod 700 $XDG_RUNTIME_DIR
diff --git a/kde/post-install/plasma-workspace.post-install b/kde/post-install/plasma-workspace.post-install
index bf85e2f..ebeb5e0 100644
--- a/kde/post-install/plasma-workspace.post-install
+++ b/kde/post-install/plasma-workspace.post-install
@@ -6,9 +6,15 @@ cat $CWD/post-install/plasma-workspace/xinit/xinitrc.plasma \
   | sed -e "s/@LIBDIRSUFFIX@/$LIBDIRSUFFIX/g" \
   > $PKG/etc/X11/xinit/xinitrc.plasma
 chmod 0755 $PKG/etc/X11/xinit/xinitrc.plasma
-cat $CWD/post-install/plasma-workspace/xinit/xinitrc.kwayland \
+mkdir -p $PKG/usr/bin
+cat $CWD/post-install/plasma-workspace/scripts/startkwayland \
   | sed -e "s/@LIBDIRSUFFIX@/$LIBDIRSUFFIX/g" \
-  > $PKG/etc/X11/xinit/xinitrc.kwayland
+  > $PKG/usr/bin/startkwayland
+chmod 0755 $PKG/usr/bin/startkwayland
+
+# ck-launch-session is needed for a Wayland session, since we do not have PAM:
+sed -e 's/^Exec=dbus-launch/Exec=ck-launch-session dbus-launch --sh-syntax/' \
+  -i $PKG/usr/share/wayland-sessions/plasmawayland.desktop
 
 # Add a "fail-safe" version of KDE Plasma desktop session.
 # Prefix the name with "z_" because SDDM is braindead:
diff --git a/kde/post-install/plasma-workspace/scripts/startkwayland b/kde/post-install/plasma-workspace/scripts/startkwayland
new file mode 100644
index 0000000..506e276
--- /dev/null
+++ b/kde/post-install/plasma-workspace/scripts/startkwayland
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Start KWin as a Plasma 5 Wayland session
+ck-launch-session dbus-launch --sh-syntax --exit-with-session /usr/bin/startplasmacompositor
diff --git a/kde/post-install/plasma-workspace/xinit/xinitrc.kwayland b/kde/post-install/plasma-workspace/xinit/xinitrc.kwayland
deleted file mode 100644
index 43feb31..0000000
--- a/kde/post-install/plasma-workspace/xinit/xinitrc.kwayland
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
-    xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
-    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 startplasmacompositor
-else
-    dbus-launch --sh-syntax --exit-with-session startplasmacompositor
-fi
diff --git a/kde/post-install/sddm-qt5.post-install b/kde/post-install/sddm-qt5.post-install
index d1486c1..1a39fd0 100644
--- a/kde/post-install/sddm-qt5.post-install
+++ b/kde/post-install/sddm-qt5.post-install
@@ -1,3 +1,22 @@
 # Remove PAM related stuff:
 rm -rf $PKG/etc/pam.d
 
+# Remove the sddm.conf file because we will generate our own in doinst.sh:
+rm -f $PKG/etc/sddm.conf
+
+# Add a wrapper for the sddm binary, to enable a custom environment:
+mv $PKG/usr/bin/sddm $PKG/usr/bin/sddm.bin
+cat <<"EOT" > $PKG/usr/bin/sddm
+#!/bin/sh
+# Customized environment (LANG definition):
+if [ -f /etc/default/sddm ]; then
+  . /etc/default/sddm
+fi
+/usr/bin/sddm.bin "$*"
+EOT
+chmod 0755 $PKG/usr/bin/sddm
+
+# Let's also add an example customization (localization of the UI):
+mkdir -p  $PKG/etc/default
+echo ". /etc/profile.d/lang.sh" >  $PKG/etc/default/sddm.new
+