user/*: Replace ConsoleKit2 with elogind

9 files changed, 18 insertions, 109 deletions

diff --git a/user/bluez/APKBUILD b/user/bluez/APKBUILD
index 44cc8d6a1..6f90834b1 100644
--- a/user/bluez/APKBUILD
+++ b/user/bluez/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=bluez
 pkgver=5.54
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch="all"
 license="GPL-2.0+"
-depends="consolekit2 dbus"
+depends="dbus elogind"
 makedepends="alsa-lib-dev dbus-dev eudev-dev glib-dev libical-dev
 	linux-headers ncurses-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bccmd
diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD
index 19f6a0c4d..64c3da085 100644
--- a/user/kscreenlocker/APKBUILD
+++ b/user/kscreenlocker/APKBUILD
@@ -2,20 +2,20 @@
 # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
 pkgname=kscreenlocker
 pkgver=5.18.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Secure X11 screen locker"
 url="https://www.kde.org/"
 arch="all"
 options="!check"  # requires loginctl
 license="(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0+"
-depends="consolekit2 linux-pam qdbus"
+depends="elogind linux-pam qdbus"
 depends_dev="qt5-qtbase-dev"
 makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev
 	libxcb-dev libxcursor-dev libxext-dev libxi-dev linux-pam-dev
 	qt5-qtdeclarative-dev kcmutils-dev kcrash-dev kdeclarative-dev
 	kglobalaccel-dev ki18n-dev kidletime-dev knotifications-dev
 	ktextwidgets-dev kwayland-dev kwindowsystem-dev kxmlgui-dev solid-dev
-	consolekit2-dev"
+	elogind-dev"
 subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.kde.org/stable/plasma/${pkgver%.*}/kscreenlocker-$pkgver.tar.xz
 	kde.pam
diff --git a/user/mate-complete/APKBUILD b/user/mate-complete/APKBUILD
index 011965eca..24062053e 100644
--- a/user/mate-complete/APKBUILD
+++ b/user/mate-complete/APKBUILD
@@ -8,7 +8,7 @@ url="https://mate-desktop.org"
 arch="noarch"
 options="!check" # No tests
 license="Public-Domain"
-depends="atril caja caja-dropbox caja-extensions consolekit2 engrampa eom marco
+depends="atril caja caja-dropbox caja-extensions elogind engrampa eom marco
 	mate-applets mate-backgrounds mate-calc mate-control-center
 	mate-desktop mate-icon-theme mate-indicator-applet mate-media
 	mate-menus mate-netbook mate-notification-daemon mate-panel
diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD
index 4c6a4e690..006e1a1e1 100644
--- a/user/networkmanager/APKBUILD
+++ b/user/networkmanager/APKBUILD
@@ -2,14 +2,14 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=networkmanager
 pkgver=1.22.14
-pkgrel=0
+pkgrel=1
 pkgdesc="Network management daemon"
 url="https://wiki.gnome.org/Projects/NetworkManager"
 arch="all"
 options="!check"  # Requires dbus-python and running DBus server.
 license="GPL-2.0+ AND LGPL-2.1+"
 depends="dhcpcd iputils ppp wpa_supplicant-dbus"
-makedepends="bash bluez-dev consolekit2-dev curl-dev dbus-dev dbus-glib-dev
+makedepends="bash bluez-dev curl-dev dbus-dev dbus-glib-dev elogind-dev
 	eudev-dev glib-dev gobject-introspection-dev intltool libedit-dev
 	libndp-dev libxslt modemmanager-dev ncurses-dev newt-dev nss-dev
 	perl polkit-dev ppp-dev py3-pygobject util-linux-dev vala-dev"
@@ -56,8 +56,8 @@ build() {
 		--with-nmcli=yes \
 		--with-nmtui \
 		--with-pppd-plugin-dir=/usr/lib/pppd/$(ls -1 /usr/lib/pppd | head) \
-		--with-session-tracking=consolekit \
-		--with-suspend-resume=consolekit \
+		--with-session-tracking=elogind \
+		--with-suspend-resume=elogind \
 		--without-dhclient \
 		--without-libaudit \
 		--without-libpsl \
@@ -100,4 +100,4 @@ d81a962e32e696ca713dfcf1f8dbd9a146f94473c391f1977198ca67e11a6d427a265bacbe43197e
 22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214  01-org.freedesktop.NetworkManager.rules
 26f962cea0b6a75549d16c19a71e3559239b08b001927882702f5d9355a2cc95f7b13c581439f758a950d9a5bfb73b86ba61a5ffb22c9abe19f5b05fe5f5834a  10-openrc-status
 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a  nm.confd
-a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658  nm.initd"
+9a5ab7d317797489a555b185d103d3c526cd6963c6586da2f5212b41e68a9bf5dedd52d1fe58718fb686379b6e2434924d06d7da8070a62a3ec3e5626ab90d14  nm.initd"
diff --git a/user/networkmanager/nm.initd b/user/networkmanager/nm.initd
index 3209644c5..c8aae7e7f 100644
--- a/user/networkmanager/nm.initd
+++ b/user/networkmanager/nm.initd
@@ -8,7 +8,7 @@ when a network connection is established."
 
 depend() {
 	need dbus
-	use consolekit
+	use elogind
 	provide net
 }
 
diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD
index b66828fe1..b65eaf0b5 100644
--- a/user/plasma-desktop/APKBUILD
+++ b/user/plasma-desktop/APKBUILD
@@ -14,7 +14,7 @@ depends="breeze breeze-icons kirigami2 oxygen qt5-qtquickcontrols2
 # shell/QML dependencies
 depends="$depends kde-cli-tools kded kwin qt5-qtgraphicaleffects setxkbmap"
 # Good Ideas™ to have
-depends="$depends consolekit2 kdeclarative polkit-kde-agent-1"
+depends="$depends elogind kdeclarative polkit-kde-agent-1"
 makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev
 	qt5-qtsvg-dev kdelibs4support-dev xf86-input-synaptics-dev
 	kauth-dev plasma-framework-dev kdoctools-dev ki18n-dev libkworkspace-dev
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"