add missing patches

4 files changed, 188 insertions, 10 deletions

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 2ffc57d6c1c0..aa9deb8d70cd 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.1.3-cmake-config.patch 2356 RMD160 14f14e29038735ef105893d53cf1b3771e54ee22 SHA1 e69d8449c52df48408401e62b2acba4a6d60bd7f SHA256 06f7513ebb6d9a0507191f81ddf93f7abd47a4c2a300be22756a16425f9f1904
 AUX 4.2.0-kcatalog.patch 1607 RMD160 a2428826cf1c80686fdb722b017ad4e5cec54089 SHA1 abe3912ace63838a267132b8d5cf95f316c7f7e3 SHA256 85af0df96f19f0d9faab1d6967f8d3736e3480b354ebfb11db5b44ef59041ae6
 AUX 4.2.0-kded.patch 2435 RMD160 66b98f6b532b2b45a4d7539b95088b473a3fe90d SHA1 89a3845b5ca33038cdbaa7a3a4bc2a12eb53bbc9 SHA256 4addbe384870d8ba2bdcb715b7b0fecc9b956201ba87e1c772e939b63e7cd538
@@ -23,9 +20,12 @@ AUX kdelibs-4.0.2-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec
 AUX kdelibs-4.0.3-CVS-2008-1670.patch 739 RMD160 348782a28e75435c4b36548879d2d8d243fc0436 SHA1 c08f374abc2f44cd1ece01881b510ef83241f186 SHA256 41e219e50b652800a2ca892e70baeb40ee6e7cf0f981d098dbdf2ca0926ddf5f
 AUX kdelibs-4.1.1-cmake-modules.patch 2905 RMD160 d7043d4153927ab655c4d7630389024983c6b95a SHA1 9d232044bf51f98656a48092082a5aafcb9d4699 SHA256 8836e0c8267054b2dedcf1c879e57bde67ff83c1b824337dec81d96a3d69754e
 AUX kdelibs-4.1.3-gcc4.1.patch 10046 RMD160 923b2d8d1b88651601d0fababac9251d37e84709 SHA1 86718c9abd5b68494136a83dc2d7bc696cc6612e SHA256 b6779f1bf29272ac160e559ab8315e8f7bad42e4f13a1092284e66849b5cc627
+AUX kdelibs-4.2-fix_kio_http_401.patch 4097 RMD160 3d6c3ed01da4b14ba79db78ffe60a069fc00befc SHA1 b3770ffa5d722c67221f2da83efcde28b33781b0 SHA256 0ce65db99a6f9f556d932fa60af2b681922bc847653b78cfbae0a49ab526844e
+AUX kdelibs-4.2-fixx11h.h.patch 460 RMD160 153e677156f30d2b308c5344b12989be466e9d2c SHA1 da868fc661ce8ec514d70533b7fe6232151eb653 SHA256 307c78bb8a0056b6773380d55429458df9fd2516608077e9437fb1c0592aa7f5
 AUX kdelibs-4.2.1-kcatalog.patch 1653 RMD160 068c80e3818051df6ebe14a333b840545e8e67ff SHA1 2c6015e1f1357029b751187e698457daee3c9b59 SHA256 11951b308bd63ad87ec9e8c77579e8f6afbe87cea6f6cbda23b08809d98bf881
 AUX kdelibs-4.2.1-kdialog.patch 514 RMD160 59db100560e50c9a42bf4857eea900dbcd8b863f SHA1 c36ec0e8df80e82ae2446b1547fcd917cee71253 SHA256 decc2410a66a785a39bc67aba6cab038d98b6659dcb72241f34e3055cd83e1d5
 AUX kdelibs-4.2.1-qt4.5.patch 19805 RMD160 4a266bdbe3d9dcc088f7abbffc2b46714d57208a SHA1 9490015fb83982d0aeac3a1b7918fa4262957782 SHA256 2a3ffd511d25d8a4fc4a8e246e97245a78af7766a33c6baac382568da04dc791
+AUX kdelibs-4.2.2-kickoff-focus.patch 1475 RMD160 08d37ea62d5fedacb205cc61ad551d0d281009c4 SHA1 6dae007ef33f02699c36ab0418b73fb1f3644000 SHA256 4e29c20cebab3b52e495b57ab2296b52c74f86f4023631c214aadb4e6c4032e5
 DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
 DIST kdelibs-3.5-patchset-15.tar.bz2 6707 RMD160 55958374bfc4ba27caf573e13337677c35cbe2c0 SHA1 e0a35642adfcf223ce7490b21af1fa2c3d922b93 SHA256 4a25bc340ce2567ea017456b4aa2292b288779d59d0dd012bd50f5189fe739ec
@@ -48,10 +48,3 @@ EBUILD kdelibs-4.2.1.ebuild 6570 RMD160 63363a2c262f23189f7a63ddf8f20a2915cc76ea
 EBUILD kdelibs-4.2.2.ebuild 7348 RMD160 1d974f8fa70d666831f924a6c605f23e000bf101 SHA1 94e79ccffecb5cfcc1bdc39c9f9b30f81ef1e7d5 SHA256 31ff4a1ad5b257cede89f390c10972791db466da90a552a11966a818de65b95c
 MISC ChangeLog 95797 RMD160 ab53d0c4087e9976a93a5dfd9cc394eec33fb141 SHA1 6385447bb71c285dabf5629e3641bb4cfb7cd165 SHA256 91baf0ae335ebe1b1df41bbcddeef0bb648b9f74b76faad9d0ad62601bc78fd8
 MISC metadata.xml 441 RMD160 e57f70d613371f6611dd4b9836dcc2d782b37dff SHA1 a9ccd73256be801916ce41b1e40269bc094587eb SHA256 e9b96a886144e7453b3cf5f6361e14b2f35a448f24a10c00074ce00c5a179caf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknhHI8ACgkQ5BmOA85PVLhSbACeLRBDPIiTLq5r+8graPMAhslB
-6AkAoK2Ze+UA4t427du0GNKNGR8nnWkd
-=R89N
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..d6734f44dc1c
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.2-fix_kio_http_401.patch
@@ -0,0 +1,132 @@
+--- 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-fixx11h.h.patch b/kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch
new file mode 100644
index 000000000000..0263856e5a4b
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch
@@ -0,0 +1,22 @@
+--- kdeui/util/fixx11h.h	2009/03/04 21:28:02	935354
++++ kdeui/util/fixx11h.h	2009/03/27 14:43:00	945494
+@@ -89,11 +89,16 @@
+ #ifdef Bool
+ #ifndef FIXX11H_Bool
+ #define FIXX11H_Bool
+-typedef Bool XBool;
+-#undef Bool
+-typedef XBool Bool;
++#ifdef _XTYPEDEF_BOOL /* Xdefs.h has typedef'ed Bool already */
++ #undef Bool
++#else
++ typedef Bool XBool;
++ #undef Bool
++ typedef XBool Bool;
++#endif
+ #endif
+ #undef Bool
++#define _XTYPEDEF_BOOL
+ #endif
+ // template <---
+
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
new file mode 100644
index 000000000000..410e9f1bf761
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.2.2-kickoff-focus.patch
@@ -0,0 +1,31 @@
+--- 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);