From ffc7e5f569219e0d5dfaed9f62248f75b6130ad0 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Tue, 13 Jan 2015 20:42:29 +0100
Subject: Fixes for sddm and kdeconnect-framework

- sddm: generate a /etc/sddm.conf properly
- keconnect-framework: fix compilation against qca-qt5
---
 kde/doinst.sh/sddm-qt5 | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'kde/doinst.sh/sddm-qt5')

diff --git a/kde/doinst.sh/sddm-qt5 b/kde/doinst.sh/sddm-qt5
index ed9aee6..6b8f9ff 100644
--- a/kde/doinst.sh/sddm-qt5
+++ b/kde/doinst.sh/sddm-qt5
@@ -11,8 +11,6 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/sddm.conf.new
-
 # Create the daemon account and homedirectory otherwise SDDM won't start:
 sddmuid=64
 sddmgid=64
@@ -53,3 +51,23 @@ fi
 mkdir -p $sddmhome
 chown -R sddm:sddm $sddmhome > /dev/null
 
+# Generate a new configuration file if it does not exist:
+chroot . sddm --example-config > /etc/sddm.conf.new
+
+# Set the KDE5 theme 'breeze' as default, integrates better with Plasma 5:
+sed -i -e "s/^CurrentTheme.*/CurrentTheme=breeze/" etc/sddm.conf.new
+
+# 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 >> etc/sddm.conf.new
+
+[XDisplay]
+MinimumVT=7
+EOT
+
+# Move over the new confguration file if needed:
+if [ -f etc/sddm.conf.new ]; then
+  config etc/sddm.conf.new
+fi
+
-- 
cgit v1.2.3