Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a0de7c4ad11314dcdbea2a7814033c5361df969d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a0de7c4ad11314dcdbea2a7814033c5361df969d)
  • Date: Tue, 21 Mar 2017 20:18:22 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

plasma/powerdevil/HISTORY | 1
plasma/powerdevil/PRE_BUILD | 3
plasma/powerdevil/power.diff | 149
-------------------------------------------
3 files changed, 1 insertion(+), 152 deletions(-)

New commits:
commit a0de7c4ad11314dcdbea2a7814033c5361df969d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

powerdevil - fix

diff --git a/plasma/powerdevil/HISTORY b/plasma/powerdevil/HISTORY
index 524b974..d196758 100644
--- a/plasma/powerdevil/HISTORY
+++ b/plasma/powerdevil/HISTORY
@@ -1,5 +1,6 @@
2017-03-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.9.4
+ * PRE_BUILD power.diff: deleted

2017-02-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.9.3
diff --git a/plasma/powerdevil/PRE_BUILD b/plasma/powerdevil/PRE_BUILD
deleted file mode 100755
index 42f2a6d..0000000
--- a/plasma/powerdevil/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/power.diff
diff --git a/plasma/powerdevil/power.diff b/plasma/powerdevil/power.diff
deleted file mode 100644
index 2cd981b..0000000
--- a/plasma/powerdevil/power.diff
+++ /dev/null
@@ -1,149 +0,0 @@
-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();



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a0de7c4ad11314dcdbea2a7814033c5361df969d), Treeve Jelbert, 03/21/2017

Archive powered by MHonArc 2.6.24.

Top of Page