[gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/
commit: e4d3f8da14ece852be3a05d8ac0984e3c46905f5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Nov 15 14:29:24 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Nov 23 14:59:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d3f8da
kde-plasma/powerdevil: Always dismiss critical battery notification
Upstream commit d8c5490c99bae9f979f6483dc7b0381121a4f997
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=445171
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
...evil-5.23.3-dismiss-battery-notifications.patch | 71 ++
kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild | 71 ++
2 files changed, 142 insertions(+)
diff --git
a/kde-plasma/powerdevil/files/powerdevil-5.23.3-dismiss-battery-notifications.patch
b/kde-plasma/powerdevil/files/powerdevil-5.23.3-dismiss-battery-notifications.patch
new file mode 100644
index ..997807a2214a
--- /dev/null
+++
b/kde-plasma/powerdevil/files/powerdevil-5.23.3-dismiss-battery-notifications.patch
@@ -0,0 +1,71 @@
+From d8c5490c99bae9f979f6483dc7b0381121a4f997 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik
+Date: Mon, 8 Nov 2021 20:02:33 +0100
+Subject: [PATCH] Always dismiss critical battery notification
+
+The timer isn't running when user chose "Do nothing" on critical battery
+
+BUG: 445171
+FIXED-IN: 5.23.4
+
+
+(cherry picked from commit 5668ded34f928ffce43ebe1defb775e703b7)
+---
+ daemon/powerdevilcore.cpp | 22 +-
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/daemon/powerdevilcore.cpp b/daemon/powerdevilcore.cpp
+index 040dd6b6..c5ba3e54 100644
+--- a/daemon/powerdevilcore.cpp
b/daemon/powerdevilcore.cpp
+@@ -259,7 +259,7 @@ void Core::reparseConfiguration()
+ Q_EMIT configurationReloaded();
+
+ // Check if critical threshold might have changed and cancel the timer if
necessary.
+-if (m_criticalBatteryTimer->isActive() && currentChargePercent() >
PowerDevilSettings::batteryCriticalLevel()) {
++if (currentChargePercent() > PowerDevilSettings::batteryCriticalLevel()) {
+ m_criticalBatteryTimer->stop();
+ if (m_criticalBatteryNotification) {
+ m_criticalBatteryNotification->close();
+@@ -494,14 +494,17 @@ void Core::onDeviceAdded(const QString )
+ m_lowBatteryNotification->close();
+ }
+
+-if (m_criticalBatteryTimer->isActive() && currentChargePercent() >
PowerDevilSettings::batteryCriticalLevel()) {
+-m_criticalBatteryTimer->stop();
++if (currentChargePercent() > PowerDevilSettings::batteryCriticalLevel()) {
+ if (m_criticalBatteryNotification) {
+ m_criticalBatteryNotification->close();
+ }
+-emitRichNotification(QStringLiteral("pluggedin"),
+- i18n("Extra Battery Added"),
+- i18n("The computer will no longer go to
sleep."));
++
++if (m_criticalBatteryTimer->isActive()) {
++m_criticalBatteryTimer->stop();
++emitRichNotification(QStringLiteral("pluggedin"),
++ i18n("Extra Battery Added"),
++ i18n("The computer will no longer go to
sleep."));
++}
+ }
+ }
+
+@@ -692,11 +695,12 @@ void
Core::onAcAdapterStateChanged(PowerDevil::BackendInterface::AcAdapterState
+ m_lowBatteryNotification->close();
+ }
+
++if (m_criticalBatteryNotification) {
++m_criticalBatteryNotification->close();
++}
++
+ if (m_criticalBatteryTimer->isActive()) {
+ m_criticalBatteryTimer->stop();
+-if (m_criticalBatteryNotification) {
+-m_criticalBatteryNotification->close();
+-}
+ emitRichNotification(QStringLiteral("pluggedin"),
+ i18n("AC Adapter Plugged In"),
+ i18n("The computer will no longer go to
sleep."));
+--
+GitLab
+
diff --git a/kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild
b/kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild
new file mode 100644
index ..a6c9f5612a36
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://invent.kde.org/plasma/powerdevil;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="brightness-control caps +wireless"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/
commit: 0a1734960f32f53fd522cce1bfe806ea00093375
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 1 16:12:48 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 1 22:57:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a173496
kde-plasma/powerdevil: Fix build with app-misc/ddcutil-0.9.9
Reported-by: Stefano Crocco alice.it>
Thanks-to: Mike Lothian fireburn.co.uk>
Closes: https://bugs.gentoo.org/734918
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/powerdevil-5.19.4-ddcutil-0.9.9.patch| 24 ++
kde-plasma/powerdevil/powerdevil-5.19.4.ebuild | 2 ++
2 files changed, 26 insertions(+)
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
b/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
new file mode 100644
index 000..3a1c4c38155
--- /dev/null
+++ b/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
@@ -0,0 +1,24 @@
+From fcb26be2fb279e6ad3b7b814d26a5921d16201eb Mon Sep 17 00:00:00 2001
+From: Johannes Jordan
+Date: Mon, 29 Jun 2020 10:51:40 +
+Subject: [PATCH] Fix compilation with ddcutil 0.9.9
+
+---
+ daemon/backends/upower/ddcutilbrightness.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/daemon/backends/upower/ddcutilbrightness.cpp
b/daemon/backends/upower/ddcutilbrightness.cpp
+index e712c05a..a75aac5c 100644
+--- a/daemon/backends/upower/ddcutilbrightness.cpp
b/daemon/backends/upower/ddcutilbrightness.cpp
+@@ -56,7 +56,6 @@ void DDCutilBrightness::detect()
+
+ DDCA_Feature_List vcpList;
+ ddca_get_feature_list_by_dref(DDCA_SUBSET_COLOR, dh, false, );
+-qCDebug(POWERDEVIL) << "ddca_feature_list: "<<
ddca_feature_list_string(, "0x", ",");
+ QVector tmpVcpList;
+ for (int iVcp = 0; iVcp < m_usedVcp.count(); ++iVcp) {
+ DDCA_Non_Table_Vcp_Value returnValue;
+--
+GitLab
+
diff --git a/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
b/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
index 4f9763f2ecb..4452b67c937 100644
--- a/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${DEPEND}
>=sys-power/upower-0.9.23
"
+PATCHES=( "${FILESDIR}/${P}-ddcutil-0.9.9.patch" ) # bug 734918
+
src_configure() {
local mycmakeargs=(
-DHAVE_DDCUTIL=$(usex brightness-control)
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/
commit: b652780039e7ae6fef23c60bccb0a2d5064e8ca4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jun 23 15:25:23 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jun 23 15:29:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6527800
kde-plasma/powerdevil: Fix random inhibition issues
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=423131
Package-Manager: Portage-2.3.102, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
...owerdevil-5.18.5-fix-powermgmt-inhibition.patch | 80 ++
kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild | 69 +++
2 files changed, 149 insertions(+)
diff --git
a/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
b/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
new file mode 100644
index 000..cb6e27b7a97
--- /dev/null
+++
b/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
@@ -0,0 +1,80 @@
+From d21102cc6c7a4db204a29f376ce5eb316ef57a6e Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik
+Date: Fri, 19 Jun 2020 19:51:06 +0200
+Subject: [PATCH] Watch DBus service right away to discard pending inhibitions
+ reliably
+
+PowerDevil delays applying a power management inhibition by 5 seconds to avoid
brief inhibitions
+to e.g. wake up the screen and similar.
+However, when an inhibition was posted and the process then quit, we would
then still
+enforce the inhibition as it wasn't explicitly revoked.
+Fix this by always watching the inhibition sender and remove it from pending
when the
+service goes away.
+
+BUG: 423131
+FIXED-IN: 5.18.6
+---
+ daemon/powerdevilpolicyagent.cpp | 26 --
+ 1 file changed, 12 insertions(+), 14 deletions(-)
+
+diff --git a/daemon/powerdevilpolicyagent.cpp
b/daemon/powerdevilpolicyagent.cpp
+index a7d92dfd..2c2b1152 100644
+--- a/daemon/powerdevilpolicyagent.cpp
b/daemon/powerdevilpolicyagent.cpp
+@@ -513,6 +513,11 @@ uint
PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
+
+ const int cookie = m_lastCookie; // when the Timer below fires,
m_lastCookie might be different already
+
++if (!m_busWatcher.isNull() && !service.isEmpty()) {
++m_cookieToBusService.insert(cookie, service);
++m_busWatcher.data()->addWatchedService(service);
++}
++
+ m_pendingInhibitions.append(cookie);
+
+ qCDebug(POWERDEVIL) << "Scheduling inhibition from" << service << appName
<< "with cookie"
+@@ -532,11 +537,6 @@ uint
PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
+
+ m_cookieToAppName.insert(cookie, qMakePair(appName,
reason));
+
+-if (!m_busWatcher.isNull() && !service.isEmpty()) {
+-m_cookieToBusService.insert(cookie, service);
+-m_busWatcher.data()->addWatchedService(service);
+-}
+-
+ addInhibitionTypeHelper(cookie, static_cast<
PolicyAgent::RequiredPolicies >(types));
+
+ Q_EMIT InhibitionsChanged({ {qMakePair(appName, reason)} }, {});
+@@ -596,22 +596,20 @@ void PolicyAgent::ReleaseInhibition(uint cookie)
+ {
+ qCDebug(POWERDEVIL) << "Releasing inhibition with cookie " << cookie;
+
+-if (m_pendingInhibitions.contains(cookie)) {
++QString service = m_cookieToBusService.take(cookie);
++if (!m_busWatcher.isNull() && !service.isEmpty() &&
!m_cookieToBusService.key(service)) {
++// no cookies from service left
++m_busWatcher.data()->removeWatchedService(service);
++}
++
++if (m_pendingInhibitions.removeOne(cookie)) {
+ qCDebug(POWERDEVIL) << "It was only scheduled for inhibition but not
enforced yet, just discarding it";
+-m_pendingInhibitions.removeOne(cookie);
+ return;
+ }
+
+ Q_EMIT InhibitionsChanged(QList(), {
{m_cookieToAppName.value(cookie).first} });
+ m_cookieToAppName.remove(cookie);
+
+-
+-QString service = m_cookieToBusService.take(cookie);
+-if (!m_busWatcher.isNull() && !service.isEmpty() &&
!m_cookieToBusService.key(service)) {
+-// no cookies from service left
+-m_busWatcher.data()->removeWatchedService(service);
+-}
+-
+ // Look through all of the inhibition types
+ bool notify = false;
+ if (m_typesToCookie[ChangeProfile].contains(cookie)) {
+--
+GitLab
+
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
b/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
new file mode 100644
index 000..79f0394f5fe
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://invent.kde.org/plasma/powerdevil;
+
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/
commit: 53192a5a72bddafe0b56fb290eaa00fd2ab25090
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Aug 31 12:11:20 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Aug 31 12:12:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53192a5a
kde-plasma/powerdevil: fix hibernation with OpenRC
Gentoo-bug: 580994
Package-Manager: portage-2.3.0
...consolekit.system.hibernate-multiple-users.pkla | 10 ++
kde-plasma/powerdevil/powerdevil-5.7.4-r1.ebuild | 102 +
2 files changed, 112 insertions(+)
diff --git
a/kde-plasma/powerdevil/files/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
b/kde-plasma/powerdevil/files/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
new file mode 100644
index ..cd0e3fc
--- /dev/null
+++
b/kde-plasma/powerdevil/files/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
@@ -0,0 +1,10 @@
+# Enable user hibernate support with Consolekit2.
+#
+# Gentoo bug #580994
+#
+[Allow all users to hibernate with Conesolekit2]
+Identity=unix-group:users
+Action=org.freedesktop.consolekit.system.hibernate-multiple-users;org.freedesktop.consolekit.system.hibernate
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
diff --git a/kde-plasma/powerdevil/powerdevil-5.7.4-r1.ebuild
b/kde-plasma/powerdevil/powerdevil-5.7.4-r1.ebuild
new file mode 100644
index ..41c37ce
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.7.4-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_GCC_MINIMAL="4.8"
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil;
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="systemd +wireless"
+
+DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth policykit)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwayland)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep libkscreen)
+ $(add_plasma_dep plasma-workspace)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ virtual/libudev:=
+ x11-libs/libxcb
+ wireless? (
+ $(add_frameworks_dep bluez-qt)
+ $(add_frameworks_dep networkmanager-qt)
+ )
+"
+
+RDEPEND="${DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ systemd? ( >=sys-power/upower-0.9.23 )
+ !systemd? (
+ sys-auth/polkit-pkla-compat
+ || (
+ (
+ >=sys-auth/consolekit-1.0.1
+ sys-power/pm-utils
+ >=sys-power/upower-0.9.23
+ )
+ sys-power/upower-pm-utils
+ )
+ )
+ !kde-base/powerdevil:4
+ !kde-base/systemsettings:4[handbook]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.6.95-wireless-optional.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package wireless KF5BluezQt)
+ $(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ if ! use systemd ; then
+ insinto /etc/polkit-1/localauthority/10-vendor.d/
+ doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
+ doins
"${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
+ doins
"${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+ doins
"${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
+ doins
"${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
+ fi
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if has_version sys-power/upower-pm-utils && ! use systemd ; then
+ ewarn "You have sys-power/upower-pm-utils installed, which was
recommended in the past to"
+ ewarn "enable suspend and hibernate support. This workaround is
no longer required, and it"
+ ewarn "is now recommended to use a recent version of
