From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/
Date: Tue, 21 Jun 2022 21:28:27 +0000 (UTC) [thread overview]
Message-ID: <1655846894.8bcd7f407bfc49c6dd69fca0631ee7caf1c11079.asturm@gentoo> (raw)
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
-}
next reply other threads:[~2022-06-21 21:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 21:28 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-26 10:21 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/ Andreas Sturmlechner
2025-06-02 16:49 Andreas Sturmlechner
2022-06-19 13:45 Andreas Sturmlechner
2021-11-30 14:33 Andreas Sturmlechner
2021-01-24 19:44 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1655846894.8bcd7f407bfc49c6dd69fca0631ee7caf1c11079.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox