summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-01-22 00:32:55 +0100
committer Eric Hameleers <alien@slackware.com>2020-01-22 00:32:55 +0100
commitedd298d55a47146a10198675fedabdf5325d573c (patch)
tree526b14560267b5a7d87e8af798b0acab77d6f1b2
parent2854a2393dfbabac69d6866b53c3848fd0f4fbed (diff)
downloadktown-edd298d55a47146a10198675fedabdf5325d573c.tar.gz
ktown-edd298d55a47146a10198675fedabdf5325d573c.tar.xz
KDE: updated sddm-qt5 in plasma-extra
-rw-r--r--kde/patch/sddm-qt5.patch3
-rw-r--r--kde/patch/sddm-qt5/sddm_ck2_revert.patch20
-rw-r--r--kde/patch/sddm-qt5/sddm_userxsession.diff8
3 files changed, 27 insertions, 4 deletions
diff --git a/kde/patch/sddm-qt5.patch b/kde/patch/sddm-qt5.patch
index 21f2c04..d57fb12 100644
--- a/kde/patch/sddm-qt5.patch
+++ b/kde/patch/sddm-qt5.patch
@@ -2,6 +2,9 @@
# (brings back the switch_user functionality in KDE):
cat $CWD/patch/sddm-qt5/sddm_consolekit.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Don't assume that ConsoleKit2 exposes a login1 dbus interface:
+cat $CWD/patch/sddm-qt5/sddm_ck2_revert.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
# SDDM 0.14 sources $HOME/.xsession which in Slackware will override the
# session selection you make in SDDM. We fix that unwanted side effect by
# reverting the change:
diff --git a/kde/patch/sddm-qt5/sddm_ck2_revert.patch b/kde/patch/sddm-qt5/sddm_ck2_revert.patch
new file mode 100644
index 0000000..bbe2a27
--- /dev/null
+++ b/kde/patch/sddm-qt5/sddm_ck2_revert.patch
@@ -0,0 +1,20 @@
+SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2
+has the same interface names as logind.
+
+This patch forces sddm to use legacy behaviour when consolekit2 is detected.
+
+Bug: https://bugs.gentoo.org/633920
+Bug: https://github.com/sddm/sddm/issues/903
+Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99
+
+--- a/src/daemon/LogindDBusTypes.cpp
++++ b/src/daemon/LogindDBusTypes.cpp
+@@ -60,7 +60,7 @@
+
+ if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
+ qDebug() << "Console kit interface found";
+- available = true;
++ available = false;
+ serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
+ managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
+ managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind
diff --git a/kde/patch/sddm-qt5/sddm_userxsession.diff b/kde/patch/sddm-qt5/sddm_userxsession.diff
index cbfa1ef..3dcea1f 100644
--- a/kde/patch/sddm-qt5/sddm_userxsession.diff
+++ b/kde/patch/sddm-qt5/sddm_userxsession.diff
@@ -1,6 +1,6 @@
---- sddm-0.14.0/data/scripts/Xsession.orig 2016-08-28 13:54:03.000000000 +0200
-+++ sddm-0.14.0/data/scripts/Xsession 2016-11-06 21:35:43.183138893 +0100
-@@ -84,10 +84,6 @@
+--- sddm-0.18.1/data/scripts/Xsession.orig 2018-09-26 21:03:47.000000000 +0200
++++ sddm-0.18.1/data/scripts/Xsession 2020-01-21 11:55:24.997845799 +0100
+@@ -91,10 +91,6 @@
fi
[ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
@@ -8,6 +8,6 @@
- . "$USERXSESSION"
-fi
-
- if [ -z "$@" ]; then
+ if [ -z "$*" ]; then
exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
else