[kde-base/kdelibs] Clean unneeded patches

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

5 files changed, 0 insertions, 304 deletions

diff --git a/kde-base/kdelibs/files/4.2-glibc-2.10.patch b/kde-base/kdelibs/files/4.2-glibc-2.10.patch
deleted file mode 100644
index e3df97f602c9..000000000000
--- a/kde-base/kdelibs/files/4.2-glibc-2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- branches/KDE/4.2/kdelibs/khtml/misc/loader.cpp	2009/04/30 00:15:25	961360
-+++ branches/KDE/4.2/kdelibs/khtml/misc/loader.cpp	2009/05/05 09:25:07	963699
-@@ -329,7 +329,7 @@
-     if (strncmp(d, "@charset \"",10) == 0)
-     {
-         // the string until "; is the charset name
--        char *p = strchr(d+10, '"');
-+        const char *p = strchr(d+10, '"');
-         if (p == 0) return m_charset;
-         QString charset = QString::fromAscii(d+10, p-(d+10));
- 	return charset;
diff --git a/kde-base/kdelibs/files/4.2-glibc-2.9.patch b/kde-base/kdelibs/files/4.2-glibc-2.9.patch
deleted file mode 100644
index 446a97659a43..000000000000
--- a/kde-base/kdelibs/files/4.2-glibc-2.9.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -uNr kdelibs-4.2.85.orig/ConfigureChecks.cmake kdelibs-4.2.85/ConfigureChecks.cmake
---- kdelibs-4.2.85.orig/ConfigureChecks.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-4.2.85/ConfigureChecks.cmake	2009-05-18 13:38:41.000000000 +0200
-@@ -6,6 +6,7 @@
- include(CheckIncludeFile)
- include(CheckIncludeFiles)
- include(CheckSymbolExists)
-+include(CheckCXXSymbolExists)
- include(CheckFunctionExists)
- include(CheckLibraryExists)
- include(CheckPrototypeExists)
-@@ -232,7 +233,15 @@
- check_function_exists(random     HAVE_RANDOM)            # kdecore/fakes.c
- check_function_exists(strlcpy    HAVE_STRLCPY)           # kdecore/fakes.c
- check_function_exists(strlcat    HAVE_STRLCAT)           # kdecore/fakes.c
--check_function_exists(strcasestr HAVE_STRCASESTR)        # kdecore/fakes.c
-+check_cxx_symbol_exists(__CORRECT_ISO_CPP_STRING_H_PROTO "string.h" HAVE_STRCASESTR_OVERLOAD) # glibc-2.9 strangeness
-+if (HAVE_STRCASESTR_OVERLOAD)
-+  message(STATUS "string.h defines __CORRECT_ISO_CPP_STRING_H_PROTO")
-+  set(HAVE_STRCASESTR 1)
-+  set(HAVE_STRCASESTR_PROTO 1)
-+else()
-+  check_function_exists(strcasestr HAVE_STRCASESTR)        # kdecore/fakes.c
-+  check_prototype_exists(strcasestr string.h          HAVE_STRCASESTR_PROTO)
-+endif()
- check_function_exists(setenv     HAVE_SETENV)            # kdecore/fakes.c
- check_function_exists(seteuid    HAVE_SETEUID)           # kdecore/fakes.c
- check_function_exists(setmntent  HAVE_SETMNTENT)         # solid, kio, kdecore
-@@ -245,7 +254,6 @@
- check_prototype_exists(mkdtemp "stdlib.h;unistd.h"  HAVE_MKDTEMP_PROTO)
- check_prototype_exists(mkstemp "stdlib.h;unistd.h"  HAVE_MKSTEMP_PROTO)
- check_prototype_exists(strlcat string.h             HAVE_STRLCAT_PROTO)
--check_prototype_exists(strcasestr string.h          HAVE_STRCASESTR_PROTO)
- check_prototype_exists(strlcpy string.h             HAVE_STRLCPY_PROTO)
- check_prototype_exists(random stdlib.h              HAVE_RANDOM_PROTO)
- check_prototype_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO)
-diff -uNr kdelibs-4.2.85.orig/cmake/modules/CheckCXXSymbolExists.cmake kdelibs-4.2.85/cmake/modules/CheckCXXSymbolExists.cmake
---- kdelibs-4.2.85.orig/cmake/modules/CheckCXXSymbolExists.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-4.2.85/cmake/modules/CheckCXXSymbolExists.cmake	2009-05-18 13:38:41.000000000 +0200
-@@ -0,0 +1,71 @@
-+# - Check if the symbol exists in include files, in C++ mode
-+# Forked off cmake's CheckSymbolExists.cmake
-+# CHECK_CXX_SYMBOL_EXISTS(SYMBOL FILES VARIABLE)
-+#
-+#  SYMBOL   - symbol
-+#  FILES    - include files to check
-+#  VARIABLE - variable to return result
-+#
-+# The following variables may be set before calling this macro to
-+# modify the way the check is run:
-+#
-+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
-+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-+#  CMAKE_REQUIRED_INCLUDES = list of include directories
-+#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
-+
-+MACRO(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
-+  IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
-+    SET(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
-+    SET(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
-+    IF(CMAKE_REQUIRED_LIBRARIES)
-+      SET(CHECK_SYMBOL_EXISTS_LIBS 
-+        "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
-+    ELSE(CMAKE_REQUIRED_LIBRARIES)
-+      SET(CHECK_SYMBOL_EXISTS_LIBS)
-+    ENDIF(CMAKE_REQUIRED_LIBRARIES)
-+    IF(CMAKE_REQUIRED_INCLUDES)
-+      SET(CMAKE_SYMBOL_EXISTS_INCLUDES
-+        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
-+    ELSE(CMAKE_REQUIRED_INCLUDES)
-+      SET(CMAKE_SYMBOL_EXISTS_INCLUDES)
-+    ENDIF(CMAKE_REQUIRED_INCLUDES)
-+    FOREACH(FILE ${FILES})
-+      SET(CMAKE_CONFIGURABLE_FILE_CONTENT
-+        "${CMAKE_CONFIGURABLE_FILE_CONTENT}#include <${FILE}>\n")
-+    ENDFOREACH(FILE)
-+    SET(CMAKE_CONFIGURABLE_FILE_CONTENT
-+      "${CMAKE_CONFIGURABLE_FILE_CONTENT}\nvoid cmakeRequireSymbol(int dummy,...){(void)dummy;}\nint main()\n{\n#ifndef ${SYMBOL}\n  cmakeRequireSymbol(0,&${SYMBOL});\n#endif\n  return 0;\n}\n")
-+
-+    CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
-+      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" @ONLY)
-+
-+    MESSAGE(STATUS "Looking for ${SYMBOL}")
-+    TRY_COMPILE(${VARIABLE}
-+      ${CMAKE_BINARY_DIR}
-+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx
-+      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
-+      CMAKE_FLAGS 
-+      -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_SYMBOL_EXISTS_FLAGS}
-+      "${CHECK_SYMBOL_EXISTS_LIBS}"
-+      "${CMAKE_SYMBOL_EXISTS_INCLUDES}"
-+      OUTPUT_VARIABLE OUTPUT)
-+    IF(${VARIABLE})
-+      MESSAGE(STATUS "Looking for ${SYMBOL} - found")
-+      SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}")
-+      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log 
-+        "Determining if the ${SYMBOL} "
-+        "exist passed with the following output:\n"
-+        "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n"
-+        "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
-+    ELSE(${VARIABLE})
-+      MESSAGE(STATUS "Looking for ${SYMBOL} - not found.")
-+      SET(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}")
-+      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log 
-+        "Determining if the ${SYMBOL} "
-+        "exist failed with the following output:\n"
-+        "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n"
-+        "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
-+    ENDIF(${VARIABLE})
-+  ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
-+ENDMACRO(CHECK_CXX_SYMBOL_EXISTS)
diff --git a/kde-base/kdelibs/files/kdelibs-4.2-fix_kio_http_401.patch b/kde-base/kdelibs/files/kdelibs-4.2-fix_kio_http_401.patch
deleted file mode 100644
index d6734f44dc1c..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.2-fix_kio_http_401.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- trunk/KDE/kdelibs/kioslave/http/http.cpp	2009/04/06 10:06:09	949947
-+++ trunk/KDE/kdelibs/kioslave/http/http.cpp	2009/04/06 10:07:06	949948
-@@ -229,16 +229,12 @@
- }
- 
- 
--
--
--
--
--#define NO_SIZE		((KIO::filesize_t) -1)
-+#define NO_SIZE ((KIO::filesize_t) -1)
- 
- #ifdef HAVE_STRTOLL
--#define STRTOLL	strtoll
-+#define STRTOLL strtoll
- #else
--#define STRTOLL	strtol
-+#define STRTOLL strtol
- #endif
- 
- 
-@@ -259,6 +255,7 @@
-     , m_proxyAuth(0)
-     , m_socketProxyAuth(0)
-     , m_isError(false)
-+    , m_isLoadingErrorPage(false)
-     , m_remoteRespTimeout(DEFAULT_RESPONSE_TIMEOUT)
- {
-     reparseConfiguration();
-@@ -292,6 +296,7 @@
- {
-   m_isEOF = false;
-   m_isError = false;
-+  m_isLoadingErrorPage = false;
- }
- 
- void HTTPProtocol::resetResponseParsing()
-@@ -575,8 +573,11 @@
-               m_server.initFrom(m_request);
-           }
-           break;
--      } else if (m_isError) {
--          // Hard error, abort everything.
-+      } else if (m_isError || m_isLoadingErrorPage) {
-+          // Unrecoverable error, abort everything.
-+          // Also, if we've just loaded an error page there is nothing more to do.
-+          // In that case we abort to avoid loops; some webservers manage to send 401 and
-+          // no authentication request. Or an auth request we don't understand.
-           return false;
-       }
- 
-@@ -1728,6 +1729,15 @@
-   error( ERR_SLAVE_DEFINED, errorString );
- }
- 
-+void HTTPProtocol::setLoadingErrorPage()
-+{
-+    if (m_isLoadingErrorPage) {
-+        kWarning(7113) << "called twice during one request, something is probably wrong.";
-+    }
-+    m_isLoadingErrorPage = true;
-+    SlaveBase::errorPage();
-+}
-+
- bool HTTPProtocol::isOffline(const KUrl &url)
- {
-   const int NetWorkStatusUnknown = 1;
-@@ -2720,7 +2730,7 @@
-             ; // Ignore error
-         } else {
-             if (m_request.preferErrorPage) {
--                errorPage();
-+                setLoadingErrorPage();
-             } else {
-                 error(ERR_INTERNAL_SERVER, m_request.url.url());
-                 return false;
-@@ -2743,7 +2753,7 @@
-         // Any other client errors
-         // Tell that we will only get an error page here.
-         if (m_request.preferErrorPage) {
--            errorPage();
-+            setLoadingErrorPage();
-         } else {
-             error(ERR_DOES_NOT_EXIST, m_request.url.url());
-             return false;
-@@ -3303,14 +3313,14 @@
-         kDebug(7113) << "pointer to auth class is now" << *auth;
-         if (!(*auth)) {
-             if (m_request.preferErrorPage) {
--                errorPage();
-+                setLoadingErrorPage();
-             } else {
-                 error(ERR_UNSUPPORTED_ACTION, "Unknown Authorization method!");
-                 return false;
-             }
-         }
- 
--        // auth may still be null due to errorPage().
-+        // *auth may still be null due to setLoadingErrorPage().
- 
-         if (*auth) {
-             // remove trailing space from the method string, or digest auth will fail
-@@ -3357,7 +3367,7 @@
- 
-             if ((*auth)->isError()) {
-                 if (m_request.preferErrorPage) {
--                    errorPage();
-+                    setLoadingErrorPage();
-                 } else {
-                     error(ERR_UNSUPPORTED_ACTION, "Authorization failed!");
-                     return false;
-
---- trunk/KDE/kdelibs/kioslave/http/http.h	2009/04/06 10:06:09	949947
-+++ trunk/KDE/kdelibs/kioslave/http/http.h	2009/04/06 10:07:06	949948
-@@ -259,6 +259,7 @@
-   void cacheUpdate( const KUrl &url, bool nocache, time_t expireDate);
- 
-   void httpError(); // Generate error message based on response code
-+  void setLoadingErrorPage(); // Call SlaveBase::errorPage() and remember that we've called it
- 
-   bool isOffline(const KUrl &url); // Check network status
- 
-@@ -523,6 +524,8 @@
- 
-   // Indicates whether there was some connection error.
-   bool m_isError;
-+  // Whether we are loading an error page (we should close the connection afterwards)
-+  bool m_isLoadingErrorPage;
- 
-   // Values that determine the remote connection timeouts.
-   int m_remoteRespTimeout;
diff --git a/kde-base/kdelibs/files/kdelibs-4.2.2-kickoff-focus.patch b/kde-base/kdelibs/files/kdelibs-4.2.2-kickoff-focus.patch
deleted file mode 100644
index 410e9f1bf761..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.2.2-kickoff-focus.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- plasma/popupapplet.cpp	2009-04-09 15:15:12.000000000 +0200
-+++ plasma/popupapplet.cpp	2009-04-09 16:59:39.000000000 +0200
-@@ -275,11 +275,11 @@
-                 //stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can
-                 //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
-                 //else.
--                //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
--                Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
-+                Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
- 
-                 if (passive) {
--                    wflags |= Qt::X11BypassWindowManagerHint;
-+                    //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
-+                    wflags |= Qt::Tool | Qt::X11BypassWindowManagerHint;
-                 }
- 
-                 dialog->setWindowFlags(wflags);
-@@ -413,10 +413,11 @@
-     if (d->dialog) {
-         Qt::WindowFlags wflags = d->dialog->windowFlags();
- 
-+        Qt::WindowFlags passiveFlags = Qt::Tool | Qt::X11BypassWindowManagerHint;
-         if (d->passive) {
--            wflags |= Qt::X11BypassWindowManagerHint;
-+            wflags |= passiveFlags;
-         } else {
--            wflags &= ~Qt::X11BypassWindowManagerHint;
-+            wflags &= ~passiveFlags;
-         }
- 
-         d->dialog->setWindowFlags(wflags);
diff --git a/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch b/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch
deleted file mode 100644
index d9d0e2519cf0..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- trunk/KDE/kdelibs/solid/solid/backends/hal/halbattery.cpp	2009/03/31 03:29:32	947130
-+++ trunk/KDE/kdelibs/solid/solid/backends/hal/halbattery.cpp	2009/03/31 03:58:04	947131
-@@ -112,12 +112,14 @@
-     {
-         emit chargePercentChanged(chargePercent(), m_device->udi());
-     }
--    else if (changes.contains("battery.rechargeable.is_charging")
-+
-+    if (changes.contains("battery.rechargeable.is_charging")
-            || changes.contains("battery.rechargeable.is_discharging"))
-     {
-         emit chargeStateChanged(chargeState(), m_device->udi());
-     }
--    else if ( changes.contains( "battery.present" ) )
-+
-+    if ( changes.contains( "battery.present" ) )
-     {
-         emit plugStateChanged(isPlugged(), m_device->udi());
-     }