From c31681bf73cbc02d3f6207adf6ca6e80a832cde0 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 9 Jan 2015 14:38:37 +0100
Subject: New dependency for kwin: libepoxy.

---
 kde/doinst.sh/sddm-qt5                             | 40 ++++++++++++++++++++++
 kde/post-install/oxygen-fonts.post-install         |  2 +-
 kde/post-install/plasma-desktop.post-install       |  2 +-
 kde/post-install/plasma-workspace.post-install     | 27 +++++++--------
 .../plasma-workspace/xinit/xinitrc.plasma          | 24 ++++++-------
 .../plasma-workspace/xsession/kde5init             | 19 +++++-----
 kde/post-install/powerdevil.post-install           |  2 +-
 kde/post-install/sddm-qt5.post-install             |  9 +++++
 8 files changed, 86 insertions(+), 39 deletions(-)

(limited to 'kde')

diff --git a/kde/doinst.sh/sddm-qt5 b/kde/doinst.sh/sddm-qt5
index cd5ea21..ed9aee6 100644
--- a/kde/doinst.sh/sddm-qt5
+++ b/kde/doinst.sh/sddm-qt5
@@ -13,3 +13,43 @@ config() {
 
 config etc/sddm.conf.new
 
+# Create the daemon account and homedirectory otherwise SDDM won't start:
+sddmuid=64
+sddmgid=64
+sddmhome=/var/lib/sddm
+
+if ! chroot . getent group sddm > /dev/null; then
+  chroot . groupadd -g $sddmgid sddm
+  res=$?
+  if [ $res -ne 0 ]; then
+cat <<EOT
+A group with GID $sddmgid already exists!
+You'll have add a 'sddm' group manually.  Run this command (as root):
+  groupadd -g GID sddm
+and select a free value for GID that is below 500 (check /etc/group)"
+Then, run an "upgradepkg --reinstall" of this sddm-qt5 package so that it can run the rest of the install script.
+EOT
+  fi
+fi
+if ! chroot . getent passwd sddm > /dev/null; then
+  useradd -c "SDDM Daemon Owner" -d $sddmhome -u $sddmuid \
+    -g sddm -s /bin/false sddm
+  res=$?
+  if [ $res -ne 0 ]; then
+    cat <<EOT
+Could not create 'sddm' user account.
+Does an account with UID $sddmuid already exist?
+You'll have add a 'sddm' user manually.  Run these commands (as root):
+  useradd -c "SDDM Daemon Owner" -d $sddmhome -u UID -g sddm -s /bin/false sddm
+  passwd -l sddm
+and select a free value for UID that is below 500 (check /etc/passwd)
+Then, run an "upgradepkg --reinstall" of this sddm-qt5 package so that it can run the rest of the install script.
+EOT
+  else
+    chroot . passwd -l sddm > /dev/null
+  fi
+fi
+
+mkdir -p $sddmhome
+chown -R sddm:sddm $sddmhome > /dev/null
+
diff --git a/kde/post-install/oxygen-fonts.post-install b/kde/post-install/oxygen-fonts.post-install
index 0b23495..300b6c5 100755
--- a/kde/post-install/oxygen-fonts.post-install
+++ b/kde/post-install/oxygen-fonts.post-install
@@ -1,5 +1,5 @@
 # Install fonts:
-FONTSDIR=/opt/kf5/share/fonts/oxygen
+FONTSDIR=/usr/share/fonts/TTF/oxygen
 mkdir -p $PKG/$FONTSDIR
 find . -name "*.ttf" -exec install -m644 {} $PKG/$FONTSDIR \;
 
diff --git a/kde/post-install/plasma-desktop.post-install b/kde/post-install/plasma-desktop.post-install
index 1a86dad..10b156d 100644
--- a/kde/post-install/plasma-desktop.post-install
+++ b/kde/post-install/plasma-desktop.post-install
@@ -1,4 +1,4 @@
 # Move the polkit dbus configuration files to the proper place:
 mkdir -p $PKG/etc
-mv $PKG/opt/kf5//etc/dbus-1 $PKG/etc/
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
 
diff --git a/kde/post-install/plasma-workspace.post-install b/kde/post-install/plasma-workspace.post-install
index 6adbcb6..bb5ddec 100644
--- a/kde/post-install/plasma-workspace.post-install
+++ b/kde/post-install/plasma-workspace.post-install
@@ -7,35 +7,32 @@ cat $CWD/post-install/plasma-workspace/xinit/xinitrc.plasma \
   > $PKG/etc/X11/xinit/xinitrc.plasma
 chmod 0755 $PKG/etc/X11/xinit/xinitrc.plasma
 
-# Fix a path in the startkde script:
-sed -e 's,/opt/kf5/lib64/libexec/kf5/start_kdeinit_wrapper,/usr/lib64/libexec/kf5/start_kdeinit_wrapper,' -i $PKG/opt/kf5/bin/startkde
+## Fix a path in the startkde script:
+#sed -e 's,/opt/kd5/lib64/libexec/kf5/start_kdeinit_wrapper,/usr/lib64/libexec/kf5/start_kdeinit_wrapper,' -i $PKG/opt/kf5/bin/startkde
 
 # Allow other login managers to show KDE Plasma2 desktop sessions:
 mkdir -p $PKG/usr/share/xsessions
 cat $CWD/post-install/plasma-workspace/xsession/kde5-plasma.desktop \
-  | sed -e "s,@PREFIX@,/opt/kf5,g" \
+  | sed -e "s,@PREFIX@,/usr,g" \
   >  $PKG/usr/share/xsessions/kde5-plasma.desktop
 cat $CWD/post-install/plasma-workspace/xsession/kde5-plasma-safe.desktop \
-  | sed -e "s,@PREFIX@,/opt/kf5,g" \
+  | sed -e "s,@PREFIX@,/usr,g" \
   >  $PKG/usr/share/xsessions/kde5-plasma-safe.desktop
-mkdir -p $PKG/opt/kf5/bin
+mkdir -p $PKG/usr/bin
 cat $CWD/post-install/plasma-workspace/xsession/kde5init \
-  | sed -e "s,@PREFIX@,/opt/kf5,g" \
+  | sed -e "s,@PREFIX@,/usr,g" \
         -e "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" \
-  >  $PKG/opt/kf5/bin/kde5init
-chmod 755 $PKG/opt/kf5/bin/kde5init
+  >  $PKG/usr/bin/kde5init
+chmod 755 $PKG/usr/bin/kde5init
 
 # What is "plugins/plugins"?
-mv $PKG/opt/kf5/lib64/qt5/plugins/{plugins,}/phonon_platform
-rmdir $PKG/opt/kf5/lib64/qt5/plugins/plugins
+mv $PKG/usr/lib64/qt5/plugins/{plugins,}/phonon_platform
+rmdir $PKG/usr/lib64/qt5/plugins/plugins
 
 # Move the polkit dbus configuration files to the proper place:
 mkdir -p $PKG/etc
-mv $PKG/opt/kf5//etc/dbus-1 $PKG/etc/
-
-# Create a utility symlink - required on x86 but not on x86_64 ???
-ln -s /usr/lib${LIBDIRSUFFIX}/libexec/kf5 $PKG/opt/kf5/lib${LIBDIRSUFFIX}/libexec/
+mv $PKG//etc/kde/dbus-1 $PKG/etc/
 
 # For shadow, this file needs to be setuid root just like the KDE4 version:
-chmod +s $PKG/opt/kf5/lib$LIBDIRSUFFIX/libexec/kcheckpass
+chmod +s $PKG/usr/lib$LIBDIRSUFFIX/libexec/kcheckpass
 
diff --git a/kde/post-install/plasma-workspace/xinit/xinitrc.plasma b/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
index 18fd622..390020e 100644
--- a/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
+++ b/kde/post-install/plasma-workspace/xinit/xinitrc.plasma
@@ -24,18 +24,18 @@ if [ -f $usermodmap ]; then
     xmodmap $usermodmap
 fi
 
-# KDE Frameworks 5 plus Plasma Next:
-export KF5=/opt/kf5
-export PATH=$KF5/bin:$KF5/lib@LIBDIRSUFFIX@/qt5/bin:$PATH
-export QML2_IMPORT_PATH=$KF5/lib@LIBDIRSUFFIX@/qt5/qml:/usr/lib@LIBDIRSUFFIX@/qt5/qml
-export QT_PLUGIN_PATH=$KF5/lib@LIBDIRSUFFIX@/qt5/plugins:/usr/lib@LIBDIRSUFFIX@/qt5/plugins
-export XDG_CONFIG_DIRS=$KF5/etc/xdg:/etc/xdg:/etc/kde/xdg
-export XDG_DATA_DIRS=$KF5/share:/usr/share:/usr/local/share
-
-export XDG_DATA_HOME="$HOME/.local5"
-export XDG_CONFIG_HOME="$HOME/.config5"
-export XDG_CACHE_HOME="$HOME/.cache5"
-export KDEHOME="$HOME/.kde5"
+## KDE Frameworks 5 plus Plasma Next:
+#export KF5=/opt/kf5
+#export PATH=$KF5/bin:$KF5/lib@LIBDIRSUFFIX@/qt5/bin:$PATH
+#export QML2_IMPORT_PATH=$KF5/lib@LIBDIRSUFFIX@/qt5/qml:/usr/lib@LIBDIRSUFFIX@/qt5/qml
+#export QT_PLUGIN_PATH=$KF5/lib@LIBDIRSUFFIX@/qt5/plugins:/usr/lib@LIBDIRSUFFIX@/qt5/plugins
+#export XDG_CONFIG_DIRS=$KF5/etc/xdg:/etc/xdg:/etc/kde/xdg
+#export XDG_DATA_DIRS=$KF5/share:/usr/share:/usr/local/share
+
+#export XDG_DATA_HOME="$HOME/.local5"
+#export XDG_CONFIG_HOME="$HOME/.config5"
+#export XDG_CACHE_HOME="$HOME/.cache5"
+#export KDEHOME="$HOME/.kde5"
 
 # Start the window manager:
 if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
diff --git a/kde/post-install/plasma-workspace/xsession/kde5init b/kde/post-install/plasma-workspace/xsession/kde5init
index 75fb697..b9acc91 100644
--- a/kde/post-install/plasma-workspace/xsession/kde5init
+++ b/kde/post-install/plasma-workspace/xsession/kde5init
@@ -1,15 +1,16 @@
 # KDE Frameworks 5 plus Plasma Next:
 export KF5=@PREFIX@
-export PATH=$KF5/bin:$KF5/lib@LIBDIRSUFFIX@/qt5/bin:$PATH
-export QML2_IMPORT_PATH=$KF5/lib@LIBDIRSUFFIX@/qt5/qml:/usr/lib@LIBDIRSUFFIX@/qt5/qml
-export QT_PLUGIN_PATH=$KF5/lib@LIBDIRSUFFIX@/qt5/plugins:/usr/lib@LIBDIRSUFFIX@/qt5/plugins
-export XDG_CONFIG_DIRS=$KF5/etc/xdg:/etc/xdg:/etc/kde/xdg
-export XDG_DATA_DIRS=$KF5/share:/usr/share:/usr/local/share
 
-export XDG_DATA_HOME="$HOME/.local5"
-export XDG_CONFIG_HOME="$HOME/.config5"
-export XDG_CACHE_HOME="$HOME/.cache5"
-export KDEHOME="$HOME/.kde5"
+#export PATH=$KF5/bin:$KF5/lib@LIBDIRSUFFIX@/qt5/bin:$PATH
+#export QML2_IMPORT_PATH=$KF5/lib@LIBDIRSUFFIX@/qt5/qml:/usr/lib@LIBDIRSUFFIX@/qt5/qml
+#export QT_PLUGIN_PATH=$KF5/lib@LIBDIRSUFFIX@/qt5/plugins:/usr/lib@LIBDIRSUFFIX@/qt5/plugins
+#export XDG_CONFIG_DIRS=$KF5/etc/xdg:/etc/xdg:/etc/kde/xdg
+#export XDG_DATA_DIRS=$KF5/share:/usr/share:/usr/local/share
+
+#export XDG_DATA_HOME="$HOME/.local5"
+#export XDG_CONFIG_HOME="$HOME/.config5"
+#export XDG_CACHE_HOME="$HOME/.cache5"
+#export KDEHOME="$HOME/.kde5"
 
 # Start the window manager:
 exec $KF5/bin/startkde "$*"
diff --git a/kde/post-install/powerdevil.post-install b/kde/post-install/powerdevil.post-install
index 1a86dad..19920d4 100644
--- a/kde/post-install/powerdevil.post-install
+++ b/kde/post-install/powerdevil.post-install
@@ -1,4 +1,4 @@
 # Move the polkit dbus configuration files to the proper place:
 mkdir -p $PKG/etc
-mv $PKG/opt/kf5//etc/dbus-1 $PKG/etc/
+mv $PKG//etc/kde/dbus-1 $PKG/etc/
 
diff --git a/kde/post-install/sddm-qt5.post-install b/kde/post-install/sddm-qt5.post-install
index 0bcecce..a99ec44 100644
--- a/kde/post-install/sddm-qt5.post-install
+++ b/kde/post-install/sddm-qt5.post-install
@@ -6,6 +6,15 @@ rm -rf $PKG/etc/pam.d
 # Set the KDE5 theme 'breeze' as default, integrates better with Plasma 5:
 sed -i -e "s/^CurrentTheme.*/CurrentTheme=breeze/" $PKG/etc/sddm.conf 
 
+# SDDM follows the systemd convention of starting the first graphical session
+# on tty1.  We prefer the old convention where tty1 through tty6
+# are reserved for text consoles:
+cat <<EOT >> $PKG//etc/sddm.conf
+
+[XDisplay]
+MinimumVT=7
+EOT
+
 # Do not clobber existing configuration files:
 mv $PKG/etc/sddm.conf{,.new}
 
-- 
cgit v1.2.3