summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-01-13 21:16:15 +0100
committer Eric Hameleers <alien@slackware.com>2015-01-13 21:16:15 +0100
commit715ac541d311d3e1e6a9176ed52dc0ef5f805f1d (patch)
treee3a3cf4eafc21398c65578931cf2a8e0fcd513b3
parentffc7e5f569219e0d5dfaed9f62248f75b6130ad0 (diff)
downloadktown-715ac541d311d3e1e6a9176ed52dc0ef5f805f1d.tar.gz
ktown-715ac541d311d3e1e6a9176ed52dc0ef5f805f1d.tar.xz
Fixes for sddm and kdeconnect-framework
- sddm: correctly change the default theme to breeze in /etc/sddm.conf - kdeconnect-framework: add an extra comment line to the qca-qt5 patch
-rw-r--r--kde/doinst.sh/sddm-qt52
-rw-r--r--kde/patch/kdeconnect-framework.patch1
2 files changed, 2 insertions, 1 deletions
diff --git a/kde/doinst.sh/sddm-qt5 b/kde/doinst.sh/sddm-qt5
index 6b8f9ff..8fdf0ce 100644
--- a/kde/doinst.sh/sddm-qt5
+++ b/kde/doinst.sh/sddm-qt5
@@ -55,7 +55,7 @@ chown -R sddm:sddm $sddmhome > /dev/null
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
+sed -i -e "/\[Theme\]/,/^\[/s/^Current.*/Current=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
diff --git a/kde/patch/kdeconnect-framework.patch b/kde/patch/kdeconnect-framework.patch
index 2b8ed98..8615714 100644
--- a/kde/patch/kdeconnect-framework.patch
+++ b/kde/patch/kdeconnect-framework.patch
@@ -1,3 +1,4 @@
+# We now use Qca-qt5, not Qca.
# Change the lines with #include <QtCrypto> to #include <QtCrypto/QtCrypto> :
cat $CWD/patch/kdeconnect-framework/kdeconnect-kde_qca.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }