* [gentoo-commits] proj/kde:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/
@ 2015-06-04 14:23 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2015-06-04 14:23 UTC (permalink / raw
To: gentoo-commits
commit: 894909f17af84d1b744cf58ceb0f52c033c55bfd
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 4 14:22:40 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 4 14:22:40 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=894909f1
[kde-plasma/powerdevil] Fix missing shutdown/restart/suspend/hibernate options for non-systemd systems wrt bug #529186.
Package-Manager: portage-2.2.20
.../files/10-org.freedesktop.upower.pkla | 14 +++++++++++
...ktop.consolekit.system.stop-multiple-users.pkla | 13 +++++++++++
...p.consolekit.system.restart-multiple-users.pkla | 13 +++++++++++
...3.49.9999.ebuild => powerdevil-5.3.1-r1.ebuild} | 27 +++++++++++++++++++---
.../powerdevil/powerdevil-5.3.49.9999.ebuild | 25 ++++++++++++++++++--
kde-plasma/powerdevil/powerdevil-9999.ebuild | 25 ++++++++++++++++++--
6 files changed, 110 insertions(+), 7 deletions(-)
diff --git a/kde-plasma/powerdevil/files/10-org.freedesktop.upower.pkla b/kde-plasma/powerdevil/files/10-org.freedesktop.upower.pkla
new file mode 100644
index 0000000..a15702f
--- /dev/null
+++ b/kde-plasma/powerdevil/files/10-org.freedesktop.upower.pkla
@@ -0,0 +1,14 @@
+# Enable user suspend and hiberate support.
+#
+# Author: Eric Hameleers <alien@slackware.com>
+#
+# KDE bug #344456
+# Gentoo bug #529186
+#
+[Allow all users to suspend and hiberate]
+Identity=unix-group:users
+Action=org.freedesktop.upower.suspend;org.freedesktop.upower.hibernate
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
diff --git a/kde-plasma/powerdevil/files/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla b/kde-plasma/powerdevil/files/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
new file mode 100644
index 0000000..8755318
--- /dev/null
+++ b/kde-plasma/powerdevil/files/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
@@ -0,0 +1,13 @@
+# Enable user shutdown support.
+#
+# Author: Eric Hameleers <alien@slackware.com>
+#
+# KDE bug #344456
+# Gentoo bug #529186
+#
+[Allow all users to shutdown]
+Identity=unix-group:users
+Action=org.freedesktop.consolekit.system.stop-multiple-users;org.freedesktop.consolekit.system.stop
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
diff --git a/kde-plasma/powerdevil/files/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla b/kde-plasma/powerdevil/files/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
new file mode 100644
index 0000000..1856535
--- /dev/null
+++ b/kde-plasma/powerdevil/files/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
@@ -0,0 +1,13 @@
+# Enable user restart.
+#
+# Author: Eric Hameleers <alien@slackware.com>
+#
+# KDE bug #344456
+# Gentoo bug #529186
+#
+[Allow all users to restart]
+Identity=unix-group:users
+Action=org.freedesktop.consolekit.system.restart-multiple-users;org.freedesktop.consolekit.system.restart
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
diff --git a/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.3.1-r1.ebuild
similarity index 59%
copy from kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild
copy to kde-plasma/powerdevil/powerdevil-5.3.1-r1.ebuild
index 1f37423..02241b7 100644
--- a/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.3.1-r1.ebuild
@@ -9,8 +9,8 @@ inherit kde5
DESCRIPTION="Power management for KDE Plasma Shell"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
-KEYWORDS=""
-IUSE=""
+KEYWORDS="~amd64"
+IUSE="systemd"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -43,6 +43,27 @@ DEPEND="
RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools)
- || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )
+ || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
+ !systemd? ( sys-auth/polkit-pkla-compat )
!kde-base/powerdevil
"
+
+src_install() {
+ kde5_src_install
+
+ if ! use systemd ; then
+ insinto /etc/polkit-1/localauthority/10-vendor.d/
+ doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
+ doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
+ doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+ fi
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if ! has_version sys-power/upower-pm-utils && ! use systemd ; then
+ ewarn "Suspend and hibernate will not be available as it requires sys-power/upower-pm-utils"
+ ewarn "on non-systemd systems. Please install it if you require this functionality."
+ fi
+}
diff --git a/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild
index 1f37423..e344706 100644
--- a/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.3.49.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Power management for KDE Plasma Shell"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
KEYWORDS=""
-IUSE=""
+IUSE="systemd"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -43,6 +43,27 @@ DEPEND="
RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools)
- || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )
+ || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
+ !systemd? ( sys-auth/polkit-pkla-compat )
!kde-base/powerdevil
"
+
+src_install() {
+ kde5_src_install
+
+ if ! use systemd ; then
+ insinto /etc/polkit-1/localauthority/10-vendor.d/
+ doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
+ doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
+ doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+ fi
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if ! has_version sys-power/upower-pm-utils && ! use systemd ; then
+ ewarn "Suspend and hibernate will not be available as it requires sys-power/upower-pm-utils"
+ ewarn "on non-systemd systems. Please install it if you require this functionality."
+ fi
+}
diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index 1f37423..e344706 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Power management for KDE Plasma Shell"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
KEYWORDS=""
-IUSE=""
+IUSE="systemd"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -43,6 +43,27 @@ DEPEND="
RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools)
- || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )
+ || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
+ !systemd? ( sys-auth/polkit-pkla-compat )
!kde-base/powerdevil
"
+
+src_install() {
+ kde5_src_install
+
+ if ! use systemd ; then
+ insinto /etc/polkit-1/localauthority/10-vendor.d/
+ doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
+ doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
+ doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+ fi
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if ! has_version sys-power/upower-pm-utils && ! use systemd ; then
+ ewarn "Suspend and hibernate will not be available as it requires sys-power/upower-pm-utils"
+ ewarn "on non-systemd systems. Please install it if you require this functionality."
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/
@ 2016-06-19 10:24 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-06-19 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 61506604fbdb11d055c87873cbc993b2c8d7a6df
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jun 19 10:03:02 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 10:23:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=61506604
kde-plasma/powerdevil: Add USE=+wireless for energy saving
Package-Manager: portage-2.2.28
.../powerdevil-5.6.95-wireless-optional.patch | 177 +++++++++++++++++++++
kde-plasma/powerdevil/metadata.xml | 3 +
kde-plasma/powerdevil/powerdevil-5.6.95.ebuild | 17 +-
.../powerdevil/powerdevil-5.7.49.9999.ebuild | 17 +-
kde-plasma/powerdevil/powerdevil-9999.ebuild | 15 +-
5 files changed, 226 insertions(+), 3 deletions(-)
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.6.95-wireless-optional.patch b/kde-plasma/powerdevil/files/powerdevil-5.6.95-wireless-optional.patch
new file mode 100644
index 0000000..b1731c7
--- /dev/null
+++ b/kde-plasma/powerdevil/files/powerdevil-5.6.95-wireless-optional.patch
@@ -0,0 +1,177 @@
+commit 7d8a12c65dbbb8166beee53b4bb0c1f2fdede6c6
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun Jun 19 12:14:25 2016 +0200
+
+ Revert-Revert "Make NetworkManagerQt and BluezQt optional"
+
+ This reverts commit f2018a8d3c5f2824278bb167cb48d938ca2670c4.
+
+ commit 3257be562b2c48eb11c9e32f7e4fd82ea7fb090b
+ Author: Heiko Becker <heirecka@exherbo.org>
+ Date: Wed Jun 15 23:07:46 2016 +0200
+
+ Summary:
+ While it is most certainly sensible and helpful on a system equipped
+ with Bluetooth and Wi-Fi hardware, it serves no purpose on a desktop
+ system without these and just pulls in a long chain of unwanted
+ dependencies.
+
+ Test Plan: Successfully built with BluezQt and NetworkManagerQt present and missing.
+
+ Reviewers: #plasma, broulik
+
+ Subscribers: plasma-devel
+
+ Tags: #plasma
+
+ Differential Revision: https://phabricator.kde.org/D1944
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6b631b4..6117f75 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,9 +22,32 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ endif()
+
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets DBus X11Extras)
+-find_package(KF5 REQUIRED COMPONENTS Activities Auth IdleTime Config DBusAddons Solid I18n GlobalAccel KIO NotifyConfig Screen KDELibs4Support Wayland NetworkManagerQt BluezQt)
++find_package(KF5 REQUIRED COMPONENTS Activities Auth IdleTime Config DBusAddons Solid I18n GlobalAccel KIO NotifyConfig Screen KDELibs4Support Wayland)
+ find_package(LibKWorkspace CONFIG REQUIRED)
+
++find_package(KF5BluezQt)
++set_package_properties(KF5BluezQt
++ PROPERTIES DESCRIPTION "Qt wrapper for BlueZ 5 DBus API"
++ TYPE OPTIONAL
++ PURPOSE "Support for wireless energy saving actions"
++)
++find_package(KF5NetworkManagerQt)
++set_package_properties(KF5NetworkManagerQt
++ PROPERTIES DESCRIPTION "Qt wrapper for NetworkManager API"
++ TYPE OPTIONAL
++ PURPOSE "Support for wireless energy saving actions"
++)
++
++set(HAVE_WIRELESS_SUPPORT FALSE)
++if(KF5NetworkManagerQt_FOUND AND KF5BluezQt_FOUND)
++ set(HAVE_WIRELESS_SUPPORT TRUE)
++endif()
++add_feature_info(
++ "Wireless power saving"
++ HAVE_WIRELESS_SUPPORT
++ "Support turning off signal-transmitting devices to save energy"
++)
++
+ find_package(UDev REQUIRED)
+
+ find_package(XCB REQUIRED COMPONENTS XCB RANDR DPMS)
+diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
+index 4b0aafd..9c9b897 100644
+--- a/daemon/CMakeLists.txt
++++ b/daemon/CMakeLists.txt
+@@ -19,9 +19,14 @@ set(powerdevil_bundled_actions_SRCS
+ actions/bundled/dimdisplay.cpp
+ actions/bundled/runscript.cpp
+ actions/bundled/handlebuttonevents.cpp
+- actions/bundled/wirelesspowersaving.cpp
+ )
+
++if(HAVE_WIRELESS_SUPPORT)
++ set(powerdevil_bundled_actions_SRCS ${powerdevil_bundled_actions_SRCS}
++ actions/bundled/wirelesspowersaving.cpp
++ )
++endif()
++
+ # target no.1 - powerdevil core library
+ set(powerdevilcore_SRCS
+ powerdevil_debug.cpp
+@@ -49,8 +54,10 @@ qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerMana
+ actions/bundled/handlebuttonevents.h PowerDevil::BundledActions::HandleButtonEvents)
+ qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerManagement.Actions.SuspendSession.xml
+ actions/bundled/suspendsession.h PowerDevil::BundledActions::SuspendSession)
+-qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerManagement.Actions.WirelessPowerSaving.xml
+- actions/bundled/wirelesspowersaving.h PowerDevil::BundledActions::WirelessPowerSaving)
++if(HAVE_WIRELESS_SUPPORT)
++ qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerManagement.Actions.WirelessPowerSaving.xml
++ actions/bundled/wirelesspowersaving.h PowerDevil::BundledActions::WirelessPowerSaving)
++endif()
+
+ add_library(powerdevilcore SHARED ${powerdevilcore_SRCS} ${powerdevil_bundled_actions_SRCS})
+ set_target_properties(powerdevilcore PROPERTIES VERSION ${POWERDEVIL_CORE_VERSION_STRING} SOVERSION ${POWERDEVIL_CORE_VERSION_MAJOR})
+@@ -70,11 +77,16 @@ target_link_libraries(powerdevilcore
+ KF5::WidgetsAddons
+ KF5::Notifications
+ KF5::XmlGui
+- KF5::NetworkManagerQt
+- KF5::BluezQt
+ PW::KWorkspace
+ )
+
++if(HAVE_WIRELESS_SUPPORT)
++ target_link_libraries(powerdevilcore
++ KF5::NetworkManagerQt
++ KF5::BluezQt
++ )
++endif()
++
+ if (XCB_FOUND) # kwin kscreen helper effect
+ target_link_libraries(powerdevilcore Qt5::X11Extras XCB::XCB)
+ endif ()
+diff --git a/daemon/actions/bundled/CMakeLists.txt b/daemon/actions/bundled/CMakeLists.txt
+index e3e8eeb..9623b57 100644
+--- a/daemon/actions/bundled/CMakeLists.txt
++++ b/daemon/actions/bundled/CMakeLists.txt
+@@ -19,8 +19,9 @@ add_powerdevil_bundled_action(keyboardbrightnesscontrol)
+ add_powerdevil_bundled_action(dimdisplay)
+ add_powerdevil_bundled_action(runscript KF5::KIOCore KF5::KIOWidgets)
+ add_powerdevil_bundled_action(suspendsession KF5::KIOCore KF5::KIOWidgets KF5::Solid KF5::KDELibs4Support)
+-add_powerdevil_bundled_action(wirelesspowersaving KF5::NetworkManagerQt KF5::BluezQt)
+-
++if(HAVE_WIRELESS_SUPPORT)
++ add_powerdevil_bundled_action(wirelesspowersaving KF5::NetworkManagerQt KF5::BluezQt)
++endif()
+
+ set(actionconfig_SRCS handlebuttoneventsconfig.cpp)
+ qt5_add_dbus_interface(actionconfig_SRCS
+diff --git a/daemon/config-powerdevil.h.cmake b/daemon/config-powerdevil.h.cmake
+index 62938dc..042317d 100644
+--- a/daemon/config-powerdevil.h.cmake
++++ b/daemon/config-powerdevil.h.cmake
+@@ -1,2 +1,5 @@
+ /* Defines if you have XCB */
+ #cmakedefine HAVE_XCB 1
++
++/* Define to 1 if you have NetworkManagerQt and BluezQt libs. */
++#cmakedefine HAVE_WIRELESS_SUPPORT 1
+diff --git a/daemon/powerdevilactionpool.cpp b/daemon/powerdevilactionpool.cpp
+index 7ef823a..2864483 100644
+--- a/daemon/powerdevilactionpool.cpp
++++ b/daemon/powerdevilactionpool.cpp
+@@ -24,6 +24,8 @@
+ #include "powerdevilcore.h"
+ #include "powerdevil_debug.h"
+
++#include <config-powerdevil.h>
++
+ #include <KConfigGroup>
+ #include <KServiceTypeTrader>
+ #include <KPluginInfo>
+@@ -38,7 +40,9 @@
+ #include "actions/bundled/dimdisplay.h"
+ #include "actions/bundled/runscript.h"
+ #include "actions/bundled/handlebuttonevents.h"
++#ifdef HAVE_WIRELESS_SUPPORT
+ #include "actions/bundled/wirelesspowersaving.h"
++#endif
+
+ namespace PowerDevil
+ {
+@@ -127,7 +131,9 @@ void ActionPool::init(PowerDevil::Core *parent)
+ m_actionPool.insert("DimDisplay", new BundledActions::DimDisplay(parent));
+ m_actionPool.insert("RunScript", new BundledActions::RunScript(parent));
+ m_actionPool.insert("HandleButtonEvents", new BundledActions::HandleButtonEvents(parent));
++#ifdef HAVE_WIRELESS_SUPPORT
+ m_actionPool.insert("WirelessPowerSaving", new BundledActions::WirelessPowerSaving(parent));
++#endif
+
+ // Verify support
+ QHash<QString,Action*>::iterator i = m_actionPool.begin();
diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml
index 2fdbf33..19e9234 100644
--- a/kde-plasma/powerdevil/metadata.xml
+++ b/kde-plasma/powerdevil/metadata.xml
@@ -5,4 +5,7 @@
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <use>
+ <flag name="wireless">Enable wireless energy saving actions via <pkg>kde-frameworks/bluez-qt</pkg> and <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
+ </use>
</pkgmetadata>
diff --git a/kde-plasma/powerdevil/powerdevil-5.6.95.ebuild b/kde-plasma/powerdevil/powerdevil-5.6.95.ebuild
index 2b31521..40333ad 100644
--- a/kde-plasma/powerdevil/powerdevil-5.6.95.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.6.95.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Power management for KDE Plasma Shell"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
KEYWORDS="~amd64 ~x86"
-IUSE="systemd"
+IUSE="systemd +wireless"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -40,6 +40,10 @@ DEPEND="
$(add_qt_dep qtx11extras)
virtual/libudev:=
x11-libs/libxcb
+ wireless? (
+ $(add_frameworks_dep bluez-qt)
+ $(add_frameworks_dep networkmanager-qt)
+ )
"
RDEPEND="${DEPEND}
@@ -60,6 +64,17 @@ RDEPEND="${DEPEND}
!kde-base/systemsettings:4[handbook]
"
+PATCHES=( "${FILESDIR}/${PN}-5.6.95-wireless-optional.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package wireless KF5BluezQt)
+ $(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+ )
+
+ kde5_src_configure
+}
+
src_install() {
kde5_src_install
diff --git a/kde-plasma/powerdevil/powerdevil-5.7.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.7.49.9999.ebuild
index df85953..d7b3c02 100644
--- a/kde-plasma/powerdevil/powerdevil-5.7.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.7.49.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Power management for KDE Plasma Shell"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
KEYWORDS=""
-IUSE="systemd"
+IUSE="systemd +wireless"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -40,6 +40,10 @@ DEPEND="
$(add_qt_dep qtx11extras)
virtual/libudev:=
x11-libs/libxcb
+ wireless? (
+ $(add_frameworks_dep bluez-qt)
+ $(add_frameworks_dep networkmanager-qt)
+ )
"
RDEPEND="${DEPEND}
@@ -60,6 +64,17 @@ RDEPEND="${DEPEND}
!kde-base/systemsettings:4[handbook]
"
+PATCHES=( "${FILESDIR}/${PN}-5.6.95-wireless-optional.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package wireless KF5BluezQt)
+ $(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+ )
+
+ kde5_src_configure
+}
+
src_install() {
kde5_src_install
diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index df85953..98923cf 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Power management for KDE Plasma Shell"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
KEYWORDS=""
-IUSE="systemd"
+IUSE="systemd +wireless"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -40,6 +40,10 @@ DEPEND="
$(add_qt_dep qtx11extras)
virtual/libudev:=
x11-libs/libxcb
+ wireless? (
+ $(add_frameworks_dep bluez-qt)
+ $(add_frameworks_dep networkmanager-qt)
+ )
"
RDEPEND="${DEPEND}
@@ -60,6 +64,15 @@ RDEPEND="${DEPEND}
!kde-base/systemsettings:4[handbook]
"
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package wireless KF5BluezQt)
+ $(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+ )
+
+ kde5_src_configure
+}
+
src_install() {
kde5_src_install
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/
@ 2016-08-31 12:14 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-08-31 12:14 UTC (permalink / raw
To: gentoo-commits
commit: 59111210661c40752660aaf2eeea317e49385c9d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 12:14:32 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 12:14:41 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=59111210
kde-plasma/powerdevil: fix hibernation with OpenRC
Gentoo-bug: 580994
Package-Manager: portage-2.3.0
...freedesktop.consolekit.system.hibernate-multiple-users.pkla | 10 ++++++++++
kde-plasma/powerdevil/powerdevil-5.7.49.9999.ebuild | 1 +
kde-plasma/powerdevil/powerdevil-9999.ebuild | 1 +
3 files changed, 12 insertions(+)
diff --git a/kde-plasma/powerdevil/files/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla b/kde-plasma/powerdevil/files/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
new file mode 100644
index 0000000..cd0e3fc
--- /dev/null
+++ b/kde-plasma/powerdevil/files/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
@@ -0,0 +1,10 @@
+# Enable user hibernate support with Consolekit2.
+#
+# Gentoo bug #580994
+#
+[Allow all users to hibernate with Conesolekit2]
+Identity=unix-group:users
+Action=org.freedesktop.consolekit.system.hibernate-multiple-users;org.freedesktop.consolekit.system.hibernate
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
diff --git a/kde-plasma/powerdevil/powerdevil-5.7.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.7.49.9999.ebuild
index f45ed4f..70161bf 100644
--- a/kde-plasma/powerdevil/powerdevil-5.7.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.7.49.9999.ebuild
@@ -85,6 +85,7 @@ src_install() {
doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
+ doins "${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
fi
}
diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index d27d3a3..8860539 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -83,6 +83,7 @@ src_install() {
doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
+ doins "${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
fi
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/
@ 2018-03-15 11:11 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2018-03-15 11:11 UTC (permalink / raw
To: gentoo-commits
commit: e36c978f32f2ffccf02d23d68960347dca761d48
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 11:11:21 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 11:11:31 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e36c978f
kde-plasma/powerdevil: remove obsolete pkla files
Bug: https://bugs.gentoo.org/649866
Package-Manager: Portage-2.3.24, Repoman-2.3.6
kde-plasma/powerdevil/files/10-org.freedesktop.upower.pkla | 14 --------------
....freedesktop.consolekit.system.stop-multiple-users.pkla | 13 -------------
...eedesktop.consolekit.system.restart-multiple-users.pkla | 13 -------------
...eedesktop.consolekit.system.suspend-multiple-users.pkla | 13 -------------
...desktop.consolekit.system.hibernate-multiple-users.pkla | 10 ----------
kde-plasma/powerdevil/powerdevil-5.12.49.9999.ebuild | 14 --------------
kde-plasma/powerdevil/powerdevil-9999.ebuild | 14 --------------
7 files changed, 91 deletions(-)
diff --git a/kde-plasma/powerdevil/files/10-org.freedesktop.upower.pkla b/kde-plasma/powerdevil/files/10-org.freedesktop.upower.pkla
deleted file mode 100644
index 263b1f92dd..0000000000
--- a/kde-plasma/powerdevil/files/10-org.freedesktop.upower.pkla
+++ /dev/null
@@ -1,14 +0,0 @@
-# Enable user suspend and hibernate support.
-#
-# Author: Eric Hameleers <alien@slackware.com>
-#
-# KDE bug #344456
-# Gentoo bug #529186
-#
-[Allow all users to suspend and hibernate]
-Identity=unix-group:users
-Action=org.freedesktop.upower.suspend;org.freedesktop.upower.hibernate
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
diff --git a/kde-plasma/powerdevil/files/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla b/kde-plasma/powerdevil/files/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
deleted file mode 100644
index 87553184bb..0000000000
--- a/kde-plasma/powerdevil/files/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
+++ /dev/null
@@ -1,13 +0,0 @@
-# Enable user shutdown support.
-#
-# Author: Eric Hameleers <alien@slackware.com>
-#
-# KDE bug #344456
-# Gentoo bug #529186
-#
-[Allow all users to shutdown]
-Identity=unix-group:users
-Action=org.freedesktop.consolekit.system.stop-multiple-users;org.freedesktop.consolekit.system.stop
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/kde-plasma/powerdevil/files/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla b/kde-plasma/powerdevil/files/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
deleted file mode 100644
index 1856535f50..0000000000
--- a/kde-plasma/powerdevil/files/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+++ /dev/null
@@ -1,13 +0,0 @@
-# Enable user restart.
-#
-# Author: Eric Hameleers <alien@slackware.com>
-#
-# KDE bug #344456
-# Gentoo bug #529186
-#
-[Allow all users to restart]
-Identity=unix-group:users
-Action=org.freedesktop.consolekit.system.restart-multiple-users;org.freedesktop.consolekit.system.restart
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/kde-plasma/powerdevil/files/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla b/kde-plasma/powerdevil/files/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
deleted file mode 100644
index 2d83f7c028..0000000000
--- a/kde-plasma/powerdevil/files/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
+++ /dev/null
@@ -1,13 +0,0 @@
-# Enable user suspend support with Consolekit2.
-#
-# Author: Eric Hameleers <alien@slackware.com>
-#
-# KDE bug #344456
-# Gentoo bug #529186
-#
-[Allow all users to suspend with Consolekit2]
-Identity=unix-group:users
-Action=org.freedesktop.consolekit.system.suspend-multiple-users;org.freedesktop.consolekit.system.suspend
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/kde-plasma/powerdevil/files/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla b/kde-plasma/powerdevil/files/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
deleted file mode 100644
index 10d95c5fd5..0000000000
--- a/kde-plasma/powerdevil/files/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
+++ /dev/null
@@ -1,10 +0,0 @@
-# Enable user hibernate support with Consolekit2.
-#
-# Gentoo bug #580994
-#
-[Allow all users to hibernate with Consolekit2]
-Identity=unix-group:users
-Action=org.freedesktop.consolekit.system.hibernate-multiple-users;org.freedesktop.consolekit.system.hibernate
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/kde-plasma/powerdevil/powerdevil-5.12.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.12.49.9999.ebuild
index 4d6958cff5..f1c7b676eb 100644
--- a/kde-plasma/powerdevil/powerdevil-5.12.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.12.49.9999.ebuild
@@ -51,7 +51,6 @@ RDEPEND="${DEPEND}
>=sys-power/upower-0.9.23
consolekit? (
>=sys-auth/consolekit-1.0.1
- sys-auth/polkit-pkla-compat
sys-power/pm-utils
)
!kde-plasma/powerdevil:4
@@ -67,16 +66,3 @@ src_configure() {
kde5_src_configure
}
-
-src_install() {
- kde5_src_install
-
- if use consolekit ; then
- insinto /etc/polkit-1/localauthority/10-vendor.d/
- doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
- doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
- doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
- doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
- doins "${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
- fi
-}
diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index 4d6958cff5..f1c7b676eb 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -51,7 +51,6 @@ RDEPEND="${DEPEND}
>=sys-power/upower-0.9.23
consolekit? (
>=sys-auth/consolekit-1.0.1
- sys-auth/polkit-pkla-compat
sys-power/pm-utils
)
!kde-plasma/powerdevil:4
@@ -67,16 +66,3 @@ src_configure() {
kde5_src_configure
}
-
-src_install() {
- kde5_src_install
-
- if use consolekit ; then
- insinto /etc/polkit-1/localauthority/10-vendor.d/
- doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
- doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
- doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
- doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
- doins "${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/
@ 2020-08-03 22:40 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-08-03 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 3b7756b18da54e4accf1d7ea94f8d3f6e48d29ff
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 1 16:12:48 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 3 22:38:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b7756b1
kde-plasma/powerdevil: Fix build with app-misc/ddcutil-0.9.9
Reported-by: Stefano Crocco <stefano.crocco <AT> alice.it>
Thanks-to: Mike Lothian <mike <AT> fireburn.co.uk>
Closes: https://bugs.gentoo.org/734918
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/powerdevil-5.19.4-ddcutil-0.9.9.patch | 24 ++++++++++++++++++++++
.../powerdevil/powerdevil-5.19.49.9999.ebuild | 2 ++
2 files changed, 26 insertions(+)
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch b/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
new file mode 100644
index 0000000000..3a1c4c3815
--- /dev/null
+++ b/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
@@ -0,0 +1,24 @@
+From fcb26be2fb279e6ad3b7b814d26a5921d16201eb Mon Sep 17 00:00:00 2001
+From: Johannes Jordan <kde@lanrules.de>
+Date: Mon, 29 Jun 2020 10:51:40 +0000
+Subject: [PATCH] Fix compilation with ddcutil 0.9.9
+
+---
+ daemon/backends/upower/ddcutilbrightness.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/daemon/backends/upower/ddcutilbrightness.cpp b/daemon/backends/upower/ddcutilbrightness.cpp
+index e712c05a..a75aac5c 100644
+--- a/daemon/backends/upower/ddcutilbrightness.cpp
++++ b/daemon/backends/upower/ddcutilbrightness.cpp
+@@ -56,7 +56,6 @@ void DDCutilBrightness::detect()
+
+ DDCA_Feature_List vcpList;
+ ddca_get_feature_list_by_dref(DDCA_SUBSET_COLOR, dh, false, &vcpList);
+- qCDebug(POWERDEVIL) << "ddca_feature_list: "<< ddca_feature_list_string(&vcpList, "0x", ",");
+ QVector<uint16_t> tmpVcpList;
+ for (int iVcp = 0; iVcp < m_usedVcp.count(); ++iVcp) {
+ DDCA_Non_Table_Vcp_Value returnValue;
+--
+GitLab
+
diff --git a/kde-plasma/powerdevil/powerdevil-5.19.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.19.49.9999.ebuild
index 5a68af2160..7db7d8ccb3 100644
--- a/kde-plasma/powerdevil/powerdevil-5.19.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.19.49.9999.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${DEPEND}
>=sys-power/upower-0.9.23
"
+PATCHES=( "${FILESDIR}/${PN}-5.19.4-ddcutil-0.9.9.patch" ) # bug 734918
+
src_configure() {
local mycmakeargs=(
-DHAVE_DDCUTIL=$(usex brightness-control)
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-08-03 22:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-15 11:11 [gentoo-commits] proj/kde:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2020-08-03 22:40 Andreas Sturmlechner
2016-08-31 12:14 Michael Palimaka
2016-06-19 10:24 Michael Palimaka
2015-06-04 14:23 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox