Drop unused patch.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 5 insertions, 154 deletions

diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index 9024e3917184..23c37d24365f 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.85 2010/08/09 17:35:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.86 2010/08/10 13:36:25 scarabeus Exp $
+
+  10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/solid-4.3.4-hal.patch, -files/solid-4.3.4-hal-2.patch:
+  Drop unused patch.
 
   09 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> solid-4.4.5.ebuild:
   Drop alpha ia64 and sparc per the AT Lead permission.
diff --git a/kde-base/solid/files/solid-4.3.4-hal-2.patch b/kde-base/solid/files/solid-4.3.4-hal-2.patch
deleted file mode 100644
index d9e3b28a3810..000000000000
--- a/kde-base/solid/files/solid-4.3.4-hal-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://websvn.kde.org/trunk/KDE/kdebase/workspace/libs/solid/control/powermanager.cpp?r1=1062504&r2=1069849&pathrev=1069849
-https://bugs.kde.org/show_bug.cgi?id=219333#c23
-
---- libs/solid/control/powermanager.cpp
-+++ libs/solid/control/powermanager.cpp
-@@ -155,7 +155,7 @@
-     if(device.isEmpty())
-     {
-         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
--        if(controls.size() == 0)
-+        if(controls.keys(Solid::Control::PowerManager::Screen).isEmpty())
-         {
- #ifdef Q_WS_WIN
-             return false;
-@@ -185,7 +185,7 @@
-     if(device.isEmpty())
-     {
-         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
--        if(controls.size() == 0)
-+        if(controls.keys(Solid::Control::PowerManager::Screen).isEmpty())
-         {
- #ifdef Q_WS_WIN
-             return false;
diff --git a/kde-base/solid/files/solid-4.3.4-hal.patch b/kde-base/solid/files/solid-4.3.4-hal.patch
deleted file mode 100644
index 36fc78c22074..000000000000
--- a/kde-base/solid/files/solid-4.3.4-hal.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=295600
-http://bugs.gentoo.org/show_bug.cgi?id=296544
-
-http://websvn.kde.org/trunk/KDE/kdebase/workspace/solid/hal/halpower.cpp?r1=929945&r2=1035622&pathrev=1057980
-http://websvn.kde.org/trunk/KDE/kdebase/workspace/solid/hal/halpower.cpp?r1=1035622&r2=1057980&pathrev=1057980
-http://websvn.kde.org/trunk/KDE/kdebase/workspace/solid/hal/halpower.cpp?r1=1057980&r2=1062504&pathrev=1062504
-http://websvn.kde.org/trunk/KDE/kdebase/workspace/libs/solid/control/powermanager.cpp?r1=923760&r2=1062504&pathrev=1062504
-
-diff -ur kdebase-workspace-4.3.4.orig/libs/solid/control/powermanager.cpp kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp
---- kdebase-workspace-4.3.4.orig/libs/solid/control/powermanager.cpp	2009-02-12 12:23:46.000000000 +0200
-+++ kdebase-workspace-4.3.4/libs/solid/control/powermanager.cpp	2009-12-16 16:45:44.000000000 +0200
-@@ -196,7 +196,7 @@
-         else
-         {
-             return_SOLID_CALL(Ifaces::PowerManager *, globalPowerManager->managerBackend(),
--                      false, brightness(controls.keys().at(0)));
-+                      false, brightness(controls.keys(Solid::Control::PowerManager::Screen).at(0)));
-         }
-     }
-     else
-diff -ur kdebase-workspace-4.3.4.orig/solid/hal/halpower.cpp kdebase-workspace-4.3.4/solid/hal/halpower.cpp
---- kdebase-workspace-4.3.4.orig/solid/hal/halpower.cpp	2009-02-26 11:12:20.000000000 +0200
-+++ kdebase-workspace-4.3.4/solid/hal/halpower.cpp	2009-12-16 16:46:39.000000000 +0200
-@@ -361,13 +361,21 @@
- Solid::Control::PowerManager::BrightnessControlsList HalPower::brightnessControlsAvailable()
- {
-     Solid::Control::PowerManager::BrightnessControlsList deviceList;
--    foreach(const QString &name, m_halManager.call("FindDeviceByCapability", "laptop_panel").arguments().at(0).toStringList())
-+    QDBusReply<QStringList> reply = m_halManager.call("FindDeviceByCapability", "laptop_panel");
-+    if (reply.isValid())
-     {
--        deviceList.insert(name, Solid::Control::PowerManager::Screen);
-+        foreach(const QString &name, reply.value())
-+        {
-+            deviceList.insert(name, Solid::Control::PowerManager::Screen);
-+        }
-     }
--    foreach(const QString &name, m_halManager.call("FindDeviceByCapability", "keyboard_backlight").arguments().at(0).toStringList())
-+    reply = m_halManager.call("FindDeviceByCapability", "keyboard_backlight");
-+    if (reply.isValid())
-     {
--        deviceList.insert(name, Solid::Control::PowerManager::Keyboard);
-+        foreach(const QString &name, reply.value())
-+        {
-+            deviceList.insert(name, Solid::Control::PowerManager::Keyboard);
-+        }
-     }
-     return deviceList;
- }
-@@ -375,42 +383,53 @@
- float HalPower::brightness(const QString &device)
- {
-     float brightness;
--    if(m_halManager.call("FindDeviceByCapability", "laptop_panel").arguments().at(0).toStringList().contains(device))
-+    QDBusReply<QStringList> reply = m_halManager.call("FindDeviceByCapability", "laptop_panel");
-+    if(reply.isValid() && reply.value().contains(device))
-     {
-         QDBusInterface deviceInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device.LaptopPanel", QDBusConnection::systemBus());
--        brightness = deviceInterface.call("GetBrightness").arguments().at(0).toDouble();
--        if(deviceInterface.lastError().isValid())
-+        QDBusReply<int> brightnessReply = deviceInterface.call("GetBrightness");
-+        if(!brightnessReply.isValid())
-         {
--            return 0;
-+            return 0.0;
-         }
--        else
-+        brightness = brightnessReply;
-+
-+        QDBusInterface propertyInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device", QDBusConnection::systemBus());
-+        QDBusReply<int> levelsReply = propertyInterface.call("GetProperty", "laptop_panel.num_levels");
-+        if (levelsReply.isValid())
-         {
--            QDBusInterface propertyInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device", QDBusConnection::systemBus());
--            int levels = propertyInterface.call("GetProperty", "laptop_panel.num_levels").arguments().at(0).toInt();
-+            int levels = levelsReply;
-             return (float)(100*(brightness/(levels-1)));
-         }
-     }
--    if(m_halManager.call("FindDeviceByCapability", "keyboard_backlight").arguments().at(0).toStringList().contains(device))
-+
-+    reply = m_halManager.call("FindDeviceByCapability", "keyboard_backlight");
-+    if(reply.isValid() && reply.value().contains(device))
-     {
-         QDBusInterface deviceInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device.KeyboardBacklight", QDBusConnection::systemBus()); //TODO - I do not have a backlight enabled keyboard, so I'm guessing a bit here. Could someone please check this.
--        brightness = deviceInterface.call("GetBrightness").arguments().at(0).toDouble();
--        if(deviceInterface.lastError().isValid())
-+
-+        QDBusReply<int> brightnessReply = deviceInterface.call("GetBrightness");
-+        if(!brightnessReply.isValid())
-         {
--            return 0;
-+            return 0.0;
-         }
--        else
-+        brightness = brightnessReply;
-+
-+        QDBusInterface propertyInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device", QDBusConnection::systemBus());
-+        QDBusReply<int> levelsReply = propertyInterface.call("GetProperty", "keyboard_backlight.num_levels");
-+        if (levelsReply.isValid())
-         {
--            QDBusInterface propertyInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device", QDBusConnection::systemBus());
--            int levels = propertyInterface.call("GetProperty", "keyboard_backlight.num_levels").arguments().at(0).toInt();
-+            int levels = levelsReply;
-             return (float)(100*(brightness/(levels-1)));
-         }
-     }
--    return 0;
-+    return 0.0;
- }
- 
- bool HalPower::setBrightness(float brightness, const QString &device)
- {
--    if(m_halManager.call("FindDeviceByCapability", "laptop_panel").arguments().at(0).toStringList().contains(device))
-+    QDBusReply<QStringList> reply = m_halManager.call("FindDeviceByCapability", "laptop_panel");
-+    if(reply.isValid() && reply.value().contains(device))
-     {
-         QDBusInterface propertyInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device", QDBusConnection::systemBus());
-         int levels = propertyInterface.call("GetProperty", "laptop_panel.num_levels").arguments().at(0).toInt();
-@@ -422,7 +441,9 @@
-             return true;
-         }
-     }
--    if(m_halManager.call("FindDeviceByCapability", "keyboard_backlight").arguments().at(0).toStringList().contains(device))
-+
-+    reply = m_halManager.call("FindDeviceByCapability", "keyboard_backlight");
-+    if(reply.isValid() && reply.value().contains(device))
-     {
-         QDBusInterface propertyInterface("org.freedesktop.Hal", device, "org.freedesktop.Hal.Device", QDBusConnection::systemBus());
-         int levels = propertyInterface.call("GetProperty", "keyboard_backlight.num_levels").arguments().at(0).toInt();