summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-10-05 20:20:09 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-10-09 21:00:30 +0200
commit0a9a50d4ee2839b34a986ca71b08e146f97a00b3 (patch)
tree330133f96927cf9cef36aad398565ba74bba16aa /kde-plasma/powerdevil
parentkde-plasma/polkit-kde-agent: drop 5.18.5* (diff)
downloadgentoo-0a9a50d4ee2839b34a986ca71b08e146f97a00b3.tar.gz
gentoo-0a9a50d4ee2839b34a986ca71b08e146f97a00b3.tar.bz2
gentoo-0a9a50d4ee2839b34a986ca71b08e146f97a00b3.zip
kde-plasma/powerdevil: drop 5.18.5*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/powerdevil')
-rw-r--r--kde-plasma/powerdevil/Manifest1
-rw-r--r--kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch80
-rw-r--r--kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild69
-rw-r--r--kde-plasma/powerdevil/powerdevil-5.18.5.ebuild67
4 files changed, 0 insertions, 217 deletions
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 45730b8ab356..a07f8afbf4cc 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1 @@
-DIST powerdevil-5.18.5.tar.xz 597492 BLAKE2B 510d523b470f281c1b71902a6e2938d5566b3a653909d4b08d75cdfa190bd2f2a2a0befa7f71b3af331f1511733502690d58c2fed13262da82381eae66605885 SHA512 b7054099cbf3e176591e4fff68ce1dbb7eb9d2f332a75bea3e2ad5954246f6d4d3b0018de101d8ca0df8c7cfa1988abaed40840466a503e09251e4af623fd3b3
DIST powerdevil-5.19.5.tar.xz 600388 BLAKE2B 0b99c229b576d8a033187dd81a0f6f199ff991f9c1eb4c6856a77a7ddd269ddf1ce50a76ea71821487be11593f5740a7d66a2af3e6b6c1f983a5e87bfc008b9b SHA512 5f1b1e8fdcd996769024a4f008527960fc91af32862047fdd13674ddb6925fd7b1a024a5c45182d14be32aa0bb8ba1bc694476061e480bcdfb3bdcb65d60cb16
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch b/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
deleted file mode 100644
index cb6e27b7a977..000000000000
--- a/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From d21102cc6c7a4db204a29f376ce5eb316ef57a6e Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Fri, 19 Jun 2020 19:51:06 +0200
-Subject: [PATCH] Watch DBus service right away to discard pending inhibitions
- reliably
-
-PowerDevil delays applying a power management inhibition by 5 seconds to avoid brief inhibitions
-to e.g. wake up the screen and similar.
-However, when an inhibition was posted and the process then quit, we would then still
-enforce the inhibition as it wasn't explicitly revoked.
-Fix this by always watching the inhibition sender and remove it from pending when the
-service goes away.
-
-BUG: 423131
-FIXED-IN: 5.18.6
----
- daemon/powerdevilpolicyagent.cpp | 26 ++++++++++++--------------
- 1 file changed, 12 insertions(+), 14 deletions(-)
-
-diff --git a/daemon/powerdevilpolicyagent.cpp b/daemon/powerdevilpolicyagent.cpp
-index a7d92dfd..2c2b1152 100644
---- a/daemon/powerdevilpolicyagent.cpp
-+++ b/daemon/powerdevilpolicyagent.cpp
-@@ -513,6 +513,11 @@ uint PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
-
- const int cookie = m_lastCookie; // when the Timer below fires, m_lastCookie might be different already
-
-+ if (!m_busWatcher.isNull() && !service.isEmpty()) {
-+ m_cookieToBusService.insert(cookie, service);
-+ m_busWatcher.data()->addWatchedService(service);
-+ }
-+
- m_pendingInhibitions.append(cookie);
-
- qCDebug(POWERDEVIL) << "Scheduling inhibition from" << service << appName << "with cookie"
-@@ -532,11 +537,6 @@ uint PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
-
- m_cookieToAppName.insert(cookie, qMakePair<QString, QString>(appName, reason));
-
-- if (!m_busWatcher.isNull() && !service.isEmpty()) {
-- m_cookieToBusService.insert(cookie, service);
-- m_busWatcher.data()->addWatchedService(service);
-- }
--
- addInhibitionTypeHelper(cookie, static_cast< PolicyAgent::RequiredPolicies >(types));
-
- Q_EMIT InhibitionsChanged({ {qMakePair(appName, reason)} }, {});
-@@ -596,22 +596,20 @@ void PolicyAgent::ReleaseInhibition(uint cookie)
- {
- qCDebug(POWERDEVIL) << "Releasing inhibition with cookie " << cookie;
-
-- if (m_pendingInhibitions.contains(cookie)) {
-+ QString service = m_cookieToBusService.take(cookie);
-+ if (!m_busWatcher.isNull() && !service.isEmpty() && !m_cookieToBusService.key(service)) {
-+ // no cookies from service left
-+ m_busWatcher.data()->removeWatchedService(service);
-+ }
-+
-+ if (m_pendingInhibitions.removeOne(cookie)) {
- qCDebug(POWERDEVIL) << "It was only scheduled for inhibition but not enforced yet, just discarding it";
-- m_pendingInhibitions.removeOne(cookie);
- return;
- }
-
- Q_EMIT InhibitionsChanged(QList<InhibitionInfo>(), { {m_cookieToAppName.value(cookie).first} });
- m_cookieToAppName.remove(cookie);
-
--
-- QString service = m_cookieToBusService.take(cookie);
-- if (!m_busWatcher.isNull() && !service.isEmpty() && !m_cookieToBusService.key(service)) {
-- // no cookies from service left
-- m_busWatcher.data()->removeWatchedService(service);
-- }
--
- // Look through all of the inhibition types
- bool notify = false;
- if (m_typesToCookie[ChangeProfile].contains(cookie)) {
---
-GitLab
-
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
deleted file mode 100644
index 79f0394f5fe1..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.18.5-r1.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.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.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 ~x86"
-IUSE="brightness-control +wireless"
-
-DEPEND="
- >=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
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}: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}/${P}-fix-powermgmt-inhibition.patch" ) # KDE-Bug 423131
-
-src_configure() {
- local mycmakeargs=(
- -DHAVE_DDCUTIL=$(usex brightness-control)
- $(cmake_use_find_package wireless KF5BluezQt)
- $(cmake_use_find_package wireless KF5NetworkManagerQt)
- )
-
- ecm_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
deleted file mode 100644
index da5ea9b9b346..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
+++ /dev/null
@@ -1,67 +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.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.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 x86"
-IUSE="brightness-control +wireless"
-
-DEPEND="
- >=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
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}: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
-"
-
-src_configure() {
- local mycmakeargs=(
- -DHAVE_DDCUTIL=$(usex brightness-control)
- $(cmake_use_find_package wireless KF5BluezQt)
- $(cmake_use_find_package wireless KF5NetworkManagerQt)
- )
-
- ecm_src_configure
-}