enhance(x11/kf6-solid): add upower

Author: BullyMaguire-lol

x11-packages/kf6-solid/build.sh

@@ -3,13 +3,18 @@ TERMUX_PKG_DESCRIPTION='Hardware integration and detection'
 TERMUX_PKG_LICENSE="LGPL-2.0, LGPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="6.23.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/solid-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=448502ea32c8e049ebd3caf34c5c768fce7f879f25f8b5e700fd3300d317a0cc
-TERMUX_PKG_DEPENDS="libimobiledevice, libplist, qt6-qtbase, libc++, util-linux"
-# media-player-info, systemd-libs, udisks2, upower can be added to TERMUX_PKG_DEPENDS when available
+TERMUX_PKG_DEPENDS="libimobiledevice, libplist, qt6-qtbase, libc++, upower, util-linux"
+# media-player-info, systemd-libs, udisks2 can be added to TERMUX_PKG_DEPENDS when available
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION%.*}), qt6-qtdeclarative, qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DCMAKE_SYSTEM_NAME=Linux
+-DBUILD_DEVICE_BACKEND_upower=ON
+-DUSE_DBUS=ON
+-DUDEV_DISABLED=ON
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
 -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
 "

x11-packages/kf6-solid/use-sessionbus.patch

@@ -0,0 +1,63 @@
+--- a/src/solid/devices/backends/upower/upowerdevice.cpp
++++ b/src/solid/devices/backends/upower/upowerdevice.cpp
+@@ -24,7 +24,7 @@
+     : Solid::Ifaces::Device()
+     , m_udi(udi)
+ {
+-    QDBusConnection::systemBus().connect(QStringLiteral(UP_DBUS_SERVICE),
++    QDBusConnection::sessionBus().connect(QStringLiteral(UP_DBUS_SERVICE),
+                                          m_udi,
+                                          QStringLiteral("org.freedesktop.DBus.Properties"),
+                                          QStringLiteral("PropertiesChanged"),
+@@ -33,7 +33,7 @@
+ 
+     // TODO port this to Solid::Power, we can't link against kdelibs4support for this signal
+     // older upower versions not affected
+-    QDBusConnection::systemBus().connect(QStringLiteral("org.freedesktop.login1"), //
++    QDBusConnection::sessionBus().connect(QStringLiteral("org.freedesktop.login1"), //
+                                          QStringLiteral("/org/freedesktop/login1"),
+                                          QStringLiteral("org.freedesktop.login1.Manager"),
+                                          QStringLiteral("PrepareForSleep"),
+@@ -201,7 +201,7 @@
+     QDBusMessage call =
+         QDBusMessage::createMethodCall(QStringLiteral(UP_DBUS_SERVICE), m_udi, QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("Get"));
+     call.setArguments({QStringLiteral(UP_DBUS_INTERFACE_DEVICE), key});
+-    QDBusReply<QVariant> reply = QDBusConnection::systemBus().call(call);
++    QDBusReply<QVariant> reply = QDBusConnection::sessionBus().call(call);
+ 
+     if (reply.isValid()) {
+         m_cache[key] = reply.value();
+@@ -227,7 +227,7 @@
+     QDBusMessage call =
+         QDBusMessage::createMethodCall(QStringLiteral(UP_DBUS_SERVICE), m_udi, QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("GetAll"));
+     call.setArguments({QStringLiteral(UP_DBUS_INTERFACE_DEVICE)});
+-    QDBusReply<QVariantMap> reply = QDBusConnection::systemBus().call(call);
++    QDBusReply<QVariantMap> reply = QDBusConnection::sessionBus().call(call);
+ 
+     if (reply.isValid()) {
+         m_cache = reply.value();
+
+--- a/src/solid/devices/backends/upower/upowermanager.cpp
++++ b/src/solid/devices/backends/upower/upowermanager.cpp
+@@ -22,7 +22,7 @@
+ UPowerManager::UPowerManager(QObject *parent)
+     : Solid::Ifaces::DeviceManager(parent)
+     , m_supportedInterfaces({Solid::DeviceInterface::GenericInterface, Solid::DeviceInterface::Battery})
+-    , m_manager(QDBusConnection::systemBus())
++    , m_manager(QDBusConnection::sessionBus())
+     , m_knownDevices(udiPrefix())
+ {
+     qDBusRegisterMetaType<QList<QDBusObjectPath>>();
+@@ -36,9 +36,9 @@
+                                                               QStringLiteral("org.freedesktop.DBus"),
+                                                               QStringLiteral("ListActivatableNames"));
+ 
+-        QDBusReply<QStringList> reply = QDBusConnection::systemBus().call(message);
++        QDBusReply<QStringList> reply = QDBusConnection::sessionBus().call(message);
+         if (reply.isValid() && reply.value().contains(QStringLiteral(UP_DBUS_SERVICE))) {
+-            QDBusConnection::systemBus().interface()->startService(QStringLiteral(UP_DBUS_SERVICE));
++            QDBusConnection::sessionBus().interface()->startService(QStringLiteral(UP_DBUS_SERVICE));
+             serviceFound = true;
+         }
+     }
+