Cleanup

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

3 files changed, 6 insertions, 113 deletions

diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index 232072124924..2e163e8d7e4e 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.123 2011/12/11 18:52:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.124 2011/12/11 23:49:50 dilfridge Exp $
+
+  11 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/solid-4.3.1-darwin-compile-powermanager.patch,
+  -files/solid-4.4.69-darwin-compile-powermanager.patch:
+  Cleanup
 
 *solid-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/solid/files/solid-4.3.1-darwin-compile-powermanager.patch b/kde-base/solid/files/solid-4.3.1-darwin-compile-powermanager.patch
deleted file mode 100644
index ba9d4f6bb87a..000000000000
--- a/kde-base/solid/files/solid-4.3.1-darwin-compile-powermanager.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- solid-4.3.1/libs/solid/control/powermanager.cpp.orig	2009-09-24 19:11:31 +0200
-+++ solid-4.3.1/libs/solid/control/powermanager.cpp	2009-09-24 19:11:46 +0200
-@@ -25,7 +25,9 @@
- #include "ifaces/powermanager.h"
- #include <kdebug.h>
- #include <kglobal.h>
-+#if !defined(Q_WS_MAC)
- #include <QX11Info>
-+#endif
- 
- K_GLOBAL_STATIC(Solid::Control::PowerManagerPrivate, globalPowerManager)
- 
---- solid-4.3.1/libs/solid/control/powermanager.cpp.orig	2009-09-24 19:04:00 +0200
-+++ solid-4.3.1/libs/solid/control/powermanager.cpp	2009-09-24 19:04:54 +0200
-@@ -148,7 +148,9 @@ Solid::Control::PowerManager::Brightness
-                       Solid::Control::PowerManager::BrightnessControlsList(), brightnessControlsAvailable());
- }
- 
-+#if !defined(Q_WS_MAC)
- extern float xrandr_brightlight(Display *dpy, long new_value = -1);
-+#endif
- 
- bool Solid::Control::PowerManager::setBrightness(float brightness, const QString &device)
- {
---- solid-4.3.1/libs/solid/control/powermanager.cpp.orig	2009-09-24 18:54:40 +0200
-+++ solid-4.3.1/libs/solid/control/powermanager.cpp	2009-09-24 18:56:02 +0200
-@@ -157,7 +157,7 @@ bool Solid::Control::PowerManager::setBr
-         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
-         if(controls.size() == 0)
-         {
--#ifdef Q_WS_WIN
-+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-             return false;
- #else
-             return ( xrandr_brightlight( QX11Info::display(), brightness ) >= 0 );
-@@ -187,7 +187,7 @@ float Solid::Control::PowerManager::brig
-         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
-         if(controls.size() == 0)
-         {
--#ifdef Q_WS_WIN
-+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-             return false;
- #else
-             return xrandr_brightlight( QX11Info::display() );
---- solid-4.3.1/libs/solid/control/CMakeLists.txt.orig	2009-09-24 18:54:49 +0200
-+++ solid-4.3.1/libs/solid/control/CMakeLists.txt	2009-09-24 18:55:10 +0200
-@@ -28,9 +28,9 @@ set(solidcontrol_LIB_SRCS
- )
- 
- # FIXME: this should be XRANDR_FOUND instead
--if(NOT WIN32)
-+if(NOT WIN32 AND NOT APPLE)
- set(solidcontrol_LIB_SRCS ${solidcontrol_LIB_SRCS} powermanager_randr.cpp)
--endif(NOT WIN32)
-+endif(NOT WIN32 AND NOT APPLE)
- 
- qt4_add_dbus_interface(solidcontrol_LIB_SRCS org.kde.Solid.Networking.xml org_kde_solid_networking)
- 
diff --git a/kde-base/solid/files/solid-4.4.69-darwin-compile-powermanager.patch b/kde-base/solid/files/solid-4.4.69-darwin-compile-powermanager.patch
deleted file mode 100644
index 44d504d54516..000000000000
--- a/kde-base/solid/files/solid-4.4.69-darwin-compile-powermanager.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- solid-4.4.69.orig/libs/solid/control/powermanager.cpp
-+++ solid-4.4.69/libs/solid/control/powermanager.cpp
-@@ -25,7 +25,9 @@
- #include "ifaces/powermanager.h"
- #include <kdebug.h>
- #include <kglobal.h>
-+#if !defined(Q_WS_MAC)
- #include <QX11Info>
-+#endif
- 
- K_GLOBAL_STATIC(Solid::Control::PowerManagerPrivate, globalPowerManager)
- 
-@@ -129,7 +131,9 @@ Solid::Control::PowerManager::Brightness
-                       Solid::Control::PowerManager::BrightnessControlsList(), brightnessControlsAvailable());
- }
- 
-+#if !defined(Q_WS_MAC)
- extern float xrandr_brightlight(Display *dpy, long new_value = -1);
-+#endif
- 
- bool Solid::Control::PowerManager::setBrightness(float brightness, const QString &device)
- {
-@@ -138,7 +142,7 @@ bool Solid::Control::PowerManager::setBr
-         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
-         if(controls.keys(Solid::Control::PowerManager::Screen).isEmpty())
-         {
--#ifdef Q_WS_WIN
-+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-             return false;
- #else
-             return ( xrandr_brightlight( QX11Info::display(), brightness ) >= 0 );
-@@ -168,7 +172,7 @@ float Solid::Control::PowerManager::brig
-         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
-         if(controls.keys(Solid::Control::PowerManager::Screen).isEmpty())
-         {
--#ifdef Q_WS_WIN
-+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-             return false;
- #else
-             return xrandr_brightlight( QX11Info::display() );
---- solid-4.4.69.orig/libs/solid/control/CMakeLists.txt
-+++ solid-4.4.69/libs/solid/control/CMakeLists.txt
-@@ -28,9 +28,9 @@ set(solidcontrol_LIB_SRCS
- )
- 
- # FIXME: this should be XRANDR_FOUND instead
--if(NOT WIN32)
-+if(NOT WIN32 AND NOT APPLE)
- set(solidcontrol_LIB_SRCS ${solidcontrol_LIB_SRCS} powermanager_randr.cpp)
--endif(NOT WIN32)
-+endif(NOT WIN32 AND NOT APPLE)
- 
- qt4_add_dbus_interface(solidcontrol_LIB_SRCS org.kde.Solid.Networking.xml org_kde_solid_networking)
-