From 372bfb987532df1733c503caf9be0c02bf04d207 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 21 Jul 2016 12:43:12 +0200 Subject: kde-baseapps: define XDG_RUNTIME_DIR=/tmp/xdg-runtime-$USER This environment variable will be required by future KWin. It already was complaining if the variable was not set. Temporarily (and for Slackware 14.2 which is immutable) the directory /tmp will be used for this, but ultimately the user directory needs to be created on a tmpfs like /run . This requires a change in Slackware itself which will have to be done in slackware-current as follows: -------- 8< ------------------------------------------------------- --- /etc/rc.d/rc.S.orig 2016-06-13 03:33:03.000000000 +0200 +++ /etc/rc.d/rc.S 2016-07-21 12:53:13.262043599 +0200 @@ -25,6 +25,9 @@ if ! grep -wq "tmpfs /run tmpfs" /proc/mounts ; then /sbin/mount -v -n -t tmpfs tmpfs /run -o mode=0755 fi + # Create toplevel directory for runtime session data: + mkdir -p /run/user + chmod 1777 /run/user fi # Load the loop device kernel module: -------- 8< ------------------------------------------------------- And the KDE profile script needs to be changed to: -------- 8< ------------------------------------------------------- --- source/5/kde/post-install/kde-baseapps/profile.d/kde.sh.org 2016-07-21 11:36:30.484407127 +0200 +++ source/5/kde/post-install/kde-baseapps/profile.d/kde.sh 2016-07-21 12:51:37.561789507 +0200 @@ -10,7 +10,7 @@ XDG_CONFIG_DIRS=/etc/xdg:/etc/kde/xdg fi if [ "$XDG_RUNTIME_DIR" = "" ]; then - XDG_RUNTIME_DIR=/tmp/xdg-runtime-$USER + XDG_RUNTIME_DIR=/run/user/$USER mkdir -p $XDG_RUNTIME_DIR chown $USER $XDG_RUNTIME_DIR chmod 700 $XDG_RUNTIME_DIR -------- 8< ------------------------------------------------------- --- kde/post-install/kde-baseapps.post-install | 4 ++-- kde/post-install/kde-baseapps/profile.d/kde.csh | 9 ++++++++- kde/post-install/kde-baseapps/profile.d/kde.sh | 10 ++++++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/kde/post-install/kde-baseapps.post-install b/kde/post-install/kde-baseapps.post-install index 8dda636..3ae4e1c 100644 --- a/kde/post-install/kde-baseapps.post-install +++ b/kde/post-install/kde-baseapps.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 \ - | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" \ + | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \ > $PKG/etc/profile.d/kde.sh cat $CWD/post-install/kde-baseapps/profile.d/kde.csh \ - | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" \ + | 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/kde-baseapps/profile.d/kde.csh index a09579b..bb0ea69 100644 --- a/kde/post-install/kde-baseapps/profile.d/kde.csh +++ b/kde/post-install/kde-baseapps/profile.d/kde.csh @@ -3,10 +3,17 @@ if ( ! $?KDEDIRS ) then setenv KDEDIRS /usr endif -setenv PATH ${PATH}:/usr/lib/kde4/libexec +setenv PATH ${PATH}:/usr/lib/kf5:/usr/lib/kde4/libexec if ( $?XDG_CONFIG_DIRS ) then setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/kde/xdg else setenv XDG_CONFIG_DIRS /etc/xdg:/etc/kde/xdg endif + +if ( ! $?XDG_RUNTIME_DIR ) then + setenv XDG_RUNTIME_DIR /tmp/xdg-runtime-$USER + mkdir -p $XDG_RUNTIME_DIR + chown $USER $XDG_RUNTIME_DIR + chmod 700 $XDG_RUNTIME_DIR +endif diff --git a/kde/post-install/kde-baseapps/profile.d/kde.sh b/kde/post-install/kde-baseapps/profile.d/kde.sh index 6f0199e..8883fc8 100644 --- a/kde/post-install/kde-baseapps/profile.d/kde.sh +++ b/kde/post-install/kde-baseapps/profile.d/kde.sh @@ -2,12 +2,18 @@ # KDE additions: KDEDIRS=/usr export KDEDIRS -PATH="$PATH:/usr/lib/kde4/libexec" +PATH="$PATH:/usr/lib/kf5:/usr/lib/kde4/libexec" export PATH if [ ! "$XDG_CONFIG_DIRS" = "" ]; then XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg else XDG_CONFIG_DIRS=/etc/xdg:/etc/kde/xdg fi -export XDG_CONFIG_DIRS +if [ "$XDG_RUNTIME_DIR" = "" ]; then + XDG_RUNTIME_DIR=/tmp/xdg-runtime-$USER + mkdir -p $XDG_RUNTIME_DIR + chown $USER $XDG_RUNTIME_DIR + chmod 700 $XDG_RUNTIME_DIR +fi +export XDG_CONFIG_DIRS XDG_RUNTIME_DIR -- cgit v1.2.3