[kdebase-workspace] fix patch
Lukas Tinkl
ltinkl at fedoraproject.org
Sat Dec 4 16:41:52 UTC 2010
commit ae7d594660346497b085057e165f84278c7b1b81
Author: Lukas Tinkl <lukas at kde.org>
Date: Sat Dec 4 17:41:27 2010 +0100
fix patch
kdebase-workspace-4.5.85-no_HAL2.patch | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/kdebase-workspace-4.5.85-no_HAL2.patch b/kdebase-workspace-4.5.85-no_HAL2.patch
index c6c50a7..0290bdc 100644
--- a/kdebase-workspace-4.5.85-no_HAL2.patch
+++ b/kdebase-workspace-4.5.85-no_HAL2.patch
@@ -1,7 +1,6 @@
-Index: powerdevil/daemon/powerdevilbackendloader.cpp
-===================================================================
---- powerdevil/daemon/powerdevilbackendloader.cpp (revision 1203571)
-+++ powerdevil/daemon/powerdevilbackendloader.cpp (working copy)
+diff -ur kdebase-workspace-orig/powerdevil/daemon/powerdevilbackendloader.cpp kdebase-workspace-4.5.85/powerdevil/daemon/powerdevilbackendloader.cpp
+--- powerdevil/daemon/powerdevilbackendloader.cpp 2010-11-25 18:40:32.000000000 +0100
++++ powerdevil/daemon/powerdevilbackendloader.cpp 2010-12-04 17:39:44.807938705 +0100
@@ -21,7 +21,7 @@
#include "powerdevilbackendloader.h"
@@ -9,21 +8,25 @@ Index: powerdevil/daemon/powerdevilbackendloader.cpp
-#include "backends/hal/powerdevilhalbackend.h"
+//#include "backends/hal/powerdevilhalbackend.h"
- #include <KDebug>
-
-@@ -42,6 +42,7 @@
- kDebug() << "Failed!";
- interface->deleteLater();
+ namespace PowerDevil {
+ namespace BackendLoader {
+@@ -35,6 +35,7 @@
+ return interface;
+ }
+#if 0
// If we are here, try HAL
- kDebug() << "Loading HAL backend...";
+ interface->deleteLater();
interface = new PowerDevilHALBackend(parent);
-@@ -53,6 +54,7 @@
+@@ -44,9 +45,10 @@
+
// Fail...
- kDebug() << "Failed!";
interface->deleteLater();
+#endif
++
return 0;
}
+ }
+ }
+-
More information about the scm-commits
mailing list