From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 729AD158086 for ; Tue, 30 Nov 2021 14:33:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 277C72BC05B; Tue, 30 Nov 2021 14:33:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E93CF2BC05B for ; Tue, 30 Nov 2021 14:33:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B0D8342F37 for ; Tue, 30 Nov 2021 14:33:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71C25233 for ; Tue, 30 Nov 2021 14:33:00 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1638282739.732d7cc702c752764efa4f524f37381027723f6d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/, kde-plasma/powerdevil/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/powerdevil/Manifest kde-plasma/powerdevil/files/powerdevil-5.23.3-dismiss-battery-notifications.patch kde-plasma/powerdevil/powerdevil-5.23.3-r1.ebuild X-VCS-Directories: kde-plasma/powerdevil/files/ kde-plasma/powerdevil/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 732d7cc702c752764efa4f524f37381027723f6d X-VCS-Branch: master Date: Tue, 30 Nov 2021 14:33:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4695e85f-99c2-437f-a6bc-bf94d9928fe6 X-Archives-Hash: fefbed85352405816ea39b04ab72c9b0 commit: 732d7cc702c752764efa4f524f37381027723f6d Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 30 14:20:23 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 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 -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 -}