| 1 |
tampakrap 10/09/06 02:03:41 |
| 2 |
|
| 3 |
Added: solid-4.4.69-darwin-compile-powermanager.patch |
| 4 |
Log: |
| 5 |
Version bump KDE SC 4.5.1 |
| 6 |
|
| 7 |
(Portage version: 2.2_rc75/cvs/Linux x86_64, RepoMan options: --force) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/solid/files/solid-4.4.69-darwin-compile-powermanager.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/solid/files/solid-4.4.69-darwin-compile-powermanager.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/solid/files/solid-4.4.69-darwin-compile-powermanager.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: solid-4.4.69-darwin-compile-powermanager.patch |
| 16 |
=================================================================== |
| 17 |
--- solid-4.4.69.orig/libs/solid/control/powermanager.cpp |
| 18 |
+++ solid-4.4.69/libs/solid/control/powermanager.cpp |
| 19 |
@@ -25,7 +25,9 @@ |
| 20 |
#include "ifaces/powermanager.h" |
| 21 |
#include <kdebug.h> |
| 22 |
#include <kglobal.h> |
| 23 |
+#if !defined(Q_WS_MAC) |
| 24 |
#include <QX11Info> |
| 25 |
+#endif |
| 26 |
|
| 27 |
K_GLOBAL_STATIC(Solid::Control::PowerManagerPrivate, globalPowerManager) |
| 28 |
|
| 29 |
@@ -129,7 +131,9 @@ Solid::Control::PowerManager::Brightness |
| 30 |
Solid::Control::PowerManager::BrightnessControlsList(), brightnessControlsAvailable()); |
| 31 |
} |
| 32 |
|
| 33 |
+#if !defined(Q_WS_MAC) |
| 34 |
extern float xrandr_brightlight(Display *dpy, long new_value = -1); |
| 35 |
+#endif |
| 36 |
|
| 37 |
bool Solid::Control::PowerManager::setBrightness(float brightness, const QString &device) |
| 38 |
{ |
| 39 |
@@ -138,7 +142,7 @@ bool Solid::Control::PowerManager::setBr |
| 40 |
Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable(); |
| 41 |
if(controls.keys(Solid::Control::PowerManager::Screen).isEmpty()) |
| 42 |
{ |
| 43 |
-#ifdef Q_WS_WIN |
| 44 |
+#if defined(Q_WS_WIN) || defined(Q_WS_MAC) |
| 45 |
return false; |
| 46 |
#else |
| 47 |
return ( xrandr_brightlight( QX11Info::display(), brightness ) >= 0 ); |
| 48 |
@@ -168,7 +172,7 @@ float Solid::Control::PowerManager::brig |
| 49 |
Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable(); |
| 50 |
if(controls.keys(Solid::Control::PowerManager::Screen).isEmpty()) |
| 51 |
{ |
| 52 |
-#ifdef Q_WS_WIN |
| 53 |
+#if defined(Q_WS_WIN) || defined(Q_WS_MAC) |
| 54 |
return false; |
| 55 |
#else |
| 56 |
return xrandr_brightlight( QX11Info::display() ); |
| 57 |
--- solid-4.4.69.orig/libs/solid/control/CMakeLists.txt |
| 58 |
+++ solid-4.4.69/libs/solid/control/CMakeLists.txt |
| 59 |
@@ -28,9 +28,9 @@ set(solidcontrol_LIB_SRCS |
| 60 |
) |
| 61 |
|
| 62 |
# FIXME: this should be XRANDR_FOUND instead |
| 63 |
-if(NOT WIN32) |
| 64 |
+if(NOT WIN32 AND NOT APPLE) |
| 65 |
set(solidcontrol_LIB_SRCS ${solidcontrol_LIB_SRCS} powermanager_randr.cpp) |
| 66 |
-endif(NOT WIN32) |
| 67 |
+endif(NOT WIN32 AND NOT APPLE) |
| 68 |
|
| 69 |
qt4_add_dbus_interface(solidcontrol_LIB_SRCS org.kde.Solid.Networking.xml org_kde_solid_networking) |
Archives