diff options
Diffstat (limited to 'user/sddm')
| -rw-r--r-- | user/sddm/APKBUILD | 10 | ||||
| -rw-r--r-- | user/sddm/ck2-support.patch | 89 | ||||
| -rw-r--r-- | user/sddm/sddm.initd | 2 |
3 files changed, 5 insertions, 96 deletions
diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD index fa2eef17d..9aaa10397 100644 --- a/user/sddm/APKBUILD +++ b/user/sddm/APKBUILD @@ -2,22 +2,21 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sddm pkgver=0.18.1 -pkgrel=2 +pkgrel=3 pkgdesc="Simple Desktop Display Manager" url="https://github.com/sddm/sddm/" pkgusers="sddm" pkggroups="sddm" arch="all" license="GPL-2.0+" -depends="consolekit2 dbus-x11" +depends="dbus-x11 elogind" makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev upower-dev - consolekit2-dev linux-pam-dev qt5-qtdeclarative-dev qt5-qttools-dev + elogind-dev linux-pam-dev qt5-qtdeclarative-dev qt5-qttools-dev utmps-dev" subpackages="$pkgname-lang $pkgname-openrc" install="sddm.post-install" langdir="/usr/share/sddm/translations" source="https://github.com/sddm/sddm/releases/download/v$pkgver/sddm-$pkgver.tar.xz - ck2-support.patch pam-path-fix.patch sddm.initd utmpx.patch @@ -56,7 +55,6 @@ openrc() { } sha512sums="ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 sddm-0.18.1.tar.xz -075e3baf24606cdea620737dbc00f7cf5c487ab6d88e37b23a581afcfbcf872c379753c89c80ad5c90c28fa27d3e5c5df64d4fd30764fdbfc0586e0f26666fe1 ck2-support.patch f0b4eb7ef0581701157f9decc637629156f36f6711b9a4bae517f94d7a1df614c81bbd891c918f07ac50e2a3d1519c43ccb9eefd80282c95dd79eca0e8d90904 pam-path-fix.patch -10cac48b821ff7ad39ece4cbc45a8e814d00251b0f8d02f9e42888ad97f465438320f078663be98c5b39630a0bbb26f4f0d76b44574c87a76b4871872add8b9f sddm.initd +d603934552bad47edda458d7a4df2310e98bde74bdb3bf8588f5171b2a5d68814192b8dc8f5599b35402f9a747d519d985d4976e7aa50dabed445f99a112594c sddm.initd c42d8b3edbc0ae7e3d5ea7bb0080c5c50e0569f0ea947e1ba17bc794c8c0d67a214e62aad7eba0a51791c44b29a3017692bbe738250c63cb2219891bb1313422 utmpx.patch" diff --git a/user/sddm/ck2-support.patch b/user/sddm/ck2-support.patch deleted file mode 100644 index f073877fc..000000000 --- a/user/sddm/ck2-support.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp -index 79c7031..4ccfeb5 100644 ---- a/src/daemon/LogindDBusTypes.cpp -+++ b/src/daemon/LogindDBusTypes.cpp -@@ -18,6 +18,7 @@ public: - QString sessionIfaceName; - QString seatIfaceName; - QString userIfaceName; -+ QString newSeatSignalName; - }; - - LogindPathInternal::LogindPathInternal() -@@ -55,18 +56,20 @@ LogindPathInternal::LogindPathInternal() - seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat"); - sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session"); - userIfaceName = QStringLiteral("org.freedesktop.login1.User"); -+ newSeatSignalName = QStringLiteral("SeatNew"); - return; - } - - if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) { -- qDebug() << "Console kit interface found"; -+ qDebug() << "ConsoleKit interface found"; - available = true; - serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); - managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); - managerIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind - seatIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Seat"); - sessionIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Session"); - userIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.User"); -+ newSeatSignalName = QStringLiteral("SeatAdded"); - return; - } - qDebug() << "No session manager found"; -@@ -109,3 +112,8 @@ QString Logind::userIfaceName() - { - return s_instance->userIfaceName; - } -+ -+QString Logind::newSeatSignalName() -+{ -+ return s_instance->newSeatSignalName; -+} -diff --git a/src/daemon/LogindDBusTypes.h b/src/daemon/LogindDBusTypes.h -index f1e8dd4..028879a 100644 ---- a/src/daemon/LogindDBusTypes.h -+++ b/src/daemon/LogindDBusTypes.h -@@ -13,6 +13,7 @@ struct Logind - static QString sessionIfaceName(); - static QString seatIfaceName(); - static QString userIfaceName(); -+ static QString newSeatSignalName(); - }; - - -diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp -index c5afc57..6281ea8 100644 ---- a/src/daemon/SeatManager.cpp -+++ b/src/daemon/SeatManager.cpp -@@ -26,6 +26,7 @@ - #include <QDBusMessage> - #include <QDBusPendingReply> - #include <QDBusContext> -+#include <QDebug> - - #include "LogindDBusTypes.h" - -@@ -59,6 +60,12 @@ namespace SDDM { - QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply); - connect(watcher, &QDBusPendingCallWatcher::finished, this, [=]() { - watcher->deleteLater(); -+ if (Logind::serviceName().contains(QStringLiteral("ConsoleKit"))) { -+ m_canGraphical = true; -+ emit canGraphicalChanged(m_canGraphical); -+ return; -+ } -+ - if (!reply.isValid()) - return; - -@@ -113,7 +120,7 @@ namespace SDDM { - } - }); - -- QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatNew"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath))); -+ QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), Logind::newSeatSignalName(), this, SLOT(logindSeatAdded(QString,QDBusObjectPath))); - QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath))); - } - diff --git a/user/sddm/sddm.initd b/user/sddm/sddm.initd index cf5c1af79..8113454cf 100644 --- a/user/sddm/sddm.initd +++ b/user/sddm/sddm.initd @@ -4,7 +4,7 @@ depends() { needs localmount after bootmisc consolefont modules netmount keymaps - use consolekit dbus + use dbus elogind } description="Simple Desktop Display Manager" |