* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/
@ 2021-01-24 19:44 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-01-24 19:44 UTC (permalink / raw
To: gentoo-commits
commit: e465503c42929dfe9ccadf5725049c0cfb0da070
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 11:48:16 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:42:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e465503c
kde-plasma/powerdevil: drop 5.19.5*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/powerdevil/Manifest | 1 -
.../files/powerdevil-5.19.4-ddcutil-0.9.9.patch | 24 --------
kde-plasma/powerdevil/powerdevil-5.19.5.ebuild | 69 ----------------------
3 files changed, 94 deletions(-)
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 76c3585ada6..8b74a422e5d 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1 @@
-DIST powerdevil-5.19.5.tar.xz 600388 BLAKE2B 0b99c229b576d8a033187dd81a0f6f199ff991f9c1eb4c6856a77a7ddd269ddf1ce50a76ea71821487be11593f5740a7d66a2af3e6b6c1f983a5e87bfc008b9b SHA512 5f1b1e8fdcd996769024a4f008527960fc91af32862047fdd13674ddb6925fd7b1a024a5c45182d14be32aa0bb8ba1bc694476061e480bcdfb3bdcb65d60cb16
DIST powerdevil-5.20.5.tar.xz 610300 BLAKE2B 9d392db560a7685a3cef29bf61ae553a8bc8e3d6e30e22ccc5316117d78d7087c35060e777912962ff421cb0f23481fa558cda59237254c7ce201da97031d89c SHA512 c862314d5ad446fb48c08f3e6cbcc72bad0f1825756954ae0d2bd1ceac55e3324124698d3d0803103ff35561bf4fcddaa00831b7b4cb93763d17876a348a3c6f
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
deleted file mode 100644
index 3a1c4c38155..00000000000
--- a/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fcb26be2fb279e6ad3b7b814d26a5921d16201eb Mon Sep 17 00:00:00 2001
-From: Johannes Jordan <kde@lanrules.de>
-Date: Mon, 29 Jun 2020 10:51:40 +0000
-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, &vcpList);
-- qCDebug(POWERDEVIL) << "ddca_feature_list: "<< ddca_feature_list_string(&vcpList, "0x", ",");
- QVector<uint16_t> 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.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
deleted file mode 100644
index e2c03a38d2c..00000000000
--- a/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.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 x86"
-IUSE="brightness-control +wireless"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5[policykit]
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- virtual/libudev:=
- x11-libs/libxcb
- brightness-control? ( app-misc/ddcutil )
- wireless? (
- >=kde-frameworks/bluez-qt-${KFMIN}:5
- >=kde-frameworks/networkmanager-qt-${KFMIN}:5
- )
-"
-RDEPEND="${DEPEND}
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
- >=sys-power/upower-0.9.23
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.19.4-ddcutil-0.9.9.patch" ) # bug 734918
-
-src_configure() {
- local mycmakeargs=(
- -DHAVE_DDCUTIL=$(usex brightness-control)
- $(cmake_use_find_package wireless KF5BluezQt)
- $(cmake_use_find_package wireless KF5NetworkManagerQt)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/
@ 2021-11-30 14:33 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-11-30 14:33 UTC (permalink / raw
To: gentoo-commits
commit: 732d7cc702c752764efa4f524f37381027723f6d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 30 14:20:23 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 14:32:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732d7cc7
kde-plasma/powerdevil: drop 5.23.3*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/powerdevil/Manifest | 1 -
...evil-5.23.3-dismiss-battery-notifications.patch | 71 ----------------------
kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild | 71 ----------------------
3 files changed, 143 deletions(-)
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index cd88cbd0a974..c6962313d801 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,3 +1,2 @@
DIST powerdevil-5.22.5.tar.xz 618576 BLAKE2B 5d4128adf99d0d3c355b28ca320c280b44f605a92adfb86582d9294752fce47a689023d38a0480dc5e91704c273774048fa8a38b62f9c3065bc5e9fe91a8c050 SHA512 9ecef0eec3673ac4560a0e50a3e31299718af9575d4a11e274d5e1d1516971362d93ca31e66b79b3593a68b1aebf93502066de7e4134761c5681dba84ab79318
-DIST powerdevil-5.23.3.tar.xz 629172 BLAKE2B 062b1eb703d9c609ce8c8477b2869c5a0c22278191d71ca1c94fdea579976e2f783db691bce1b245b086f09a08df53652159f74ea1040435cbfe7b608c7fcc3b SHA512 6ad425a4748fde502749b6d6b5e9d925c733322ca9c39c098d946c0607b8d865ac0ccc98d5dd35909cded439b181a25994681e40477c00878b2497e298dcffd2
DIST powerdevil-5.23.4.tar.xz 629336 BLAKE2B 26f92a14012585ce15ff0f00f3c57c4e11cba986a1b467f210d77bf6488fd552138b3775774fb2b17d1d340e4bb5bad77fd155aeb9986fa190005204aa8416ea SHA512 a84cb7555716333e5d6ab9be114fb4072c315b244add05ad829bd476884c282a17f8166daf35d6a343bfea3407f1388374d8632e37ce6057d546b67f7deea256
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
deleted file mode 100644
index 997807a2214a..000000000000
--- a/kde-plasma/powerdevil/files/powerdevil-5.23.3-dismiss-battery-notifications.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From d8c5490c99bae9f979f6483dc7b0381121a4f997 Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-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 5668ded34f928ffce43ebe1defb775e70bbbb3b7)
----
- 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 &udi)
- 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
deleted file mode 100644
index a6c9f5612a36..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5[policykit]
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- virtual/libudev:=
- x11-libs/libxcb
- brightness-control? ( app-misc/ddcutil )
- caps? ( sys-libs/libcap )
- wireless? (
- >=kde-frameworks/bluez-qt-${KFMIN}:5
- >=kde-frameworks/networkmanager-qt-${KFMIN}:5
- )
-"
-RDEPEND="${DEPEND}
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
- >=sys-power/upower-0.9.23
-"
-
-PATCHES=( "${FILESDIR}"/${P}-dismiss-battery-notifications.patch )
-
-src_configure() {
- local mycmakeargs=(
- -DHAVE_DDCUTIL=$(usex brightness-control)
- $(cmake_use_find_package caps Libcap)
- $(cmake_use_find_package wireless KF5BluezQt)
- $(cmake_use_find_package wireless KF5NetworkManagerQt)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/
@ 2022-06-19 13:45 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-06-19 13:45 UTC (permalink / raw
To: gentoo-commits
commit: f85db18765f40d456a3b8b58e2d0b14fd9fbf745
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 13:40:37 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 13:45:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85db187
kde-plasma/powerdevil: Fix int overflow w/ screen brightness
Upstream commit dd74cdbdd3849fbd86e6613ef7ecab6c7857cb89
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=454161
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...erdevil-5.25.0-backlight-fix-int-overflow.patch | 59 ++++++++++++++++++
kde-plasma/powerdevil/powerdevil-5.25.0-r1.ebuild | 72 ++++++++++++++++++++++
2 files changed, 131 insertions(+)
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.25.0-backlight-fix-int-overflow.patch b/kde-plasma/powerdevil/files/powerdevil-5.25.0-backlight-fix-int-overflow.patch
new file mode 100644
index 000000000000..e2003dd42ef0
--- /dev/null
+++ b/kde-plasma/powerdevil/files/powerdevil-5.25.0-backlight-fix-int-overflow.patch
@@ -0,0 +1,59 @@
+From dd74cdbdd3849fbd86e6613ef7ecab6c7857cb89 Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Thu, 16 Jun 2022 00:17:42 +0300
+Subject: [PATCH] upower: Prevent integer overflow during new brightness
+ computation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Provably, if two integers can fit in 31 bits each, the result of their
+multiplication is expressible in 62 bits (let alone 63 available). So,
+this should be safe. And the division can't do much harm: the divisor
+is always at least 1, and worst case scenario — it would be so big that
+the overall results becomes zero.
+
+This code still assumes that the allowed brightness values can fit in 32
+bits int, which is not totally unreasonable so far.
+
+BUG: 454161
+
+
+(cherry picked from commit 2ebe655d220c9167b66893a823b2fff2e2b8a531)
+---
+ daemon/backends/upower/backlighthelper.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/backends/upower/backlighthelper.cpp b/daemon/backends/upower/backlighthelper.cpp
+index 84c6aee1..c9e34e4b 100644
+--- a/daemon/backends/upower/backlighthelper.cpp
++++ b/daemon/backends/upower/backlighthelper.cpp
+@@ -27,6 +27,7 @@
+ #include <KLocalizedString>
+
+ #include <algorithm>
++#include <climits>
+ #include <sys/utsname.h>
+
+ #ifdef Q_OS_FREEBSD
+@@ -318,11 +319,13 @@ bool BacklightHelper::writeBrightness(int brightness) const
+ #else
+
+ if (!m_devices.isEmpty()) {
+- int first_maxbrightness = m_devices.constFirst().second;
+- if (first_maxbrightness <= 0)
+- first_maxbrightness = 1;
++ const int first_maxbrightness = std::max(1, m_devices.constFirst().second);
+ for (const auto &device : m_devices) {
+- writeToDevice(device.first, brightness * device.second / first_maxbrightness);
++ // Some monitor brightness values are ridiculously high, and can easily overflow during computation
++ const qint64 new_brightness_64 = static_cast<qint64>(brightness) * static_cast<qint64>(device.second) / static_cast<qint64>(first_maxbrightness);
++ // cautiously truncate it back
++ const int new_brightness = static_cast<int>(std::min(static_cast<qint64>(std::numeric_limits<int>::max()), new_brightness_64));
++ writeToDevice(device.first, new_brightness);
+ }
+ }
+
+--
+GitLab
+
diff --git a/kde-plasma/powerdevil/powerdevil-5.25.0-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.25.0-r1.ebuild
new file mode 100644
index 000000000000..e12b3e0ed115
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.25.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.94.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.3
+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
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5[policykit]
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=kde-plasma/libkscreen-${PVCUT}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ virtual/libudev:=
+ x11-libs/libxcb
+ brightness-control? ( app-misc/ddcutil:= )
+ caps? ( sys-libs/libcap )
+ wireless? (
+ >=kde-frameworks/bluez-qt-${KFMIN}:5
+ >=kde-frameworks/networkmanager-qt-${KFMIN}:5
+ )
+"
+RDEPEND="${DEPEND}
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+ >=sys-power/upower-0.9.23
+"
+
+PATCHES=( "${FILESDIR}/${P}-backlight-fix-int-overflow.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DHAVE_DDCUTIL=$(usex brightness-control)
+ $(cmake_use_find_package caps Libcap)
+ $(cmake_use_find_package wireless KF5BluezQt)
+ $(cmake_use_find_package wireless KF5NetworkManagerQt)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/
@ 2022-06-21 21:28 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-06-21 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 8bcd7f407bfc49c6dd69fca0631ee7caf1c11079
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 21:20:59 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 21:28:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bcd7f40
kde-plasma/powerdevil: drop 5.25.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/powerdevil/Manifest | 1 -
...erdevil-5.25.0-backlight-fix-int-overflow.patch | 59 ------------------
kde-plasma/powerdevil/powerdevil-5.25.0-r1.ebuild | 72 ----------------------
kde-plasma/powerdevil/powerdevil-5.25.0.ebuild | 70 ---------------------
4 files changed, 202 deletions(-)
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index c0b9308f66dd..590ebd794317 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,3 +1,2 @@
DIST powerdevil-5.24.5.tar.xz 632800 BLAKE2B 657e68359664bdf4d6ac782a53148400b430ae786d5551763b45d28690d1a3481d913e47618aea015c1753389c779f7e028c03f21a328d08edc6fa5bb3ab21d1 SHA512 2f3e6888be7039bf7beb754ef117d09e79ceb4e5ef73d74f982d37785adbd7a489fc86641c9df9ea4a34fabd2ccac737f5e7ee08958d2dd03b5a676f22aa4c15
-DIST powerdevil-5.25.0.tar.xz 635828 BLAKE2B 671b8a1d1a0ba7befbca51447f28b1e687ca2d6af7195d165818fb7b3c5c5ac15a452ef5f8bdeeca160af8f1e4e55471c717b2403bc5bd3145ea9bdbf28d6cba SHA512 dde9c33f915968abc543f93c01f4975c278b314ad73ec3c70edd95357dffdb41cbef3b43bb4ca737f8aeeb3ef9e9bdfeedd9fba1252180e27d025d38b7f5ea5b
DIST powerdevil-5.25.1.tar.xz 636388 BLAKE2B 09f1a82bad2300d5d9108d5a0decc7d471f8725e386b3c8a328a95c4ace23d7449834e25598871905aa3df1442061386aa2849d781e3fe93edb3a572c5b3dd39 SHA512 e26c54c253fa4d996df38012a6b575c880b89ae513282ddbcc91a23ff89b1e5fbe345692667cc6c0b9f16b46047952bfca3a5501dff9ae8b11ed14a214887e80
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.25.0-backlight-fix-int-overflow.patch b/kde-plasma/powerdevil/files/powerdevil-5.25.0-backlight-fix-int-overflow.patch
deleted file mode 100644
index e2003dd42ef0..000000000000
--- a/kde-plasma/powerdevil/files/powerdevil-5.25.0-backlight-fix-int-overflow.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From dd74cdbdd3849fbd86e6613ef7ecab6c7857cb89 Mon Sep 17 00:00:00 2001
-From: ivan tkachenko <me@ratijas.tk>
-Date: Thu, 16 Jun 2022 00:17:42 +0300
-Subject: [PATCH] upower: Prevent integer overflow during new brightness
- computation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Provably, if two integers can fit in 31 bits each, the result of their
-multiplication is expressible in 62 bits (let alone 63 available). So,
-this should be safe. And the division can't do much harm: the divisor
-is always at least 1, and worst case scenario — it would be so big that
-the overall results becomes zero.
-
-This code still assumes that the allowed brightness values can fit in 32
-bits int, which is not totally unreasonable so far.
-
-BUG: 454161
-
-
-(cherry picked from commit 2ebe655d220c9167b66893a823b2fff2e2b8a531)
----
- daemon/backends/upower/backlighthelper.cpp | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/daemon/backends/upower/backlighthelper.cpp b/daemon/backends/upower/backlighthelper.cpp
-index 84c6aee1..c9e34e4b 100644
---- a/daemon/backends/upower/backlighthelper.cpp
-+++ b/daemon/backends/upower/backlighthelper.cpp
-@@ -27,6 +27,7 @@
- #include <KLocalizedString>
-
- #include <algorithm>
-+#include <climits>
- #include <sys/utsname.h>
-
- #ifdef Q_OS_FREEBSD
-@@ -318,11 +319,13 @@ bool BacklightHelper::writeBrightness(int brightness) const
- #else
-
- if (!m_devices.isEmpty()) {
-- int first_maxbrightness = m_devices.constFirst().second;
-- if (first_maxbrightness <= 0)
-- first_maxbrightness = 1;
-+ const int first_maxbrightness = std::max(1, m_devices.constFirst().second);
- for (const auto &device : m_devices) {
-- writeToDevice(device.first, brightness * device.second / first_maxbrightness);
-+ // Some monitor brightness values are ridiculously high, and can easily overflow during computation
-+ const qint64 new_brightness_64 = static_cast<qint64>(brightness) * static_cast<qint64>(device.second) / static_cast<qint64>(first_maxbrightness);
-+ // cautiously truncate it back
-+ const int new_brightness = static_cast<int>(std::min(static_cast<qint64>(std::numeric_limits<int>::max()), new_brightness_64));
-+ writeToDevice(device.first, new_brightness);
- }
- }
-
---
-GitLab
-
diff --git a/kde-plasma/powerdevil/powerdevil-5.25.0-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.25.0-r1.ebuild
deleted file mode 100644
index e12b3e0ed115..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.25.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.94.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.3
-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
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5[policykit]
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- virtual/libudev:=
- x11-libs/libxcb
- brightness-control? ( app-misc/ddcutil:= )
- caps? ( sys-libs/libcap )
- wireless? (
- >=kde-frameworks/bluez-qt-${KFMIN}:5
- >=kde-frameworks/networkmanager-qt-${KFMIN}:5
- )
-"
-RDEPEND="${DEPEND}
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
- >=sys-power/upower-0.9.23
-"
-
-PATCHES=( "${FILESDIR}/${P}-backlight-fix-int-overflow.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DHAVE_DDCUTIL=$(usex brightness-control)
- $(cmake_use_find_package caps Libcap)
- $(cmake_use_find_package wireless KF5BluezQt)
- $(cmake_use_find_package wireless KF5NetworkManagerQt)
- )
-
- ecm_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.25.0.ebuild b/kde-plasma/powerdevil/powerdevil-5.25.0.ebuild
deleted file mode 100644
index 4264974e6011..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.25.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.94.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.3
-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
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5[policykit]
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- virtual/libudev:=
- x11-libs/libxcb
- brightness-control? ( app-misc/ddcutil:= )
- caps? ( sys-libs/libcap )
- wireless? (
- >=kde-frameworks/bluez-qt-${KFMIN}:5
- >=kde-frameworks/networkmanager-qt-${KFMIN}:5
- )
-"
-RDEPEND="${DEPEND}
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
- >=sys-power/upower-0.9.23
-"
-
-src_configure() {
- local mycmakeargs=(
- -DHAVE_DDCUTIL=$(usex brightness-control)
- $(cmake_use_find_package caps Libcap)
- $(cmake_use_find_package wireless KF5BluezQt)
- $(cmake_use_find_package wireless KF5NetworkManagerQt)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/
@ 2025-06-02 16:49 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2025-06-02 16:49 UTC (permalink / raw
To: gentoo-commits
commit: 2ae47dde3340579d969739ca844544e8c645f38a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 30 21:34:45 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 2 16:48:07 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ae47dde
kde-plasma/powerdevil: Fix triggering an assert in KConfigGroup
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/powerdevil-6.3.5-fix-assert.patch | 108 +++++++++++++++++++++
kde-plasma/powerdevil/powerdevil-6.3.5-r2.ebuild | 96 ++++++++++++++++++
2 files changed, 204 insertions(+)
diff --git a/kde-plasma/powerdevil/files/powerdevil-6.3.5-fix-assert.patch b/kde-plasma/powerdevil/files/powerdevil-6.3.5-fix-assert.patch
new file mode 100644
index 000000000000..b8c42bcfe3cf
--- /dev/null
+++ b/kde-plasma/powerdevil/files/powerdevil-6.3.5-fix-assert.patch
@@ -0,0 +1,108 @@
+From 664ca532ed0ce583c84ecafd23e91d38b747791c Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Mon, 26 May 2025 17:51:21 +0000
+Subject: [PATCH] daemon: Fix triggering an assert in KConfigGroup
+
+If there is no current activity, KActivities::Consumer::currentActivity()
+can return an empty string. The problem with that is that the KConfigGroup
+doesn't allow empty strings to be used as group names, it has an assert
+for that.
+
+This change puts relevant code behind a guard to avoid triggering the
+assert in KConfigGroup.
+
+SENTRY: POWERDEVIL-161
+
+
+(cherry picked from commit c8ced4c4097c1db97e1c537f7f1869c225227b09)
+
+Co-authored-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+---
+ daemon/powerdevilcore.cpp | 62 ++++++++++++++++++++-------------------
+ 1 file changed, 32 insertions(+), 30 deletions(-)
+
+diff --git a/daemon/powerdevilcore.cpp b/daemon/powerdevilcore.cpp
+index 3f6801046..fc154cab4 100644
+--- a/daemon/powerdevilcore.cpp
++++ b/daemon/powerdevilcore.cpp
+@@ -300,17 +300,6 @@ void Core::loadProfile(bool force)
+ {
+ QString profileId;
+
+- // Check the activity in which we are in
+- QString activity = m_activityConsumer->currentActivity();
+- qCDebug(POWERDEVIL) << "Currently using activity " << activity;
+-
+- PowerDevil::ActivitySettings activitySettings(activity);
+-
+- qCDebug(POWERDEVIL) << "Settings for loaded activity:";
+- for (KConfigSkeletonItem *item : activitySettings.items()) {
+- qCDebug(POWERDEVIL) << item->key() << "=" << item->property();
+- }
+-
+ // let's load the current state's profile
+ if (m_batteriesPercent.isEmpty()) {
+ qCDebug(POWERDEVIL) << "No batteries found, loading AC";
+@@ -376,27 +365,40 @@ void Core::loadProfile(bool force)
+ Q_EMIT profileChanged(m_currentProfile);
+ }
+
+- // Now... any special behaviors we'd like to consider?
+- if (activitySettings.inhibitSuspend()) {
+- qCDebug(POWERDEVIL) << "Activity triggers a suspend inhibition"; // debug hence not sleep
+- // Trigger a special inhibition - if we don't have one yet
+- if (!m_sessionActivityInhibit.contains(activity)) {
+- int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::InterruptSession,
+- i18n("Activity Manager"),
+- i18n("This activity's policies prevent the system from going to sleep"));
++ // Check the activity in which we are in
++ const QString activity = m_activityConsumer->currentActivity();
++ qCDebug(POWERDEVIL) << "Currently using activity" << activity;
++
++ if (!activity.isEmpty()) {
++ PowerDevil::ActivitySettings activitySettings(activity);
+
+- m_sessionActivityInhibit.insert(activity, cookie);
++ qCDebug(POWERDEVIL) << "Settings for loaded activity:";
++ for (KConfigSkeletonItem *item : activitySettings.items()) {
++ qCDebug(POWERDEVIL) << item->key() << "=" << item->property();
+ }
+- }
+- if (activitySettings.inhibitScreenManagement()) {
+- qCDebug(POWERDEVIL) << "Activity triggers a screen management inhibition";
+- // Trigger a special inhibition - if we don't have one yet
+- if (!m_screenActivityInhibit.contains(activity)) {
+- int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::ChangeScreenSettings,
+- i18n("Activity Manager"),
+- i18n("This activity's policies prevent screen power management"));
+-
+- m_screenActivityInhibit.insert(activity, cookie);
++
++ // Now... any special behaviors we'd like to consider?
++ if (activitySettings.inhibitSuspend()) {
++ qCDebug(POWERDEVIL) << "Activity triggers a suspend inhibition"; // debug hence not sleep
++ // Trigger a special inhibition - if we don't have one yet
++ if (!m_sessionActivityInhibit.contains(activity)) {
++ int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::InterruptSession,
++ i18n("Activity Manager"),
++ i18n("This activity's policies prevent the system from going to sleep"));
++
++ m_sessionActivityInhibit.insert(activity, cookie);
++ }
++ }
++ if (activitySettings.inhibitScreenManagement()) {
++ qCDebug(POWERDEVIL) << "Activity triggers a screen management inhibition";
++ // Trigger a special inhibition - if we don't have one yet
++ if (!m_screenActivityInhibit.contains(activity)) {
++ int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::ChangeScreenSettings,
++ i18n("Activity Manager"),
++ i18n("This activity's policies prevent screen power management"));
++
++ m_screenActivityInhibit.insert(activity, cookie);
++ }
+ }
+ }
+
+--
+GitLab
+
diff --git a/kde-plasma/powerdevil/powerdevil-6.3.5-r2.ebuild b/kde-plasma/powerdevil/powerdevil-6.3.5-r2.ebuild
new file mode 100644
index 000000000000..befa8b1f6084
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-6.3.5-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=6.10.0
+QTMIN=6.8.1
+inherit ecm fcaps plasma.kde.org xdg
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="brightness-control"
+
+RESTRICT="test" # bug 926513
+
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
+COMMON_DEPEND="
+ dev-libs/qcoro[dbus]
+ dev-libs/wayland
+ >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+ >=dev-qt/qtwayland-${QTMIN}:6=
+ >=kde-frameworks/kauth-${KFMIN}:6[policykit]
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kglobalaccel-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kidletime-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ >=kde-frameworks/kitemmodels-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/krunner-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/solid-${KFMIN}:6
+ >=kde-plasma/libkscreen-${KDE_CATV}:6
+ >=kde-plasma/libplasma-${KDE_CATV}:6
+ >=kde-plasma/plasma-activities-${KDE_CATV}:6
+ >=kde-plasma/plasma-workspace-${KDE_CATV}:6
+ virtual/libudev:=
+ x11-libs/libxcb
+ brightness-control? ( app-misc/ddcutil:= )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.16.0
+"
+RDEPEND="${COMMON_DEPEND}
+ !<kde-plasma/plasma-workspace-6.1.90:*
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ || (
+ sys-power/power-profiles-daemon
+ sys-power/tlp
+ )
+ >=sys-power/upower-0.9.23
+"
+BDEPEND="
+ >=dev-qt/qtwayland-${QTMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+"
+
+# -m 0755 to avoid suid with USE="-filecaps"
+FILECAPS=( -m 0755 cap_wake_alarm=ep usr/libexec/org_kde_powerdevil )
+
+PATCHES=( "${FILESDIR}/${P}-fix-assert.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON
+ $(cmake_use_find_package brightness-control DDCUtil)
+ )
+ use test && mycmakeargs+=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_SeleniumWebDriverATSPI=ON # not packaged
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # bug 926513
+ ecm_src_test -j1
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ fcaps_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/
@ 2025-09-26 10:21 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2025-09-26 10:21 UTC (permalink / raw
To: gentoo-commits
commit: 92e9f7eea8d66146703e04949398c1053517f192
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 25 19:15:57 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 10:17:03 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e9f7ee
kde-plasma/powerdevil: drop 6.3.6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/powerdevil/Manifest | 1 -
.../files/powerdevil-6.3.5-fix-assert.patch | 108 ---------------------
kde-plasma/powerdevil/powerdevil-6.3.6.ebuild | 95 ------------------
3 files changed, 204 deletions(-)
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index c25b0a0d48ed..983db4996a34 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1 @@
-DIST powerdevil-6.3.6.tar.xz 1199492 BLAKE2B 5b1b7debab2332c16aa9ebf42aa9e374c739d372da466d407957af4f4844e73977d2dfce3a40a3827428b3de0a53d4021e775a3845db400084510923202b8d4d SHA512 9143c70cb5238cab1d9bd302516c44c66f8d750593005e435a65a0103c6485a11945c30d30a241d130d3c101e0ae84291d1d8471f1cb92c87f80e361a3fa17a0
DIST powerdevil-6.4.5.tar.xz 1229952 BLAKE2B c30e7cc722f53d2592c7b85992bd28743e9435860deb72119cc809c6a2b612ef3da9bc94d8a9c432ffe1e9303042e642818249d4f66a6bb7179e8f89a2c51e87 SHA512 0b364eca1cb0d42fd30990d79de8b872f75b6a26345591ad990628b6e259a9eb209f680c29173dfce850beeaf2b4ff0b382a14175521e96f0a0b25630dfb7475
diff --git a/kde-plasma/powerdevil/files/powerdevil-6.3.5-fix-assert.patch b/kde-plasma/powerdevil/files/powerdevil-6.3.5-fix-assert.patch
deleted file mode 100644
index b8c42bcfe3cf..000000000000
--- a/kde-plasma/powerdevil/files/powerdevil-6.3.5-fix-assert.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 664ca532ed0ce583c84ecafd23e91d38b747791c Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Mon, 26 May 2025 17:51:21 +0000
-Subject: [PATCH] daemon: Fix triggering an assert in KConfigGroup
-
-If there is no current activity, KActivities::Consumer::currentActivity()
-can return an empty string. The problem with that is that the KConfigGroup
-doesn't allow empty strings to be used as group names, it has an assert
-for that.
-
-This change puts relevant code behind a guard to avoid triggering the
-assert in KConfigGroup.
-
-SENTRY: POWERDEVIL-161
-
-
-(cherry picked from commit c8ced4c4097c1db97e1c537f7f1869c225227b09)
-
-Co-authored-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
----
- daemon/powerdevilcore.cpp | 62 ++++++++++++++++++++-------------------
- 1 file changed, 32 insertions(+), 30 deletions(-)
-
-diff --git a/daemon/powerdevilcore.cpp b/daemon/powerdevilcore.cpp
-index 3f6801046..fc154cab4 100644
---- a/daemon/powerdevilcore.cpp
-+++ b/daemon/powerdevilcore.cpp
-@@ -300,17 +300,6 @@ void Core::loadProfile(bool force)
- {
- QString profileId;
-
-- // Check the activity in which we are in
-- QString activity = m_activityConsumer->currentActivity();
-- qCDebug(POWERDEVIL) << "Currently using activity " << activity;
--
-- PowerDevil::ActivitySettings activitySettings(activity);
--
-- qCDebug(POWERDEVIL) << "Settings for loaded activity:";
-- for (KConfigSkeletonItem *item : activitySettings.items()) {
-- qCDebug(POWERDEVIL) << item->key() << "=" << item->property();
-- }
--
- // let's load the current state's profile
- if (m_batteriesPercent.isEmpty()) {
- qCDebug(POWERDEVIL) << "No batteries found, loading AC";
-@@ -376,27 +365,40 @@ void Core::loadProfile(bool force)
- Q_EMIT profileChanged(m_currentProfile);
- }
-
-- // Now... any special behaviors we'd like to consider?
-- if (activitySettings.inhibitSuspend()) {
-- qCDebug(POWERDEVIL) << "Activity triggers a suspend inhibition"; // debug hence not sleep
-- // Trigger a special inhibition - if we don't have one yet
-- if (!m_sessionActivityInhibit.contains(activity)) {
-- int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::InterruptSession,
-- i18n("Activity Manager"),
-- i18n("This activity's policies prevent the system from going to sleep"));
-+ // Check the activity in which we are in
-+ const QString activity = m_activityConsumer->currentActivity();
-+ qCDebug(POWERDEVIL) << "Currently using activity" << activity;
-+
-+ if (!activity.isEmpty()) {
-+ PowerDevil::ActivitySettings activitySettings(activity);
-
-- m_sessionActivityInhibit.insert(activity, cookie);
-+ qCDebug(POWERDEVIL) << "Settings for loaded activity:";
-+ for (KConfigSkeletonItem *item : activitySettings.items()) {
-+ qCDebug(POWERDEVIL) << item->key() << "=" << item->property();
- }
-- }
-- if (activitySettings.inhibitScreenManagement()) {
-- qCDebug(POWERDEVIL) << "Activity triggers a screen management inhibition";
-- // Trigger a special inhibition - if we don't have one yet
-- if (!m_screenActivityInhibit.contains(activity)) {
-- int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::ChangeScreenSettings,
-- i18n("Activity Manager"),
-- i18n("This activity's policies prevent screen power management"));
--
-- m_screenActivityInhibit.insert(activity, cookie);
-+
-+ // Now... any special behaviors we'd like to consider?
-+ if (activitySettings.inhibitSuspend()) {
-+ qCDebug(POWERDEVIL) << "Activity triggers a suspend inhibition"; // debug hence not sleep
-+ // Trigger a special inhibition - if we don't have one yet
-+ if (!m_sessionActivityInhibit.contains(activity)) {
-+ int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::InterruptSession,
-+ i18n("Activity Manager"),
-+ i18n("This activity's policies prevent the system from going to sleep"));
-+
-+ m_sessionActivityInhibit.insert(activity, cookie);
-+ }
-+ }
-+ if (activitySettings.inhibitScreenManagement()) {
-+ qCDebug(POWERDEVIL) << "Activity triggers a screen management inhibition";
-+ // Trigger a special inhibition - if we don't have one yet
-+ if (!m_screenActivityInhibit.contains(activity)) {
-+ int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::ChangeScreenSettings,
-+ i18n("Activity Manager"),
-+ i18n("This activity's policies prevent screen power management"));
-+
-+ m_screenActivityInhibit.insert(activity, cookie);
-+ }
- }
- }
-
---
-GitLab
-
diff --git a/kde-plasma/powerdevil/powerdevil-6.3.6.ebuild b/kde-plasma/powerdevil/powerdevil-6.3.6.ebuild
deleted file mode 100644
index 091984fa5a38..000000000000
--- a/kde-plasma/powerdevil/powerdevil-6.3.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=6.10.0
-QTMIN=6.8.1
-inherit ecm fcaps plasma.kde.org xdg
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="brightness-control"
-
-RESTRICT="test" # bug 926513
-
-# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
-COMMON_DEPEND="
- dev-libs/qcoro[dbus]
- dev-libs/wayland
- >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,wayland,widgets]
- >=kde-frameworks/kauth-${KFMIN}:6[policykit]
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kcrash-${KFMIN}:6
- >=kde-frameworks/kdbusaddons-${KFMIN}:6
- >=kde-frameworks/kglobalaccel-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kidletime-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/kirigami-${KFMIN}:6
- >=kde-frameworks/kitemmodels-${KFMIN}:6
- >=kde-frameworks/knotifications-${KFMIN}:6
- >=kde-frameworks/krunner-${KFMIN}:6
- >=kde-frameworks/kservice-${KFMIN}:6
- >=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
- >=kde-frameworks/kxmlgui-${KFMIN}:6
- >=kde-frameworks/solid-${KFMIN}:6
- >=kde-plasma/libkscreen-${KDE_CATV}:6
- >=kde-plasma/libplasma-${KDE_CATV}:6
- >=kde-plasma/plasma-activities-${KDE_CATV}:6
- >=kde-plasma/plasma-workspace-${KDE_CATV}:6
- virtual/libudev:=
- x11-libs/libxcb
- brightness-control? ( app-misc/ddcutil:= )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.16.0
-"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/plasma-workspace-6.1.90:*
- >=dev-qt/qtdeclarative-${QTMIN}:6
- || (
- sys-power/power-profiles-daemon
- sys-power/tlp
- )
- >=sys-power/upower-0.9.23
-"
-RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
-BDEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[wayland]
- >=kde-frameworks/kcmutils-${KFMIN}:6
-"
-BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
-
-# -m 0755 to avoid suid with USE="-filecaps"
-FILECAPS=( -m 0755 cap_wake_alarm=ep usr/libexec/org_kde_powerdevil )
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON
- $(cmake_use_find_package brightness-control DDCUtil)
- )
- use test && mycmakeargs+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_SeleniumWebDriverATSPI=ON # not packaged
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # bug 926513
- ecm_src_test -j1
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- fcaps_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-09-26 10:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-02 16:49 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-09-26 10:21 Andreas Sturmlechner
2022-06-21 21:28 Andreas Sturmlechner
2022-06-19 13:45 Andreas Sturmlechner
2021-11-30 14:33 Andreas Sturmlechner
2021-01-24 19:44 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox