From eb82fdc2eafc3d1b5f837fcda2c4903106d9d79a Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 22 Dec 2014 15:07:05 +0100
Subject: KDE 4.8.4 for Slackware 14.0 (07jun2012)

---
 kde/post-install/kde-baseapps.patch              |  9 +++++++++
 kde/post-install/kde-baseapps/profile.d/kde.csh  | 12 ++++++++++++
 kde/post-install/kde-baseapps/profile.d/kde.sh   | 13 +++++++++++++
 kde/post-install/kde-runtime.post-install        |  4 ++++
 kde/post-install/kde-workspace.post-install      | 11 +++++++++++
 kde/post-install/kde-workspace/xinit/xinitrc.kde |  0
 kde/post-install/kdebase.post-install            |  9 ---------
 kde/post-install/kdebase/profile.d/kde.csh       | 12 ------------
 kde/post-install/kdebase/profile.d/kde.sh        | 13 -------------
 kde/post-install/kdepim.post-install             |  2 ++
 kde/post-install/wicd-kde.post-install           |  2 ++
 11 files changed, 53 insertions(+), 34 deletions(-)
 create mode 100644 kde/post-install/kde-baseapps.patch
 create mode 100644 kde/post-install/kde-baseapps/profile.d/kde.csh
 create mode 100644 kde/post-install/kde-baseapps/profile.d/kde.sh
 mode change 100755 => 100644 kde/post-install/kde-workspace/xinit/xinitrc.kde
 delete mode 100644 kde/post-install/kdebase.post-install
 delete mode 100755 kde/post-install/kdebase/profile.d/kde.csh
 delete mode 100755 kde/post-install/kdebase/profile.d/kde.sh
 create mode 100644 kde/post-install/kdepim.post-install
 create mode 100644 kde/post-install/wicd-kde.post-install

(limited to 'kde/post-install')

diff --git a/kde/post-install/kde-baseapps.patch b/kde/post-install/kde-baseapps.patch
new file mode 100644
index 0000000..8dda636
--- /dev/null
+++ b/kde/post-install/kde-baseapps.patch
@@ -0,0 +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}/#" \
+  > $PKG/etc/profile.d/kde.sh
+cat $CWD/post-install/kde-baseapps/profile.d/kde.csh \
+  | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" \
+  > $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
new file mode 100644
index 0000000..a09579b
--- /dev/null
+++ b/kde/post-install/kde-baseapps/profile.d/kde.csh
@@ -0,0 +1,12 @@
+#!/bin/csh
+# KDE additions:
+if ( ! $?KDEDIRS ) then
+    setenv KDEDIRS /usr
+endif
+setenv PATH ${PATH}:/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
diff --git a/kde/post-install/kde-baseapps/profile.d/kde.sh b/kde/post-install/kde-baseapps/profile.d/kde.sh
new file mode 100644
index 0000000..6f0199e
--- /dev/null
+++ b/kde/post-install/kde-baseapps/profile.d/kde.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# KDE additions:
+KDEDIRS=/usr
+export KDEDIRS
+PATH="$PATH:/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
+
diff --git a/kde/post-install/kde-runtime.post-install b/kde/post-install/kde-runtime.post-install
index 914cfe8..fbdacfa 100644
--- a/kde/post-install/kde-runtime.post-install
+++ b/kde/post-install/kde-runtime.post-install
@@ -3,3 +3,7 @@
 
 # Remove the hicolor icon theme index.theme so it doesn't clobber the real one
 rm -f $PKG/usr/share/icons/hicolor/index.theme
+
+# Move the dbus configuration files to the proper place:
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
+
diff --git a/kde/post-install/kde-workspace.post-install b/kde/post-install/kde-workspace.post-install
index 68dd052..69952c7 100644
--- a/kde/post-install/kde-workspace.post-install
+++ b/kde/post-install/kde-workspace.post-install
@@ -8,6 +8,13 @@ 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
+
 # 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.
@@ -16,11 +23,15 @@ sed -i 's/AllowRootLogin=false/AllowRootLogin=true/' \
 # 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
 
 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
+
+# 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
 
 # Move the KDM files someplace FHS compliant:
diff --git a/kde/post-install/kde-workspace/xinit/xinitrc.kde b/kde/post-install/kde-workspace/xinit/xinitrc.kde
old mode 100755
new mode 100644
diff --git a/kde/post-install/kdebase.post-install b/kde/post-install/kdebase.post-install
deleted file mode 100644
index e18f8fe..0000000
--- a/kde/post-install/kdebase.post-install
+++ /dev/null
@@ -1,9 +0,0 @@
-# Add profile scripts
-mkdir -p $PKG/etc/profile.d
-cat $CWD/post-install/kdebase/profile.d/kde.sh \
-  | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" \
-  > $PKG/etc/profile.d/kde.sh
-cat $CWD/post-install/kdebase/profile.d/kde.csh \
-  | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" \
-  > $PKG/etc/profile.d/kde.csh
-chmod 0755 $PKG/etc/profile.d/*
diff --git a/kde/post-install/kdebase/profile.d/kde.csh b/kde/post-install/kdebase/profile.d/kde.csh
deleted file mode 100755
index a09579b..0000000
--- a/kde/post-install/kdebase/profile.d/kde.csh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/csh
-# KDE additions:
-if ( ! $?KDEDIRS ) then
-    setenv KDEDIRS /usr
-endif
-setenv PATH ${PATH}:/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
diff --git a/kde/post-install/kdebase/profile.d/kde.sh b/kde/post-install/kdebase/profile.d/kde.sh
deleted file mode 100755
index 6f0199e..0000000
--- a/kde/post-install/kdebase/profile.d/kde.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# KDE additions:
-KDEDIRS=/usr
-export KDEDIRS
-PATH="$PATH:/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
-
diff --git a/kde/post-install/kdepim.post-install b/kde/post-install/kdepim.post-install
new file mode 100644
index 0000000..8810114
--- /dev/null
+++ b/kde/post-install/kdepim.post-install
@@ -0,0 +1,2 @@
+# Move the dbus configuration files to the proper place:
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
diff --git a/kde/post-install/wicd-kde.post-install b/kde/post-install/wicd-kde.post-install
new file mode 100644
index 0000000..8810114
--- /dev/null
+++ b/kde/post-install/wicd-kde.post-install
@@ -0,0 +1,2 @@
+# Move the dbus configuration files to the proper place:
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
-- 
cgit v1.2.3