commit: 92e9f7eea8d66146703e04949398c1053517f192 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Sep 25 19:15:57 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Sep 26 10:17:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e9f7ee
kde-plasma/powerdevil: drop 6.3.6 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/powerdevil/Manifest | 1 - .../files/powerdevil-6.3.5-fix-assert.patch | 108 --------------------- kde-plasma/powerdevil/powerdevil-6.3.6.ebuild | 95 ------------------ 3 files changed, 204 deletions(-) diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest index c25b0a0d48ed..983db4996a34 100644 --- a/kde-plasma/powerdevil/Manifest +++ b/kde-plasma/powerdevil/Manifest @@ -1,2 +1 @@ -DIST powerdevil-6.3.6.tar.xz 1199492 BLAKE2B 5b1b7debab2332c16aa9ebf42aa9e374c739d372da466d407957af4f4844e73977d2dfce3a40a3827428b3de0a53d4021e775a3845db400084510923202b8d4d SHA512 9143c70cb5238cab1d9bd302516c44c66f8d750593005e435a65a0103c6485a11945c30d30a241d130d3c101e0ae84291d1d8471f1cb92c87f80e361a3fa17a0 DIST powerdevil-6.4.5.tar.xz 1229952 BLAKE2B c30e7cc722f53d2592c7b85992bd28743e9435860deb72119cc809c6a2b612ef3da9bc94d8a9c432ffe1e9303042e642818249d4f66a6bb7179e8f89a2c51e87 SHA512 0b364eca1cb0d42fd30990d79de8b872f75b6a26345591ad990628b6e259a9eb209f680c29173dfce850beeaf2b4ff0b382a14175521e96f0a0b25630dfb7475 diff --git a/kde-plasma/powerdevil/files/powerdevil-6.3.5-fix-assert.patch b/kde-plasma/powerdevil/files/powerdevil-6.3.5-fix-assert.patch deleted file mode 100644 index b8c42bcfe3cf..000000000000 --- a/kde-plasma/powerdevil/files/powerdevil-6.3.5-fix-assert.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 664ca532ed0ce583c84ecafd23e91d38b747791c Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii <[email protected]> -Date: Mon, 26 May 2025 17:51:21 +0000 -Subject: [PATCH] daemon: Fix triggering an assert in KConfigGroup - -If there is no current activity, KActivities::Consumer::currentActivity() -can return an empty string. The problem with that is that the KConfigGroup -doesn't allow empty strings to be used as group names, it has an assert -for that. - -This change puts relevant code behind a guard to avoid triggering the -assert in KConfigGroup. - -SENTRY: POWERDEVIL-161 - - -(cherry picked from commit c8ced4c4097c1db97e1c537f7f1869c225227b09) - -Co-authored-by: Vlad Zahorodnii <[email protected]> ---- - daemon/powerdevilcore.cpp | 62 ++++++++++++++++++++------------------- - 1 file changed, 32 insertions(+), 30 deletions(-) - -diff --git a/daemon/powerdevilcore.cpp b/daemon/powerdevilcore.cpp -index 3f6801046..fc154cab4 100644 ---- a/daemon/powerdevilcore.cpp -+++ b/daemon/powerdevilcore.cpp -@@ -300,17 +300,6 @@ void Core::loadProfile(bool force) - { - QString profileId; - -- // Check the activity in which we are in -- QString activity = m_activityConsumer->currentActivity(); -- qCDebug(POWERDEVIL) << "Currently using activity " << activity; -- -- PowerDevil::ActivitySettings activitySettings(activity); -- -- qCDebug(POWERDEVIL) << "Settings for loaded activity:"; -- for (KConfigSkeletonItem *item : activitySettings.items()) { -- qCDebug(POWERDEVIL) << item->key() << "=" << item->property(); -- } -- - // let's load the current state's profile - if (m_batteriesPercent.isEmpty()) { - qCDebug(POWERDEVIL) << "No batteries found, loading AC"; -@@ -376,27 +365,40 @@ void Core::loadProfile(bool force) - Q_EMIT profileChanged(m_currentProfile); - } - -- // Now... any special behaviors we'd like to consider? -- if (activitySettings.inhibitSuspend()) { -- qCDebug(POWERDEVIL) << "Activity triggers a suspend inhibition"; // debug hence not sleep -- // Trigger a special inhibition - if we don't have one yet -- if (!m_sessionActivityInhibit.contains(activity)) { -- int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::InterruptSession, -- i18n("Activity Manager"), -- i18n("This activity's policies prevent the system from going to sleep")); -+ // Check the activity in which we are in -+ const QString activity = m_activityConsumer->currentActivity(); -+ qCDebug(POWERDEVIL) << "Currently using activity" << activity; -+ -+ if (!activity.isEmpty()) { -+ PowerDevil::ActivitySettings activitySettings(activity); - -- m_sessionActivityInhibit.insert(activity, cookie); -+ qCDebug(POWERDEVIL) << "Settings for loaded activity:"; -+ for (KConfigSkeletonItem *item : activitySettings.items()) { -+ qCDebug(POWERDEVIL) << item->key() << "=" << item->property(); - } -- } -- if (activitySettings.inhibitScreenManagement()) { -- qCDebug(POWERDEVIL) << "Activity triggers a screen management inhibition"; -- // Trigger a special inhibition - if we don't have one yet -- if (!m_screenActivityInhibit.contains(activity)) { -- int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::ChangeScreenSettings, -- i18n("Activity Manager"), -- i18n("This activity's policies prevent screen power management")); -- -- m_screenActivityInhibit.insert(activity, cookie); -+ -+ // Now... any special behaviors we'd like to consider? -+ if (activitySettings.inhibitSuspend()) { -+ qCDebug(POWERDEVIL) << "Activity triggers a suspend inhibition"; // debug hence not sleep -+ // Trigger a special inhibition - if we don't have one yet -+ if (!m_sessionActivityInhibit.contains(activity)) { -+ int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::InterruptSession, -+ i18n("Activity Manager"), -+ i18n("This activity's policies prevent the system from going to sleep")); -+ -+ m_sessionActivityInhibit.insert(activity, cookie); -+ } -+ } -+ if (activitySettings.inhibitScreenManagement()) { -+ qCDebug(POWERDEVIL) << "Activity triggers a screen management inhibition"; -+ // Trigger a special inhibition - if we don't have one yet -+ if (!m_screenActivityInhibit.contains(activity)) { -+ int cookie = PolicyAgent::instance()->AddInhibition(PolicyAgent::ChangeScreenSettings, -+ i18n("Activity Manager"), -+ i18n("This activity's policies prevent screen power management")); -+ -+ m_screenActivityInhibit.insert(activity, cookie); -+ } - } - } - --- -GitLab - diff --git a/kde-plasma/powerdevil/powerdevil-6.3.6.ebuild b/kde-plasma/powerdevil/powerdevil-6.3.6.ebuild deleted file mode 100644 index 091984fa5a38..000000000000 --- a/kde-plasma/powerdevil/powerdevil-6.3.6.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -KFMIN=6.10.0 -QTMIN=6.8.1 -inherit ecm fcaps plasma.kde.org xdg - -DESCRIPTION="Power management for KDE Plasma Shell" -HOMEPAGE="https://invent.kde.org/plasma/powerdevil"; - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="brightness-control" - -RESTRICT="test" # bug 926513 - -# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h -COMMON_DEPEND=" - dev-libs/qcoro[dbus] - dev-libs/wayland - >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,wayland,widgets] - >=kde-frameworks/kauth-${KFMIN}:6[policykit] - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/kdbusaddons-${KFMIN}:6 - >=kde-frameworks/kglobalaccel-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kidletime-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/kitemmodels-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/krunner-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/libkscreen-${KDE_CATV}:6 - >=kde-plasma/libplasma-${KDE_CATV}:6 - >=kde-plasma/plasma-activities-${KDE_CATV}:6 - >=kde-plasma/plasma-workspace-${KDE_CATV}:6 - virtual/libudev:= - x11-libs/libxcb - brightness-control? ( app-misc/ddcutil:= ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.16.0 -" -RDEPEND="${COMMON_DEPEND} - !<kde-plasma/plasma-workspace-6.1.90:* - >=dev-qt/qtdeclarative-${QTMIN}:6 - || ( - sys-power/power-profiles-daemon - sys-power/tlp - ) - >=sys-power/upower-0.9.23 -" -RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )" -BDEPEND=" - >=dev-qt/qtbase-${QTMIN}:6[wayland] - >=kde-frameworks/kcmutils-${KFMIN}:6 -" -BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )" - -# -m 0755 to avoid suid with USE="-filecaps" -FILECAPS=( -m 0755 cap_wake_alarm=ep usr/libexec/org_kde_powerdevil ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON - $(cmake_use_find_package brightness-control DDCUtil) - ) - use test && mycmakeargs+=( - -DCMAKE_DISABLE_FIND_PACKAGE_SeleniumWebDriverATSPI=ON # not packaged - ) - - ecm_src_configure -} - -src_test() { - # bug 926513 - ecm_src_test -j1 -} - -pkg_postinst() { - xdg_pkg_postinst - fcaps_pkg_postinst -}
