Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/
Date: Tue, 30 Nov 2021 14:33:15
Message-Id: 1638282739.732d7cc702c752764efa4f524f37381027723f6d.asturm@gentoo
1 commit: 732d7cc702c752764efa4f524f37381027723f6d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 30 14:20:23 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 30 14:32:19 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732d7cc7
7
8 kde-plasma/powerdevil: drop 5.23.3*
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 kde-plasma/powerdevil/Manifest | 1 -
13 ...evil-5.23.3-dismiss-battery-notifications.patch | 71 ----------------------
14 kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild | 71 ----------------------
15 3 files changed, 143 deletions(-)
16
17 diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
18 index cd88cbd0a974..c6962313d801 100644
19 --- a/kde-plasma/powerdevil/Manifest
20 +++ b/kde-plasma/powerdevil/Manifest
21 @@ -1,3 +1,2 @@
22 DIST powerdevil-5.22.5.tar.xz 618576 BLAKE2B 5d4128adf99d0d3c355b28ca320c280b44f605a92adfb86582d9294752fce47a689023d38a0480dc5e91704c273774048fa8a38b62f9c3065bc5e9fe91a8c050 SHA512 9ecef0eec3673ac4560a0e50a3e31299718af9575d4a11e274d5e1d1516971362d93ca31e66b79b3593a68b1aebf93502066de7e4134761c5681dba84ab79318
23 -DIST powerdevil-5.23.3.tar.xz 629172 BLAKE2B 062b1eb703d9c609ce8c8477b2869c5a0c22278191d71ca1c94fdea579976e2f783db691bce1b245b086f09a08df53652159f74ea1040435cbfe7b608c7fcc3b SHA512 6ad425a4748fde502749b6d6b5e9d925c733322ca9c39c098d946c0607b8d865ac0ccc98d5dd35909cded439b181a25994681e40477c00878b2497e298dcffd2
24 DIST powerdevil-5.23.4.tar.xz 629336 BLAKE2B 26f92a14012585ce15ff0f00f3c57c4e11cba986a1b467f210d77bf6488fd552138b3775774fb2b17d1d340e4bb5bad77fd155aeb9986fa190005204aa8416ea SHA512 a84cb7555716333e5d6ab9be114fb4072c315b244add05ad829bd476884c282a17f8166daf35d6a343bfea3407f1388374d8632e37ce6057d546b67f7deea256
25
26 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
27 deleted file mode 100644
28 index 997807a2214a..000000000000
29 --- a/kde-plasma/powerdevil/files/powerdevil-5.23.3-dismiss-battery-notifications.patch
30 +++ /dev/null
31 @@ -1,71 +0,0 @@
32 -From d8c5490c99bae9f979f6483dc7b0381121a4f997 Mon Sep 17 00:00:00 2001
33 -From: Kai Uwe Broulik <kde@××××××××××××××.de>
34 -Date: Mon, 8 Nov 2021 20:02:33 +0100
35 -Subject: [PATCH] Always dismiss critical battery notification
36 -
37 -The timer isn't running when user chose "Do nothing" on critical battery
38 -
39 -BUG: 445171
40 -FIXED-IN: 5.23.4
41 -
42 -
43 -(cherry picked from commit 5668ded34f928ffce43ebe1defb775e70bbbb3b7)
44 ----
45 - daemon/powerdevilcore.cpp | 22 +++++++++++++---------
46 - 1 file changed, 13 insertions(+), 9 deletions(-)
47 -
48 -diff --git a/daemon/powerdevilcore.cpp b/daemon/powerdevilcore.cpp
49 -index 040dd6b6..c5ba3e54 100644
50 ---- a/daemon/powerdevilcore.cpp
51 -+++ b/daemon/powerdevilcore.cpp
52 -@@ -259,7 +259,7 @@ void Core::reparseConfiguration()
53 - Q_EMIT configurationReloaded();
54 -
55 - // Check if critical threshold might have changed and cancel the timer if necessary.
56 -- if (m_criticalBatteryTimer->isActive() && currentChargePercent() > PowerDevilSettings::batteryCriticalLevel()) {
57 -+ if (currentChargePercent() > PowerDevilSettings::batteryCriticalLevel()) {
58 - m_criticalBatteryTimer->stop();
59 - if (m_criticalBatteryNotification) {
60 - m_criticalBatteryNotification->close();
61 -@@ -494,14 +494,17 @@ void Core::onDeviceAdded(const QString &udi)
62 - m_lowBatteryNotification->close();
63 - }
64 -
65 -- if (m_criticalBatteryTimer->isActive() && currentChargePercent() > PowerDevilSettings::batteryCriticalLevel()) {
66 -- m_criticalBatteryTimer->stop();
67 -+ if (currentChargePercent() > PowerDevilSettings::batteryCriticalLevel()) {
68 - if (m_criticalBatteryNotification) {
69 - m_criticalBatteryNotification->close();
70 - }
71 -- emitRichNotification(QStringLiteral("pluggedin"),
72 -- i18n("Extra Battery Added"),
73 -- i18n("The computer will no longer go to sleep."));
74 -+
75 -+ if (m_criticalBatteryTimer->isActive()) {
76 -+ m_criticalBatteryTimer->stop();
77 -+ emitRichNotification(QStringLiteral("pluggedin"),
78 -+ i18n("Extra Battery Added"),
79 -+ i18n("The computer will no longer go to sleep."));
80 -+ }
81 - }
82 - }
83 -
84 -@@ -692,11 +695,12 @@ void Core::onAcAdapterStateChanged(PowerDevil::BackendInterface::AcAdapterState
85 - m_lowBatteryNotification->close();
86 - }
87 -
88 -+ if (m_criticalBatteryNotification) {
89 -+ m_criticalBatteryNotification->close();
90 -+ }
91 -+
92 - if (m_criticalBatteryTimer->isActive()) {
93 - m_criticalBatteryTimer->stop();
94 -- if (m_criticalBatteryNotification) {
95 -- m_criticalBatteryNotification->close();
96 -- }
97 - emitRichNotification(QStringLiteral("pluggedin"),
98 - i18n("AC Adapter Plugged In"),
99 - i18n("The computer will no longer go to sleep."));
100 ---
101 -GitLab
102 -
103
104 diff --git a/kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild
105 deleted file mode 100644
106 index a6c9f5612a36..000000000000
107 --- a/kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild
108 +++ /dev/null
109 @@ -1,71 +0,0 @@
110 -# Copyright 1999-2021 Gentoo Authors
111 -# Distributed under the terms of the GNU General Public License v2
112 -
113 -EAPI=8
114 -
115 -ECM_HANDBOOK="forceoptional"
116 -KFMIN=5.86.0
117 -PVCUT=$(ver_cut 1-3)
118 -QTMIN=5.15.2
119 -inherit ecm kde.org
120 -
121 -DESCRIPTION="Power management for KDE Plasma Shell"
122 -HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
123 -
124 -LICENSE="GPL-2" # TODO: CHECK
125 -SLOT="5"
126 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
127 -IUSE="brightness-control caps +wireless"
128 -
129 -DEPEND="
130 - >=dev-qt/qtdbus-${QTMIN}:5
131 - >=dev-qt/qtgui-${QTMIN}:5
132 - >=dev-qt/qtwidgets-${QTMIN}:5
133 - >=dev-qt/qtx11extras-${QTMIN}:5
134 - >=kde-frameworks/kactivities-${KFMIN}:5
135 - >=kde-frameworks/kauth-${KFMIN}:5[policykit]
136 - >=kde-frameworks/kcompletion-${KFMIN}:5
137 - >=kde-frameworks/kconfig-${KFMIN}:5
138 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5
139 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
140 - >=kde-frameworks/kcrash-${KFMIN}:5
141 - >=kde-frameworks/kdbusaddons-${KFMIN}:5
142 - >=kde-frameworks/kglobalaccel-${KFMIN}:5
143 - >=kde-frameworks/ki18n-${KFMIN}:5
144 - >=kde-frameworks/kidletime-${KFMIN}:5
145 - >=kde-frameworks/kio-${KFMIN}:5
146 - >=kde-frameworks/knotifications-${KFMIN}:5
147 - >=kde-frameworks/knotifyconfig-${KFMIN}:5
148 - >=kde-frameworks/kservice-${KFMIN}:5
149 - >=kde-frameworks/kwayland-${KFMIN}:5
150 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
151 - >=kde-frameworks/kxmlgui-${KFMIN}:5
152 - >=kde-frameworks/solid-${KFMIN}:5
153 - >=kde-plasma/libkscreen-${PVCUT}:5
154 - >=kde-plasma/libkworkspace-${PVCUT}:5
155 - virtual/libudev:=
156 - x11-libs/libxcb
157 - brightness-control? ( app-misc/ddcutil )
158 - caps? ( sys-libs/libcap )
159 - wireless? (
160 - >=kde-frameworks/bluez-qt-${KFMIN}:5
161 - >=kde-frameworks/networkmanager-qt-${KFMIN}:5
162 - )
163 -"
164 -RDEPEND="${DEPEND}
165 - >=kde-plasma/kde-cli-tools-${PVCUT}:5
166 - >=sys-power/upower-0.9.23
167 -"
168 -
169 -PATCHES=( "${FILESDIR}"/${P}-dismiss-battery-notifications.patch )
170 -
171 -src_configure() {
172 - local mycmakeargs=(
173 - -DHAVE_DDCUTIL=$(usex brightness-control)
174 - $(cmake_use_find_package caps Libcap)
175 - $(cmake_use_find_package wireless KF5BluezQt)
176 - $(cmake_use_find_package wireless KF5NetworkManagerQt)
177 - )
178 -
179 - ecm_src_configure
180 -}