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 CC5D9158003 for ; Tue, 23 Nov 2021 14:59:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 778A1E08C3; Tue, 23 Nov 2021 14:59:41 +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 95945E08C3 for ; Tue, 23 Nov 2021 14:59:40 +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 97D8A342F5E for ; Tue, 23 Nov 2021 14:59:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 026D8200 for ; Tue, 23 Nov 2021 14:59:36 +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: <1637679555.e4d3f8da14ece852be3a05d8ac0984e3c46905f5.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/ X-VCS-Repository: repo/gentoo X-VCS-Files: 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: e4d3f8da14ece852be3a05d8ac0984e3c46905f5 X-VCS-Branch: master Date: Tue, 23 Nov 2021 14:59:36 +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: aa87601a-16ef-4fb9-a54a-986f90323c96 X-Archives-Hash: e697fe2410cae9d7218c1c46425ab9a8 commit: e4d3f8da14ece852be3a05d8ac0984e3c46905f5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 15 14:29:24 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Nov 23 14:59:15 2021 +0000 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 000000000000..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 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 new file mode 100644 index 000000000000..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 + >=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 +}