summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2017-10-22 17:06:41 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2017-10-22 17:10:56 -0500
commit8987be6fd7db8eb01d8bff69e947e12527e8d943 (patch)
tree43f3764b61c1294572ea05c249d0b9f7c5279f6c
parent69e1aedcdb53aba1a74a79e515ea82db497eadf2 (diff)
downloadpackages-8987be6fd7db8eb01d8bff69e947e12527e8d943.tar.gz
packages-8987be6fd7db8eb01d8bff69e947e12527e8d943.tar.bz2
packages-8987be6fd7db8eb01d8bff69e947e12527e8d943.tar.xz
packages-8987be6fd7db8eb01d8bff69e947e12527e8d943.zip
user/sddm: add ConsoleKit 2 support properly
-rw-r--r--user/sddm/APKBUILD6
-rw-r--r--user/sddm/ck2-support.patch31
2 files changed, 35 insertions, 2 deletions
diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD
index a70a73421..baed1af68 100644
--- a/user/sddm/APKBUILD
+++ b/user/sddm/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sddm
pkgver=0.16.0
-pkgrel=1
+pkgrel=2
pkgdesc="Simple Desktop Display Manager"
url="https://github.com/sddm/sddm/"
arch="all"
license="GPL-2.0"
-depends=""
+depends="consolekit2"
makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev upower-dev
consolekit2-dev linux-pam-dev qt5-qtdeclarative-dev qt5-qttools-dev"
install="sddm.post-install"
@@ -16,6 +16,7 @@ pkggroups="sddm"
subpackages="$pkgname-lang $pkgname-xdm::noarch"
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
xdm.confd"
@@ -55,5 +56,6 @@ xdm() {
}
sha512sums="114848909d3910e686f1cd0e0059a6804f7fdb45d391cdb63ce9fc319b395399bf3971534072e351fdcf525a9d2c0ed042e2b8d07679a72fa98bece9685652ca sddm-0.16.0.tar.xz
+4a0b0414c875dd499032318c134d470ed69596fa0c62e09d2265c1fd2dd4fa147bd58da835a4bf95ec597b5305bcab21bc4a94fa91ea060264ba53be6157c0d5 ck2-support.patch
f0b4eb7ef0581701157f9decc637629156f36f6711b9a4bae517f94d7a1df614c81bbd891c918f07ac50e2a3d1519c43ccb9eefd80282c95dd79eca0e8d90904 pam-path-fix.patch
5a03b3211e9d84ee762523631859a26b869aee2189f6845dc780c7a1e60a6658e2240e9ef9be05858708d2552ae77b594509dabe49794538f88d2ad6578d1fdf xdm.confd"
diff --git a/user/sddm/ck2-support.patch b/user/sddm/ck2-support.patch
new file mode 100644
index 000000000..5dafe02b3
--- /dev/null
+++ b/user/sddm/ck2-support.patch
@@ -0,0 +1,31 @@
+--- sddm-0.16.0/src/daemon/LogindDBusTypes.cpp.old 2017-10-04 12:13:38.000000000 -0500
++++ sddm-0.16.0/src/daemon/LogindDBusTypes.cpp 2017-10-22 17:09:43.693222846 -0500
+@@ -63,7 +63,7 @@
+ 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
++ 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");
+--- sddm-0.16.0/src/daemon/SeatManager.cpp.old 2017-10-04 12:13:38.000000000 -0500
++++ sddm-0.16.0/src/daemon/SeatManager.cpp 2017-10-22 17:09:17.619956307 -0500
+@@ -102,7 +102,7 @@
+ }
+
+ //fetch seats
+- auto listSeatsMsg = QDBusMessage::createMethodCall(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("ListSeats"));
++ auto listSeatsMsg = QDBusMessage::createMethodCall(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("GetSeats"));
+ QDBusPendingReply<NamedSeatPathList> reply = QDBusConnection::systemBus().asyncCall(listSeatsMsg);
+
+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply);
+@@ -113,7 +113,7 @@
+ }
+ });
+
+- 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(), QStringLiteral("SeatAdded"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath)));
+ QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath)));
+ }
+