[packages/kde4-kdebase-workspace] - up to 4.9.4; rel 0.1 - need to make sure that full brightness patch is no longer needed

[arekm]

commit 0460803ad7fe652a5a492b9c2c66dcdb5fb0fd0f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Dec 2 12:08:40 2012 +0100

    - up to 4.9.4; rel 0.1 - need to make sure that full brightness patch is no longer needed

 kde4-kdebase-workspace-brightness.patch | 52 ++++-----------------------------
 kde4-kdebase-workspace.spec             |  6 ++--
 2 files changed, 8 insertions(+), 50 deletions(-)
---
diff --git a/kde4-kdebase-workspace.spec b/kde4-kdebase-workspace.spec
index af6b7e2..3cd0836 100644
--- a/kde4-kdebase-workspace.spec
+++ b/kde4-kdebase-workspace.spec
@@ -7,12 +7,12 @@
 Summary:	KDE 4 base workspace components
 Summary(pl.UTF-8):	Podstawowe komponenty środowiska KDE 4
 Name:		kde4-kdebase-workspace
-Version:	4.9.3
-Release:	1
+Version:	4.9.4
+Release:	0.1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
-# Source0-md5:	7e0ac76dda7e44895df6603504b24872
+# Source0-md5:	b26cc75639cada6de8c96ee752c0291b
 Source1:	kdebase-kdesktop.pam
 Source2:	kdebase-kdm.pam
 Source3:	kdebase-kdm-np.pam
diff --git a/kde4-kdebase-workspace-brightness.patch b/kde4-kdebase-workspace-brightness.patch
index 3524eda..37dff1a 100644
--- a/kde4-kdebase-workspace-brightness.patch
+++ b/kde4-kdebase-workspace-brightness.patch
@@ -1,34 +1,7 @@
---- kde-workspace-4.8.2/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h~	2012-03-30 00:02:31.000000000 +0200
-+++ kde-workspace-4.8.2/powerdevil/daemon/backends/upower/powerdevilupowerbackend.h	2012-04-19 23:54:03.961628717 +0200
-@@ -70,6 +70,7 @@
- 
-     // brightness
-     float m_cachedBrightness;
-+    QElapsedTimer m_cachedBrightness_timer;
-     XRandrBrightness         *m_brightnessControl;
-     OrgFreedesktopUPowerInterface *m_upowerInterface;
-     OrgFreedesktopUPowerKbdBacklightInterface *m_kbdBacklight;
---- kde-workspace-4.8.2/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp~	2012-03-30 00:02:31.000000000 +0200
-+++ kde-workspace-4.8.2/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp	2012-04-19 23:56:23.768337437 +0200
-@@ -108,6 +108,7 @@
- 
-     if (!controls.isEmpty()) {
-         m_cachedBrightness = brightness(Screen);
-+        m_cachedBrightness_timer.start();
-         kDebug() << "current screen brightness: " << m_cachedBrightness;
-     }
- 
-@@ -153,6 +154,9 @@
- 
- void PowerDevilUPowerBackend::brightnessKeyPressed(PowerDevil::BackendInterface::BrightnessKeyType type)
- {
-+    if (m_cachedBrightness_timer.elapsed() < 100)
-+        return; // two key presses delivered for single physical key press; 100ms marign
-+
-     BrightnessControlsList controls = brightnessControlsAvailable();
-     QList<QString> screenControls = controls.keys(Screen);
- 
-@@ -169,9 +169,9 @@
+diff -urN kde-workspace-4.9.4.org/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp kde-workspace-4.9.4/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+--- kde-workspace-4.9.4.org/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp	2012-11-30 08:24:40.000000000 +0100
++++ kde-workspace-4.9.4/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp	2012-12-02 11:58:03.781622657 +0100
+@@ -165,9 +165,9 @@
      if (qFuzzyCompare(currentBrightness, m_cachedBrightness)) {
          float newBrightness;
          if (type == Increase) {
@@ -39,19 +12,4 @@
 +            newBrightness = qMax(0.0f, currentBrightness - 6);
          }
  
-         if (setBrightness(newBrightness, Screen)) {
-@@ -174,11 +178,14 @@
-             newBrightness = brightness(Screen);
-             if (!qFuzzyCompare(newBrightness, m_cachedBrightness)) {
-                 m_cachedBrightness = newBrightness;
-+                m_cachedBrightness_timer.restart();
-                 onBrightnessChanged(Screen, m_cachedBrightness);
-             }
-         }
-     } else {
-         m_cachedBrightness = currentBrightness;
-+        m_cachedBrightness_timer.restart();
-+        onBrightnessChanged(Screen, m_cachedBrightness);
-     }
- }
- 
+         setBrightness(newBrightness, Screen);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdebase-workspace.git/commitdiff/0460803ad7fe652a5a492b9c2c66dcdb5fb0fd0f