Merge pull request freebsd#14 from HenryHu/kde5-import

only remove part of powerdevilupowerbackend.cpp I think it would still be great if we implemented some proper backend =)
DankBSD · Jan 14, 2018 · 0b5ac34 · 0b5ac34
2 parents adeee82 + 5c8ed17
commit 0b5ac34
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 7 deletions.
diff --git a/sysutils/plasma5-powerdevil/files/patch-daemon_backends_CMakeLists.txt b/sysutils/plasma5-powerdevil/files/patch-daemon_backends_CMakeLists.txt
@@ -1,18 +1,15 @@
---- daemon/backends/CMakeLists.txt.orig	2017-09-13 23:01:05 UTC
+--- daemon/backends/CMakeLists.txt.orig	2017-11-07 13:26:00 UTC
 +++ daemon/backends/CMakeLists.txt
-@@ -7,11 +7,8 @@ set(powerdevilupowerbackend_SRCS
-     ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp
-     upower/upowersuspendjob.cpp
-     upower/login1suspendjob.cpp
--    upower/powerdevilupowerbackend.cpp
+@@ -10,8 +10,6 @@ set(powerdevilupowerbackend_SRCS
+     upower/powerdevilupowerbackend.cpp
      upower/xrandrbrightness.cpp
      upower/xrandrxcbhelper.cpp
 -    upower/udevqtclient.cpp
 -    upower/udevqtdevice.cpp
      upower/ddcutilbrightness.cpp
  )
 
-@@ -55,7 +52,6 @@ target_link_libraries(powerdevilupowerbackend
+@@ -55,7 +53,6 @@ target_link_libraries(powerdevilupowerba
      KF5::CoreAddons
      KF5::DBusAddons
      KF5::I18n

diff --git a/sysutils/plasma5-powerdevil/files/patch-daemon_backends_upower_powerdevilupowerbackend.cpp b/sysutils/plasma5-powerdevil/files/patch-daemon_backends_upower_powerdevilupowerbackend.cpp
@@ -0,0 +1,38 @@
+--- daemon/backends/upower/powerdevilupowerbackend.cpp.orig	2017-12-10 06:14:30 UTC
++++ daemon/backends/upower/powerdevilupowerbackend.cpp
+@@ -41,7 +41,7 @@
+ #include "ddcutilbrightness.h"
+ #include "upowersuspendjob.h"
+ #include "login1suspendjob.h"
+-#include "udevqt.h"
++//#include "udevqt.h"
+
+ #define HELPER_ID "org.kde.powerdevil.backlighthelper"
+
+@@ -200,8 +200,10 @@ void PowerDevilUPowerBackend::init()
+
+                                     m_isLedBrightnessControl = m_syspath.contains(QLatin1String("/leds/"));
+                                     if (!m_isLedBrightnessControl) {
++                                    /*
+                                         UdevQt::Client *client =  new UdevQt::Client(QStringList("backlight"), this);
+                                         connect(client, SIGNAL(deviceChanged(UdevQt::Device)), SLOT(onDeviceChanged(UdevQt::Device)));
++                                        */
+                                     }
+
+                                     Q_EMIT brightnessSupportQueried(m_brightnessMax > 0);
+@@ -358,6 +360,7 @@ void PowerDevilUPowerBackend::initWithBr
+
+ void PowerDevilUPowerBackend::onDeviceChanged(const UdevQt::Device &device)
+ {
++    /*
+     qCDebug(POWERDEVIL) << "Udev device changed" << m_syspath << device.sysfsPath();
+     if (device.sysfsPath() != m_syspath) {
+         return;
+@@ -373,6 +376,7 @@ void PowerDevilUPowerBackend::onDeviceCh
+         m_cachedBrightnessMap[Screen] = newBrightness;
+         onBrightnessChanged(Screen, newBrightness, maxBrightness);
+     }
++    */
+ }
+
+ int PowerDevilUPowerBackend::brightnessKeyPressed(PowerDevil::BrightnessLogic::BrightnessKeyType type, BrightnessControlType controlType)