summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-01-13 20:42:29 +0100
committer Eric Hameleers <alien@slackware.com>2015-01-13 20:42:29 +0100
commitffc7e5f569219e0d5dfaed9f62248f75b6130ad0 (patch)
treeac534069f01a22a6b353fe63930382835d9e20da
parentd0edeacad75a44bc9718b9ffd8a7bb12820ef75e (diff)
downloadktown-ffc7e5f569219e0d5dfaed9f62248f75b6130ad0.tar.gz
ktown-ffc7e5f569219e0d5dfaed9f62248f75b6130ad0.tar.xz
Fixes for sddm and kdeconnect-framework
- sddm: generate a /etc/sddm.conf properly - keconnect-framework: fix compilation against qca-qt5
-rw-r--r--kde/doinst.sh/sddm-qt522
-rw-r--r--kde/patch/kdeconnect-framework.patch2
-rw-r--r--kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff65
-rw-r--r--kde/post-install/sddm-qt5.post-install17
4 files changed, 84 insertions, 22 deletions
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
+
diff --git a/kde/patch/kdeconnect-framework.patch b/kde/patch/kdeconnect-framework.patch
index ee772bc..2b8ed98 100644
--- a/kde/patch/kdeconnect-framework.patch
+++ b/kde/patch/kdeconnect-framework.patch
@@ -1,3 +1,3 @@
-# We 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 ; }
diff --git a/kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff b/kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff
index 63d37af..6b63821 100644
--- a/kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff
+++ b/kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff
@@ -1,5 +1,6 @@
---- kdeconnect-kde-408533f_20141209git/CMakeLists.txt.orig 2014-12-09 22:27:16.000000000 +0100
-+++ kdeconnect-kde-408533f_20141209git/CMakeLists.txt 2015-01-09 15:05:31.575681125 +0100
+diff -uar kdeconnect-kde-c7c1974_20150111git.orig/CMakeLists.txt kdeconnect-kde-c7c1974_20150111git/CMakeLists.txt
+--- kdeconnect-kde-c7c1974_20150111git.orig/CMakeLists.txt 2015-01-11 05:14:01.000000000 +0100
++++ kdeconnect-kde-c7c1974_20150111git/CMakeLists.txt 2015-01-13 19:35:36.186346803 +0100
@@ -7,7 +7,7 @@
find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test)
@@ -9,3 +10,63 @@
include(KDEInstallDirs)
include(KDECompilerSettings)
+diff -uar kdeconnect-kde-c7c1974_20150111git.orig/core/backends/devicelink.h kdeconnect-kde-c7c1974_20150111git/core/backends/devicelink.h
+--- kdeconnect-kde-c7c1974_20150111git.orig/core/backends/devicelink.h 2015-01-11 05:14:01.000000000 +0100
++++ kdeconnect-kde-c7c1974_20150111git/core/backends/devicelink.h 2015-01-13 19:37:54.472349672 +0100
+@@ -22,7 +22,7 @@
+ #define DEVICELINK_H
+
+ #include <QObject>
+-#include <QtCrypto>
++#include <QtCrypto/QtCrypto>
+
+ #include "../networkpackage.h"
+
+diff -uar kdeconnect-kde-c7c1974_20150111git.orig/core/daemon.cpp kdeconnect-kde-c7c1974_20150111git/core/daemon.cpp
+--- kdeconnect-kde-c7c1974_20150111git.orig/core/daemon.cpp 2015-01-11 05:14:01.000000000 +0100
++++ kdeconnect-kde-c7c1974_20150111git/core/daemon.cpp 2015-01-13 19:36:20.832347218 +0100
+@@ -27,7 +27,7 @@
+ #include <QDBusConnection>
+ #include <QNetworkSession>
+ #include <QNetworkConfigurationManager>
+-#include <QtCrypto>
++#include <QtCrypto/QtCrypto>
+ #include <QStandardPaths>
+ #include <QNetworkAccessManager>
+
+diff -uar kdeconnect-kde-c7c1974_20150111git.orig/core/device.h kdeconnect-kde-c7c1974_20150111git/core/device.h
+--- kdeconnect-kde-c7c1974_20150111git.orig/core/device.h 2015-01-11 05:14:01.000000000 +0100
++++ kdeconnect-kde-c7c1974_20150111git/core/device.h 2015-01-13 19:36:48.824345985 +0100
+@@ -27,7 +27,7 @@
+ #include <QSet>
+ #include <QSslKey>
+ #include <QTimer>
+-#include <QtCrypto>
++#include <QtCrypto/QtCrypto>
+
+ #include "networkpackage.h"
+
+diff -uar kdeconnect-kde-c7c1974_20150111git.orig/core/networkpackage.cpp kdeconnect-kde-c7c1974_20150111git/core/networkpackage.cpp
+--- kdeconnect-kde-c7c1974_20150111git.orig/core/networkpackage.cpp 2015-01-11 05:14:01.000000000 +0100
++++ kdeconnect-kde-c7c1974_20150111git/core/networkpackage.cpp 2015-01-13 19:37:33.492347812 +0100
+@@ -32,7 +32,7 @@
+ #include <QSslKey>
+ #include <QDateTime>
+ #include <qjsondocument.h>
+-#include <QtCrypto>
++#include <QtCrypto/QtCrypto>
+ #include <QDebug>
+
+ #include "dbushelper.h"
+diff -uar kdeconnect-kde-c7c1974_20150111git.orig/core/networkpackage.h kdeconnect-kde-c7c1974_20150111git/core/networkpackage.h
+--- kdeconnect-kde-c7c1974_20150111git.orig/core/networkpackage.h 2015-01-11 05:14:01.000000000 +0100
++++ kdeconnect-kde-c7c1974_20150111git/core/networkpackage.h 2015-01-13 19:35:36.224346806 +0100
+@@ -28,7 +28,7 @@
+ #include <QVariant>
+ #include <QStringList>
+ #include <QIODevice>
+-#include <QtCrypto>
++#include <QtCrypto/QtCrypto>
+ #include <QSharedPointer>
+ #include <QUrl>
+
diff --git a/kde/post-install/sddm-qt5.post-install b/kde/post-install/sddm-qt5.post-install
index a99ec44..d1486c1 100644
--- a/kde/post-install/sddm-qt5.post-install
+++ b/kde/post-install/sddm-qt5.post-install
@@ -1,20 +1,3 @@
# Remove PAM related stuff:
rm -rf $PKG/etc/pam.d
-## Set the KDE4 theme 'elarun' as default, it gives the user more options:
-#sed -i -e "s/^CurrentTheme.*/CurrentTheme=elarun/" $PKG/etc/sddm.conf
-# 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}
-