- hack for double brightness step if brightness change handled by hardware

Changed files:
    kde4-kdebase-workspace-brightness.patch -> 1.1
    kde4-kdebase-workspace.spec -> 1.306

diff --git a/kde4-kdebase-workspace-brightness.patch b/kde4-kdebase-workspace-brightness.patch
new file mode 100644 (file)
index 0000000..8e80bdd
--- /dev/null
+++ b/kde4-kdebase-workspace-brightness.patch
@@ -0,0 +1,45 @@
+--- 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 pressed delivered at once; 100ms marign
++
+     BrightnessControlsList controls = brightnessControlsAvailable();
+     QList<QString> screenControls = controls.keys(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);
+     }
+ }
+ 

diff --git a/kde4-kdebase-workspace.spec b/kde4-kdebase-workspace.spec
index 22962657b498e3e1d1716851d0a6327ba49f342d..66f3ca8996d1d73b3844cc0a1ed34c04a5cd0080 100644 (file)
--- a/kde4-kdebase-workspace.spec
+++ b/kde4-kdebase-workspace.spec
@@ -8,7 +8,7 @@ Summary:        KDE 4 base workspace components
 Summary(pl.UTF-8):     Podstawowe komponenty środowiska KDE 4
 Name:          kde4-kdebase-workspace
 Version:       4.8.2
-Release:       3
+Release:       4
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
@@ -30,6 +30,7 @@ Patch100:     %{name}-branch.diff
 Patch0:                %{name}-rootprivs.patch
 Patch1:                %{name}-kdmconfig.patch
 Patch2:                %{name}-kdm_revertcrashlogic.patch
+Patch3:                kde4-kdebase-workspace-brightness.patch
 URL:           http://www.kde.org/
 BuildRequires: ConsoleKit-devel
 BuildRequires: Mesa-libGLES-devel
@@ -521,6 +522,7 @@ dialogowych mających na celu rozszerzenie przywilejów użytkownika.
 %patch1 -p1
 # https://bugs.kde.org/show_bug.cgi?id=281862
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build