packages: kde4-kdebase-workspace/kde4-kdebase-workspace.spec, kde4-kdebase-...

[arekm]

Author: arekm                        Date: Thu Apr 19 22:13:20 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- hack for double brightness step if brightness change handled by hardware

---- Files affected:
packages/kde4-kdebase-workspace:
   kde4-kdebase-workspace.spec (1.305 -> 1.306) , kde4-kdebase-workspace-brightness.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.305 packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.306
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.305	Tue Apr 17 19:26:24 2012
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec	Fri Apr 20 00:13:14 2012
@@ -9,7 +9,7 @@
 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
@@ -31,6 +31,7 @@
 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
@@ -522,6 +523,7 @@
 %patch1 -p1
 # https://bugs.kde.org/show_bug.cgi?id=281862
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build
@@ -1912,6 +1914,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.306  2012/04/19 22:13:14  arekm
+- hack for double brightness step if brightness change handled by hardware
+
 Revision 1.305  2012/04/17 17:26:24  baggins
 - rel 3
 - better systemd deps

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-brightness.patch
diff -u /dev/null packages/kde4-kdebase-workspace/kde4-kdebase-workspace-brightness.patch:1.1
--- /dev/null	Fri Apr 20 00:13:20 2012
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-brightness.patch	Fri Apr 20 00:13:14 2012
@@ -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);
+     }
+ }
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.305&r2=1.306