Clean up FILESDIR.

Package-Manager: portage-2.1.4.4
RepoMan-Options: --force

19 files changed, 23 insertions, 908 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 8a00f407a66c..53d0d0ad4618 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.514 2008/02/27 12:05:20 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.515 2008/02/27 12:16:17 ingmar Exp $
+
+  27 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/kdelibs-3.5.5-CVE-2007-0537.patch,
+  -files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff,
+  -files/kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch,
+  -files/kdelibs-3.5.5-khtml.patch, -files/kdelibs-3.5.5-noarts.patch,
+  -files/kdelibs-3.5.5-noarts-2.patch,
+  -files/kdelibs-3.5.5-vulnerability-20070305.diff,
+  -files/kdelibs-3.5.6-khtml-kde-bug-140768.patch,
+  -files/kdelibs-3.5.6-kjs-xss.diff, -files/kdelibs-3.5.6-utf8-fix.diff,
+  -files/konqueror-3.5.7-185603-spoofing.diff,
+  -files/kdelibs-3.5.7-html-style.patch,
+  -files/kdelibs-3.5.7-kcookiejar.diff,
+  -files/kdelibs-4.0.0-X11-optional.patch,
+  -files/kdelibs-4.0.0-alsa-optional.patch,
+  -files/kdelibs-4.0.0-flac-1.1.3.patch,
+  -files/CVE-2007-1564-kdelibs-3.5.6.diff:
+  Clean up FILESDIR.
 
   27 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kdelibs-3.5.9.ebuild:
   Use a SLOT dependency.
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 2b86e0950d62..095486ae0dbe 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,27 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX CVE-2007-1564-kdelibs-3.5.6.diff 2835 RMD160 894a9c5f51da21022b9448da957893a57384c065 SHA1 a296f0dff11007f835bdbca23b259ad8483aa4c9 SHA256 2def5a86817220df9c701d9ad22059c9ef884273a44fee3e12d7b269d8b8e52c
 AUX FindXine.cmake 2627 RMD160 e680a4c0998dd0354e429c9e755a00e0ab83c6c0 SHA1 e638a8cf1ab6889c5734cd54879dad808a549d92 SHA256 73c7030144d889d1065fc4bdaf9c640cb04ce40a9a15b8fafeeefbdf1c35e798
 AUX e-tempdir.patch 1413 RMD160 f0a369f929c18770d66a54b605dad8c99d03367c SHA1 779714956d94366a3b05514df19e21b4b3434f5c SHA256 1a7e888cd5173b68039717030119e3ab479675fed8f9df4b5e1d98869d89235a
-AUX kdelibs-3.5.5-CVE-2007-0537.patch 1232 RMD160 a15192ccbbb27c323de2188b2a5a945c253b53ac SHA1 4c7f05af310bda28f97117e72b08ebb18a36252b SHA256 f83289c67c66de5d6afe78d1149d2f28514d0ce26841c36a67efdd1d2f7f451d
-AUX kdelibs-3.5.5-kate-cstyle-indenter-fix.diff 1544 RMD160 cb5fea95022dd92b448a8bf2b8e7ea49e9f3225d SHA1 5689ec3ca0c562663bc64b4458dcd1eafade8a38 SHA256 b4364d77149ef699b7724c1102a08a0240df5e19c2b0b1202459b8f97cf8268b
-AUX kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch 936 RMD160 0fe9c0da715f82ffec5234bca842e40e5b60bde0 SHA1 7207af706d8bce0e3b1b9626ef8d6f8ca02e60ca SHA256 584a9eeb447c745940acffe725c52e63e98f4ead19476b395c63516d9409bdb6
-AUX kdelibs-3.5.5-khtml.patch 727 RMD160 a0561d99c25b734c5d1d807598640c3805c4cb7b SHA1 388efae927604bb6ae239280117ec0d9d3574f4e SHA256 47f05ea61ccf773c6beb3e902330bfed05fd11f63aae6d38c1145ee6b5057d59
-AUX kdelibs-3.5.5-noarts-2.patch 1686 RMD160 d4585c288a4f0e13f1dd1ace2bb06299fc4866d0 SHA1 eb0ed2976487de6c7397c335368dfc618c547d12 SHA256 5acb44b260619eeedc8ceb07b9cb2bd607b04a9db74c07d7e48cc8ad7fd6483b
-AUX kdelibs-3.5.5-noarts.patch 5474 RMD160 cab567315dbe7b18ccbf9718c98ab2d93786f1d7 SHA1 49a68721a27dfbf66a205e0608458bf4b5ddd788 SHA256 baf1ea16eed48f8a64e0ee25408161b130981e93f0fee718bb7cf71513a64420
-AUX kdelibs-3.5.5-vulnerability-20070305.diff 1590 RMD160 32066ef9f9538171bc30c85f0241e88ca2b6f1f7 SHA1 61b14a6df19957f474a074350e9ed53defd4e66f SHA256 40121f52202a5882ab9e9ba64d6eae945cf81c8452d30c5aa663408c2ce5e8a0
-AUX kdelibs-3.5.6-khtml-kde-bug-140768.patch 1211 RMD160 5215d567765b871dd06af23cce293860fd8c2446 SHA1 91038c4218ce8af4bcc4f2135123bc531365bbfe SHA256 cf4033eccf1bd85ca6a32e8c894d418e743c02f35f30030e23dd9d4aef85cd22
-AUX kdelibs-3.5.6-kjs-xss.diff 1339 RMD160 8dc78056fadc29ac324eb6daec27cf06a3f33a64 SHA1 37d9b04ece1b72c6e4bc44ccefc0a63b9fb518a4 SHA256 124ba2baf644585a7f348e232ff7f7b13949b5948bf7ce3cc6f3af220d3776e8
-AUX kdelibs-3.5.6-utf8-fix.diff 491 RMD160 a5f2a80c518e3953fa46bcf7b5d72a641bfff9dd SHA1 25c6af08c339992eb740cc87277794921e9e8faf SHA256 92cf9f81e41992323645bd5b7b52a9579512b6393f8045291df9ef7e0163c653
-AUX kdelibs-3.5.7-html-style.patch 517 RMD160 99e287e3629e0eb8533ef56006005f3c588460d8 SHA1 67133560101aaefa3132e85577ed351a075aa305 SHA256 f306c01fa0da370ecfec9887e9b8c4828437e4bfbc30c84cf5ff2bc5939a1c18
-AUX kdelibs-3.5.7-kcookiejar.diff 2004 RMD160 aa7c9bb3666554b8a921c4e6ca03a7504cdceaf8 SHA1 049d2c19e73f311626072e89e2c2356a7607188e SHA256 f2bc23b37e37739cd4cbb8e5a661a368eb0a7ffcf862f2990e3c2f5297184d38
-AUX kdelibs-4.0.0-X11-optional.patch 6103 RMD160 ff7c315d65204253cc3ed2fa90e45b5dbef709d8 SHA1 2093a73b17246d39b0518a8ccb1162caed263aee SHA256 398bde6b24e7fb3bf7325ef1f4409f02839baee52ac20bb041f623acd1900b5e
-AUX kdelibs-4.0.0-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec29acd3878f SHA1 53a3d7658ca700a7e8b642e7f66b69b8d25774c8 SHA256 b9107dd43916c015a9392ada81bdfebeff91d2c136eeaa01fb1c89ddd89fd914
-AUX kdelibs-4.0.0-flac-1.1.3.patch 1465 RMD160 45c12cbce55bca381929611396449cd7882b5117 SHA1 ffdca39f3eb7932ccaf2263ee2f8ba7a2f15bedc SHA256 b6d5ed0fe25a0d12bd250ec85400982d0f881f5daba0b5a7677dfeaa01137b38
 AUX kdelibs-4.0.1-X11-optional.patch 6103 RMD160 ff7c315d65204253cc3ed2fa90e45b5dbef709d8 SHA1 2093a73b17246d39b0518a8ccb1162caed263aee SHA256 398bde6b24e7fb3bf7325ef1f4409f02839baee52ac20bb041f623acd1900b5e
 AUX kdelibs-4.0.1-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec29acd3878f SHA1 53a3d7658ca700a7e8b642e7f66b69b8d25774c8 SHA256 b9107dd43916c015a9392ada81bdfebeff91d2c136eeaa01fb1c89ddd89fd914
-AUX konqueror-3.5.7-185603-spoofing.diff 1099 RMD160 4c870aa06611163ebcd57a1a0857f9decbbe5620 SHA1 de60f5f62aceb5faf522e22c5fa160bf08e80fe3 SHA256 bc74315716148b4b088de127ff3586680698ced775c3fe5792597f09e8f732d6
 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
 DIST kdelibs-3.5.8-seli-xinerama.patch.bz2 5230 RMD160 26efc6620d176414b3b771145a7c00db11c3df6b SHA1 4f4daaa60fbf0c3c582400f33833b9d73c26af4a SHA256 389a31d7e3f44eca5984842d66fa19a8a9f6f11fd6dac134cfd1e4d24e7fb174
 DIST kdelibs-3.5.8.tar.bz2 15557343 RMD160 e3524ca8613fca338a0530213e921fbfae56e866 SHA1 b524a5d9969e7319bb5ffb926a39fd6afb39b2ed SHA256 779f563fdf0385b973f2238f04d82b5729aefe1c949e4d29482b6bb170aa3fe6
@@ -30,12 +13,12 @@ DIST kdelibs-4.0.1.tar.bz2 9061224 RMD160 d447a38d60de9dc1229c3be27274f35c389ec0
 EBUILD kdelibs-3.5.8-r3.ebuild 6010 RMD160 df84ce126867707d20b83ceeeb09c7fb4f93f343 SHA1 b1eba517036ed63b3b7fb79a3be75f9614948559 SHA256 a97299fa3ce88eaa230a01f3c7b5bf19dd2547a0d56dcd73218b923675f654dc
 EBUILD kdelibs-3.5.9.ebuild 6033 RMD160 518e1531019e620fd397239a311c3f2698fdec11 SHA1 c35fd0c2d2104ab55e5ea4cb0eec101636dc2e82 SHA256 5dd9a94d6a420184cdd2fa2731941e211dfdf8d487b43b47dd4669492998514c
 EBUILD kdelibs-4.0.1-r1.ebuild 6089 RMD160 8ca142125e560192f62f96b2fe270dd8f6308b66 SHA1 bc940d6df17c4844d6307d1b3814ca8e726c6bf1 SHA256 db51acc85988791d234272e0bec338966ab3173cd9a93fc2ed5609a4d57d185a
-MISC ChangeLog 83635 RMD160 0b603e2165780c5678b3c61f6cd4814ead109e48 SHA1 2633b3a4bf73924bf3b59f4b57e8f1a1c46c432e SHA256 890c0abf77b5d59c1ace19fea21de3adb2b9b18283062ef6deb7081196014a6b
+MISC ChangeLog 84449 RMD160 e472baf7718c71575d03c6c1636168a4601fe988 SHA1 4a0490446cbdb841a939370ba58e4f99df2ac971 SHA256 b94de81cc3d11d694b1021e8465337fc12cb5ed6ae87312649b4dacc5c2aa636
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHxVGrB18eXLOpYdkRAiwRAKChTe0nairO5hC+3STkeUAVI+wzOgCeOX8I
-amDsm+0pteL+cWtjA9tX4SU=
-=+pjj
+iD8DBQFHxVQ8B18eXLOpYdkRAinaAJ9SRkeVd6iSt4r52iBKLtOfy++XSACfTkXE
+nUdtSh+/mAxS6mnCBol5yes=
+=ureK
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/CVE-2007-1564-kdelibs-3.5.6.diff b/kde-base/kdelibs/files/CVE-2007-1564-kdelibs-3.5.6.diff
deleted file mode 100644
index b026d67a3db0..000000000000
--- a/kde-base/kdelibs/files/CVE-2007-1564-kdelibs-3.5.6.diff
+++ /dev/null
@@ -1,81 +0,0 @@
---- khtml/ecma/kjs_html.cpp
-+++ khtml/ecma/kjs_html.cpp
-@@ -1866,9 +1866,11 @@ Value KJS::HTMLElement::getValueProperty
- 				      getDOMNode(exec, frameElement.contentDocument()) : Undefined();
-     case FrameContentWindow:   {
-         KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart();
--        if (part)
--            return Value(Window::retrieveWindow(part));
--        else
-+        if (part) {
-+          Window *w = Window::retrieveWindow(part);
-+          if (w)
-+            return Value(w);
-+        }
-             return Undefined();
-     }
-     case FrameFrameBorder:     return String(frameElement.frameBorder());
-@@ -1899,9 +1901,11 @@ Value KJS::HTMLElement::getValueProperty
- 				       getDOMNode(exec, iFrame.contentDocument()) : Undefined();
-     case IFrameContentWindow:       {
-         KHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart();
--        if (part)
--            return Value(Window::retrieveWindow(part));
--        else
-+        if (part) {
-+          Window *w = Window::retrieveWindow(part);
-+          if (w)
-+            return Value(w);
-+        }
-             return Undefined();
-     }
-     case IFrameFrameBorder:     return String(iFrame.frameBorder());
---- kioslave/ftp/ftp.cc
-+++ kioslave/ftp/ftp.cc
-@@ -58,6 +58,7 @@
- #include <kmimemagic.h>
- #include <kmimetype.h>
- #include <ksockaddr.h>
-+#include <ksocketaddress.h>
- #include <kio/ioslave_defaults.h>
- #include <kio/slaveconfig.h>
- #include <kremoteencoding.h>
-@@ -835,7 +836,6 @@ bool Ftp::ftpSendCmd( const QCString& cm
-   return true;
- }
- 
--
- /*
-  * ftpOpenPASVDataConnection - set up data connection, using PASV mode
-  *
-@@ -853,6 +853,8 @@ int Ftp::ftpOpenPASVDataConnection()
-   if (sa != NULL && sa->family() != PF_INET)
-     return ERR_INTERNAL;       // no PASV for non-PF_INET connections
- 
-+  const KInetSocketAddress *sin = static_cast<const KInetSocketAddress*>(sa);
-+
-   if (m_extControl & pasvUnknown)
-     return ERR_INTERNAL;       // already tried and got "unknown command"
- 
-@@ -886,14 +888,17 @@ int Ftp::ftpOpenPASVDataConnection()
-   }
- 
-   // Make hostname and port number ...
--  QString host;
--  host.sprintf("%d.%d.%d.%d", i[0], i[1], i[2], i[3]);
-   int port = i[4] << 8 | i[5];
- 
-+  // we ignore the host part on purpose for two reasons
-+  // a) it might be wrong anyway
-+  // b) it would make us being suceptible to a port scanning attack
-+
-   // now connect the data socket ...
-   m_data = new FtpSocket("PASV");
--  m_data->setAddress(host, port);
--  kdDebug(7102) << "Connecting to " << host << " on port " << port << endl;
-+  m_data->setAddress(sin->nodeName(), port);
-+
-+  kdDebug(7102) << "Connecting to " << sin->nodeName() << " on port " << port << endl;
-   return m_data->connectSocket(connectTimeout(), false);
- }
- 
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.5-CVE-2007-0537.patch b/kde-base/kdelibs/files/kdelibs-3.5.5-CVE-2007-0537.patch
deleted file mode 100644
index c6332ee01e43..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.5-CVE-2007-0537.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: kdelibs/khtml/html/htmltokenizer.cpp
-===================================================================
---- kdelibs/khtml/html/htmltokenizer.cpp	(revision 626790)
-+++ kdelibs/khtml/html/htmltokenizer.cpp	(revision 626791)
-@@ -316,7 +316,7 @@
-     while ( !src.isEmpty() ) {
-         checkScriptBuffer();
-         unsigned char ch = src->latin1();
--        if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && !title && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
-+        if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
-             comment = true;
-             scriptCode[ scriptCodeSize++ ] = ch;
-             ++src;
-@@ -495,7 +495,7 @@
- 
-             if (canClose || handleBrokenComments || scriptEnd ){
-                 ++src;
--                if ( !( script || xmp || textarea || style) ) {
-+                if ( !( title || script || xmp || textarea || style) ) {
- #ifdef COMMENTS_IN_DOM
-                     checkScriptBuffer();
-                     scriptCode[ scriptCodeSize ] = 0;
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff b/kde-base/kdelibs/files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff
deleted file mode 100644
index c7697a9ad8d4..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -U 4 -H -b -w -B -E -d -i -r kdelibs-3.5.5-orig/kate/part/kateautoindent.cpp kdelibs-3.5.5/kate/part/kateautoindent.cpp
---- kdelibs-3.5.5-orig/kate/part/kateautoindent.cpp	2006-10-11 11:44:37.000000000 +0200
-+++ kdelibs-3.5.5/kate/part/kateautoindent.cpp	2006-10-11 11:47:38.000000000 +0200
-@@ -713,8 +713,9 @@
-   int anchorPos = 0;
-   int parenCount = 0;  // Possibly in a multiline for stmt.  Used to skip ';' ...
-   bool found = false;
-   bool isSpecial = false;
-+  bool potentialAnchorSeen = false;
- 
-   //kdDebug(13030) << "calcIndent begin line:" << begin.line() << " col:" << begin.col() << endl;
- 
-   // Find Indent Anchor Point
-@@ -732,18 +733,18 @@
-       if (textLine->attribute(pos) == symbolAttrib)
-       {
-         QChar tc = textLine->getChar (pos);
-         if ((tc == ';' || tc == ':' || tc == ',') && otherAnchor == -1 && parenCount <= 0)
--          otherAnchor = pos;
-+          otherAnchor = pos, potentialAnchorSeen = true;
-         else if (tc == ')')
-           parenCount++;
-         else if (tc == '(')
-           parenCount--;
-         else if (tc == '}')
-           openCount--;
-         else if (tc == '{')
-         {
--          openCount++;
-+          openCount++, potentialAnchorSeen = true;
-           if (openCount == 1)
-             break;
-         }
-       }
-@@ -825,9 +826,9 @@
-     }
-   }
- 
-   // treat beginning of document as anchor position
--  if (cur.line() == 0 && cur.col() == 0)
-+  if (cur.line() == 0 && cur.col() == 0 && potentialAnchorSeen)
-     found = true;
- 
-   if (!found)
-     return 0;
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch b/kde-base/kdelibs/files/kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch
deleted file mode 100644
index 976c823ff202..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdelibs-3.5.5/kdeprint/cups/kmcupsmanager.cpp	2006/09/20 15:38:41	586782
-+++ kdelibs-3.5.5/kdeprint/cups/kmcupsmanager.cpp	2006/10/10 12:34:30	594190
-@@ -920,7 +920,7 @@
- 	kdDebug(500) << "Checking for update possible" << endl;
- 	delete m_socket;
-         m_socket = new KNetwork::KBufferedSocket;
--	m_socket->setTimeout( 1 );
-+	m_socket->setTimeout( 1500 );
- 	connect( m_socket, SIGNAL( connected(const KResolverEntry&) ), 
-                 SLOT( slotConnectionSuccess() ) );
- 	connect( m_socket, SIGNAL( gotError( int ) ), SLOT( slotConnectionFailed( int ) ) );
-@@ -958,7 +958,7 @@
- 
- void KMCupsManager::slotAsyncConnect()
- {
--	kdDebug(500) << "Starting async connect" << endl;
-+	kdDebug(500) << "Starting async connect to " << CupsInfos::self()->hostaddr() << endl;
- 	//m_socket->startAsyncConnect();
-         if (CupsInfos::self()->host().startsWith("/"))
-             m_socket->connect( QString(), CupsInfos::self()->host());
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.5-khtml.patch b/kde-base/kdelibs/files/kdelibs-3.5.5-khtml.patch
deleted file mode 100644
index 4b9ddfca81c1..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.5-khtml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: khtml/rendering/render_block.cpp
-===================================================================
---- khtml/rendering/render_block.cpp	(revision 595831)
-+++ khtml/rendering/render_block.cpp	(revision 595832)
-@@ -711,7 +711,7 @@
-     int toAdd = borderBottom() + paddingBottom();
-     if (m_layer && style()->scrollsOverflow() && style()->height().isVariable())
-         toAdd += m_layer->horizontalScrollbarHeight();
--    if ( hasOverhangingFloats() && !style()->scrollsOverflow() && (isFloatingOrPositioned() || flowAroundFloats()) )
-+    if ( hasOverhangingFloats() && (isFloatingOrPositioned() || flowAroundFloats()) )
-         m_overflowHeight = m_height = floatBottom() + toAdd;
- 
-     int oldHeight = m_height;
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.5-noarts-2.patch b/kde-base/kdelibs/files/kdelibs-3.5.5-noarts-2.patch
deleted file mode 100644
index dd94d9b7135e..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.5-noarts-2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: kdelibs-3.5.5/arts/configure.in.in
-===================================================================
---- kdelibs-3.5.5.orig/arts/configure.in.in
-+++ kdelibs-3.5.5/arts/configure.in.in
-@@ -22,7 +22,6 @@ AC_MSG_CHECKING(for aRts-$ARTS_WANT_VERS
- ARTS_OK=no
- 
- if test "$build_arts" != "yes"; then
--  DO_NOT_COMPILE="$DO_NOT_COMPILE arts"
-   AC_MSG_RESULT(disabled)
- else
- 
-Index: kdelibs-3.5.5/arts/knotify/Makefile.am
-===================================================================
---- kdelibs-3.5.5.orig/arts/knotify/Makefile.am
-+++ kdelibs-3.5.5/arts/knotify/Makefile.am
-@@ -6,7 +6,9 @@ INCLUDES= -I$(top_srcdir)/arts/kde -I$(i
- kde_module_LTLIBRARIES = knotify.la
- 
- knotify_la_SOURCES	= knotify.cpp knotify.skel
-+if include_ARTS
- knotify_la_LIBADD	= -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(top_builddir)/arts/kde/libartskde.la
-+endif
- knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
- knotify_la_METASOURCES = AUTO
- 
-Index: kdelibs-3.5.5/arts/Makefile.am
-===================================================================
---- kdelibs-3.5.5.orig/arts/Makefile.am
-+++ kdelibs-3.5.5/arts/Makefile.am
-@@ -1,4 +1,8 @@
-+if include_ARTS
- SUBDIRS = kde knotify message
-+else
-+SUBDIRS = knotify
-+endif
- 
- DOXYGEN_REFERENCES = kio kdecore kdeui
- include ../admin/Doxyfile.am
-Index: kdelibs-3.5.5/arts/knotify/knotify.h
-===================================================================
---- kdelibs-3.5.5.orig/arts/knotify/knotify.h
-+++ kdelibs-3.5.5/arts/knotify/knotify.h
-@@ -23,9 +23,6 @@
- #include <qobject.h>
- #include <knotifyclient.h>
- #include <dcopobject.h>
--#ifndef WITHOUT_ARTS
--#include <soundserver.h>
--#endif
- 
- class KNotifyPrivate;
- class KProcess;
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.5-noarts.patch b/kde-base/kdelibs/files/kdelibs-3.5.5-noarts.patch
deleted file mode 100644
index 2c2632459cc9..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.5-noarts.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-Index: arts/knotify/knotify.cpp
-===================================================================
---- arts/knotify/knotify.cpp	(revision 596923)
-+++ arts/knotify/knotify.cpp	(revision 596924)
-@@ -26,24 +26,29 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-+#include <config.h>
-+#ifndef WITHOUT_ARTS
- // aRts headers
- #include <connect.h>
- #include <dispatcher.h>
- #include <flowsystem.h>
-+#include <qiomanager.h>
- #include <soundserver.h>
-+#endif
- 
- // QT headers
- #include <qfile.h>
- #include <qfileinfo.h>
--#include <qiomanager.h>
- #include <qstringlist.h>
- #include <qtextstream.h>
- 
- // KDE headers
- #include <dcopclient.h>
- #include <kaboutdata.h>
-+#ifndef WITHOUT_ARTS
- #include <kartsdispatcher.h>
- #include <kartsserver.h>
-+#endif
- #include <kcmdlineargs.h>
- #include <kconfig.h>
- #include <kdebug.h>
-@@ -53,8 +58,10 @@
- #include <kpassivepopup.h>
- #include <kiconloader.h>
- #include <kmacroexpander.h>
-+#ifndef WITHOUT_ARTS
- #include <kplayobjectfactory.h>
- #include <kaudiomanagerplay.h>
-+#endif
- #include <kprocess.h>
- #include <kstandarddirs.h>
- #include <kuniqueapplication.h>
-@@ -73,22 +80,26 @@
-     QString externalPlayer;
-     KProcess *externalPlayerProc;
- 
-+#ifndef WITHOUT_ARTS
-     QPtrList<KDE::PlayObject> playObjects;
-     QMap<KDE::PlayObject*,int> playObjectEventMap;
-+    KAudioManagerPlay *audioManager;
-+#endif
-     int externalPlayerEventId;
- 
-     bool useExternal;
-     bool useArts;
-     int volume;
-     QTimer *playTimer;
--    KAudioManagerPlay *audioManager;
-     bool inStartup;
-     QString startupEvents;
- };
- 
- // Yes, it's ugly to put this here, but this facilitates the cautious startup
- // procedure.
-+#ifndef WITHOUT_ARTS
- KArtsServer *soundServer = 0;
-+#endif
- 
- extern "C"{
- 
-@@ -124,6 +135,7 @@
-     // We try to prevent this by tracking our startup and offer options to
-     // abort this.
- 
-+#ifndef WITHOUT_ARTS
-     KConfigGroup config( KGlobal::config(), "StartProgress" );
-     KConfig artsKCMConfig( "kcmartsrc" );
-     artsKCMConfig.setGroup( "Arts" );
-@@ -208,14 +220,23 @@
-     config.writeEntry( "KNotify Init", true );
-     config.sync();
- 
-+#else
-+
-+    // start notify service, without aRts
-+    KNotify *notify = new KNotify( false );
-+
-+#endif
-+
-     app.dcopClient()->setDefaultObject( "Notify" );
-     app.dcopClient()->setDaemonMode( true );
-     // kdDebug() << "knotify starting" << endl;
- 
-     int ret = app.exec();
-     delete notify;
-+#ifndef WITHOUT_ARTS
-     delete soundServer;
-     delete dispatcher;
-+#endif
-     return ret;
- }
- }// end extern "C"
-@@ -228,14 +249,16 @@
-     d->globalConfig = new KConfig("knotify.eventsrc", true, false);
-     d->externalPlayerProc = 0;
-     d->useArts = useArts;
-+    d->inStartup = true;
-+#ifndef WITHOUT_ARTS
-     d->playObjects.setAutoDelete(true);
-     d->audioManager = 0;
--    d->inStartup = true;
-     if( useArts )
-     {
-         connect( soundServer, SIGNAL( restartedServer() ), this, SLOT( restartedArtsd() ) );
-         restartedArtsd(); //started allready need to initialize d->audioManager
-     }
-+#endif
- 
-     d->volume = 100;
- 
-@@ -248,12 +271,14 @@
- {
-     reconfigure();
- 
-+#ifndef WITHOUT_ARTS
-     d->playObjects.clear();
- 
-     delete d->globalEvents;
-     delete d->globalConfig;
-     delete d->externalPlayerProc;
-     delete d->audioManager;
-+#endif
-     delete d;
- }
- 
-@@ -449,6 +474,7 @@
-             return false;
-         }
- 
-+#ifndef WITHOUT_ARTS
-         // play sound finally
-         while( d->playObjects.count()>5 )
-             abortFirstPlayObject();
-@@ -506,7 +532,7 @@
-         }
-         if ( !d->playTimer->isActive() )
-             d->playTimer->start( 1000 );
--
-+#endif
-         return true;
- 
-     } else if(!d->externalPlayer.isEmpty()) {
-@@ -661,6 +687,7 @@
- 
- void KNotify::playTimeout()
- {
-+#ifndef WITHOUT_ARTS
-     for ( QPtrListIterator< KDE::PlayObject > it(d->playObjects); *it;)
-     {
-         QPtrListIterator< KDE::PlayObject > current = it;
-@@ -678,16 +705,18 @@
-     }
-     if ( !d->playObjects.count() )
-         d->playTimer->stop();
-+#endif
- }
- 
- bool KNotify::isPlaying( const QString& soundFile ) const
- {
-+#ifndef WITHOUT_ARTS
-     for ( QPtrListIterator< KDE::PlayObject > it(d->playObjects); *it; ++it)
-     {
-         if ( (*it)->mediaName() == soundFile )
-             return true;
-     }
--
-+#endif
-     return false;
- }
- 
-@@ -699,6 +728,7 @@
- 
- void KNotify::abortFirstPlayObject()
- {
-+#ifndef WITHOUT_ARTS
-     QMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
-     if ( it != d->playObjectEventMap.end() )
-     {
-@@ -706,6 +736,7 @@
-         d->playObjectEventMap.remove( it );
-     }
-     d->playObjects.removeFirst();
-+#endif
- }
- 
- void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason )
-@@ -750,10 +781,12 @@
- 
- void KNotify::restartedArtsd()
- {
-+#ifndef WITHOUT_ARTS
-     delete d->audioManager;
-     d->audioManager = new KAudioManagerPlay( soundServer );
-     d->audioManager->setTitle( i18n( "KDE System Notifications" ) );
-     d->audioManager->setAutoRestoreID( "KNotify Aman Play" );
-+#endif
- }
- 
- void KNotify::sessionReady()
-Index: arts/knotify/knotify.h
-===================================================================
---- arts/knotify/knotify.h	(revision 596923)
-+++ arts/knotify/knotify.h	(revision 596924)
-@@ -23,7 +23,9 @@
- #include <qobject.h>
- #include <knotifyclient.h>
- #include <dcopobject.h>
-+#ifndef WITHOUT_ARTS
- #include <soundserver.h>
-+#endif
- 
- class KNotifyPrivate;
- class KProcess;
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.5-vulnerability-20070305.diff b/kde-base/kdelibs/files/kdelibs-3.5.5-vulnerability-20070305.diff
deleted file mode 100644
index 657bd9bdf8fa..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.5-vulnerability-20070305.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur kdelibs-3.5.5.old/khtml/ecma/kjs_html.cpp kdelibs-3.5.5/khtml/ecma/kjs_html.cpp
---- kdelibs-3.5.5.old/khtml/ecma/kjs_html.cpp	2007-03-05 21:59:24.000000000 +0100
-+++ kdelibs-3.5.5/khtml/ecma/kjs_html.cpp	2007-03-05 22:03:35.000000000 +0100
-@@ -1840,10 +1840,12 @@
- 				      getDOMNode(exec, frameElement.contentDocument()) : Undefined();
-     case FrameContentWindow:   {
-         KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart();
--        if (part)
--            return Value(Window::retrieveWindow(part));
--        else
--            return Undefined();
-+        if (part) {
-+          Window *w = Window::retrieveWindow(part);
-+          if (w)
-+            return Value(w);
-+        }
-+        return Undefined();
-     }
-     case FrameFrameBorder:     return String(frameElement.frameBorder());
-     case FrameLongDesc:        return String(frameElement.longDesc());
-@@ -1873,10 +1875,12 @@
- 				       getDOMNode(exec, iFrame.contentDocument()) : Undefined();
-     case IFrameContentWindow:       {
-         KHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart();
--        if (part)
--            return Value(Window::retrieveWindow(part));
--        else
--            return Undefined();
-+        if (part) {
-+          Window *w = Window::retrieveWindow(part);
-+          if (w)
-+            return Value(w);
-+        }
-+        return Undefined();
-     }
-     case IFrameFrameBorder:     return String(iFrame.frameBorder());
-     case IFrameHeight:          return String(iFrame.height());
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.6-khtml-kde-bug-140768.patch b/kde-base/kdelibs/files/kdelibs-3.5.6-khtml-kde-bug-140768.patch
deleted file mode 100644
index e72f6785885e..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.6-khtml-kde-bug-140768.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Leo Savernik <l.savernik@aon.at>
-To: kde-commits@kde.org
-Subject: branches/KDE/3.5/kdelibs/khtml/html
-X-Commit-Directories: (0) branches/KDE/3.5/kdelibs/khtml/html
-MIME-Version: 1.0
-Date: Tue, 30 Jan 2007 17:25:36 +0000
-Message-Id: <1170177936.253127.26374.nullmailer@svn.kde.org>
-Content-Type: text/plain;
-  charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-X-Length: 4145
-X-UID: 241
-
-SVN commit 628618 by savernik:
-
-Reverting r617941. This fixes jumping to the top right before loading a
-new page and also fixes page loading time increase.
-
-Attention packagers! Please include this patch in new versions of your
-khtml-3.5.6 packages. Web surfing experience can be considered broken
-without it.
-
-CCMAIL: kde-packager@kde.org
-BUG: 140768
-CCBUG: 140777    
-CCBUG: 24820
-
-
- M  +1 -1      html_documentimpl.cpp  
-
-
---- branches/KDE/3.5/kdelibs/khtml/html/html_documentimpl.cpp #628617:628618
-@@ -222,7 +222,7 @@
- 
- void HTMLDocumentImpl::slotHistoryChanged()
- {
--    if ( !m_render )
-+    if ( true || !m_render )
-         return;
- 
-     recalcStyle( Force );
-_______________________________________________
-Kde-packager mailing list
-Kde-packager@kde.org
-https://mail.kde.org/mailman/listinfo/kde-packager
-
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.6-kjs-xss.diff b/kde-base/kdelibs/files/kdelibs-3.5.6-kjs-xss.diff
deleted file mode 100644
index ca4456320ee9..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.6-kjs-xss.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-------------------------------------------------------------------------
-r645387 | porten | 2007-03-22 15:01:13 +0100 (Thu, 22 Mar 2007) | 4 lines
-
-substitute some of the invalid sequences with the standard replacement
-char. this matches Mozilla but not IE which leaves them unchanged (or
-throws an exception)
-
-------------------------------------------------------------------------
---- kjs/function.cpp
-+++ kjs/function.cpp
-@@ -244,11 +244,15 @@ UString decodeURI(ExecState *exec, UStri
-       }
- 
-       // UTF-8 transform
-+      const unsigned long replacementChar = 0xFFFD;
-       unsigned long V;
-       if (n == 2) {
- 	unsigned long yyyyy = octets[0] & 0x1F;
- 	unsigned long zzzzzz = octets[1] & 0x3F;
- 	V = (yyyyy << 6) | zzzzzz;
-+	// 2-byte sequence overlong for this value?
-+	if (V < 0xFF)
-+	  V = replacementChar;
- 	C = UChar((unsigned short)V);
-       }
-       else if (n == 3) {
-@@ -256,6 +260,11 @@ UString decodeURI(ExecState *exec, UStri
- 	unsigned long yyyyyy = octets[1] & 0x3F;
- 	unsigned long zzzzzz = octets[2] & 0x3F;
- 	V = (xxxx << 12) | (yyyyyy << 6) | zzzzzz;
-+	// 3-byte sequence overlong for this value,
-+	// an invalid value or UTF-16 surrogate?
-+	if (V < 0x800 || V == 0xFFFE || V == 0xFFFF ||
-+	    (V >= 0xD800 && V <= 0xDFFF))
-+	  V = replacementChar;
- 	C = UChar((unsigned short)V);
-       }
-       else {
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.6-utf8-fix.diff b/kde-base/kdelibs/files/kdelibs-3.5.6-utf8-fix.diff
deleted file mode 100644
index bda03d422a0e..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.6-utf8-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-3.5.6/kdecore/kstringhandler.cpp	2005-10-10 17:06:02.000000000 +0200
-+++ kdelibs-3.5.7/kdecore/kstringhandler.cpp	2007-05-17 09:06:28.000000000 +0200
-@@ -558,7 +558,7 @@
-   QString result;
-   const QChar *unicode = str.unicode();
-   for ( uint i = 0; i < str.length(); ++i )
--    result += ( unicode[ i ].unicode() < 0x20 ) ? unicode[ i ] :
-+    result += ( unicode[ i ].unicode() < 0x21 ) ? unicode[ i ] :
-         QChar( 0x1001F - unicode[ i ].unicode() );
- 
-   return result;
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.7-html-style.patch b/kde-base/kdelibs/files/kdelibs-3.5.7-html-style.patch
deleted file mode 100644
index fe5bc600d701..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.7-html-style.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urNp kdelibs-3.5.7.org/khtml/html/html_elementimpl.cpp kdelibs-3.5.7/khtml/html/html_elementimpl.cpp
---- kdelibs-3.5.7.org/khtml/html/html_elementimpl.cpp	2007-01-15 13:34:00.000000000 +0200
-+++ kdelibs-3.5.7/khtml/html/html_elementimpl.cpp	2007-06-01 21:21:19.000000000 +0300
-@@ -503,7 +503,6 @@ DocumentFragment HTMLElementImpl::create
-         case ID_COLGROUP:
-         case ID_FRAMESET:
-         case ID_HEAD:
--        case ID_STYLE:
-         case ID_TABLE:
-         case ID_TBODY:
-         case ID_TFOOT:
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.7-kcookiejar.diff b/kde-base/kdelibs/files/kdelibs-3.5.7-kcookiejar.diff
deleted file mode 100644
index 5ff4a8da3686..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.7-kcookiejar.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: kcookiejar.cpp
-===================================================================
---- kdelibs-3.5.7.orig/kioslave/http/kcookiejar/kcookiejar.cpp	(revision 707307)
-+++ kdelibs-3.5.7/kioslave/http/kcookiejar/kcookiejar.cpp	(working copy)
-@@ -981,44 +981,27 @@
- //
- KCookieAdvice KCookieJar::cookieAdvice(KHttpCookiePtr cookiePtr)
- {
--    QStringList domains;
--
-     if (m_rejectCrossDomainCookies && cookiePtr->isCrossDomain())
-        return KCookieReject;
- 
--    if (m_autoAcceptSessionCookies && (cookiePtr->expireDate() == 0 ||
--        m_ignoreCookieExpirationDate))
--       return KCookieAccept;
-+    QStringList domains;
- 
-     extractDomains(cookiePtr->host(), domains);
- 
--    // If the cookie specifies a domain, check whether it is valid and
--    // correct otherwise.
-+    // If the cookie specifies a domain, check whether it is valid. Otherwise,
-+    // accept the cookie anyways but removes the domain="" value to prevent
-+    // cross-site cookie injection.
-     if (!cookiePtr->domain().isEmpty())
-     {
--       bool valid = false;
--
--       // This checks whether the cookie is valid based on
--       // what ::extractDomains returns
--       if (!valid)
--       {
--          if (domains.contains(cookiePtr->domain()))
--             valid = true;
--       }
--
--       if (!valid)
--       {
--          // Maybe it points to a sub-domain
--          if (cookiePtr->domain().endsWith("."+cookiePtr->host()))
--             valid = true;
--       }
--
--       if (!valid)
--       {
-+      if (!domains.contains(cookiePtr->domain()) && 
-+          !cookiePtr->domain().endsWith("."+cookiePtr->host()))
-           cookiePtr->fixDomain(QString::null);
--       }
-     }
- 
-+    if (m_autoAcceptSessionCookies && (cookiePtr->expireDate() == 0 ||
-+        m_ignoreCookieExpirationDate))
-+       return KCookieAccept;
-+
-     KCookieAdvice advice = KCookieDunno;
-     bool isFQDN = true; // First is FQDN
-     QStringList::Iterator it = domains.begin(); // Start with FQDN which first in the list.
diff --git a/kde-base/kdelibs/files/kdelibs-4.0.0-X11-optional.patch b/kde-base/kdelibs/files/kdelibs-4.0.0-X11-optional.patch
deleted file mode 100644
index 9a3c680f59b0..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.0.0-X11-optional.patch
+++ /dev/null
@@ -1,102 +0,0 @@
- cmake/modules/FindX11.cmake |   44 +++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 38 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/modules/FindX11.cmake b/cmake/modules/FindX11.cmake
-index 5fdbe82..b56f594 100644
---- a/cmake/modules/FindX11.cmake
-+++ b/cmake/modules/FindX11.cmake
-@@ -39,6 +39,34 @@
- # Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
- # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
- 
-+
-+# Look for an optional X11 package, and provide a cmake switch to disable searching for it.
-+# 
-+# Example usage: FIND_X11(X11_Xinerama X11/extensions/Xinerama.h Xinerama)
-+# which provides: `cmake -DWITH_X11_Xinerama=OFF` to disable the check.
-+#
-+# You need to pass a header _and_ a library, in that order.
-+MACRO (FIND_X11 _name _header _library )
-+   OPTION(WITH_${_name} "Search for X11 package ${_name}" ON)
-+
-+   IF (WITH_${_name})
-+      FIND_PATH(${_name}_INCLUDE_PATH  ${_header}    ${X11_INC_SEARCH_PATH})
-+
-+      FIND_LIBRARY(${_name}_LIB        ${_library}   ${X11_LIB_SEARCH_PATH})
-+
-+      IF (${_name}_INCLUDE_PATH AND ${_name}_LIB)
-+         SET(${_name}_FOUND TRUE)
-+         SET(_temp ${${_name}_INCLUDE_PATH})
-+         SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${_temp})
-+      ENDIF (${_name}_INCLUDE_PATH AND ${_name}_LIB)
-+
-+   ELSE (WITH_${_name})
-+      SET(${_name}_FOUND         FALSE     CACHE  BOOL      "${_name} found")
-+      SET(${_name}_LIB           NOTFOUND  CACHE  FILEPATH  "Path to ${_name} library")
-+      SET(${_name}_INCLUDE_PATH  NOTFOUND  CACHE  PATH      "Path to ${_name}")
-+   ENDIF (WITH_${_name})
-+ENDMACRO (FIND_X11)
-+
- IF (UNIX)
-   SET(X11_FOUND 0)
-   # X11 is never a framework and some header files may be
-@@ -75,7 +103,7 @@ IF (UNIX)
-   FIND_PATH(X11_Xaccessrules_INCLUDE_PATH X11/extensions/XKBrules.h  ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xaccessstr_INCLUDE_PATH X11/extensions/XKBstr.h      ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xau_INCLUDE_PATH X11/Xauth.h                         ${X11_INC_SEARCH_PATH})
--  FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h  ${X11_INC_SEARCH_PATH})
-+  #FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h  ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h           ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h        ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h                       ${X11_INC_SEARCH_PATH})
-@@ -84,7 +112,7 @@ IF (UNIX)
-   FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h    ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h          ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h                       ${X11_INC_SEARCH_PATH})
--  FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h      ${X11_INC_SEARCH_PATH})
-+  #FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h      ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h          ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h                ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xkblib_INCLUDE_PATH X11/XKBlib.h                     ${X11_INC_SEARCH_PATH})
-@@ -94,7 +122,7 @@ IF (UNIX)
-   FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h              ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h          ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h        ${X11_INC_SEARCH_PATH})
--  FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH})
-+  #FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xshape_INCLUDE_PATH X11/extensions/shape.h           ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h                       ${X11_INC_SEARCH_PATH})
-   FIND_PATH(X11_Xt_INCLUDE_PATH X11/Intrinsic.h                      ${X11_INC_SEARCH_PATH})
-@@ -107,25 +135,29 @@ IF (UNIX)
-   # Find additional X libraries. Keep list sorted by library name.
-   FIND_LIBRARY(X11_ICE_LIB ICE               ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xau_LIB Xau               ${X11_LIB_SEARCH_PATH})
--  FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH})
-+  #FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xcursor_LIB Xcursor       ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xdamage_LIB Xdamage       ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp           ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xext_LIB Xext             ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xfixes_LIB Xfixes         ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xft_LIB Xft               ${X11_LIB_SEARCH_PATH})
--  FIND_LIBRARY(X11_Xinerama_LIB Xinerama     ${X11_LIB_SEARCH_PATH})
-+  #FIND_LIBRARY(X11_Xinerama_LIB Xinerama     ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xinput_LIB Xi             ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xkbfile_LIB xkbfile       ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xpm_LIB Xpm               ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xrandr_LIB Xrandr         ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xrender_LIB Xrender       ${X11_LIB_SEARCH_PATH})
--  FIND_LIBRARY(X11_Xscreensaver_LIB Xss      ${X11_LIB_SEARCH_PATH})
-+  #FIND_LIBRARY(X11_Xscreensaver_LIB Xss      ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xt_LIB Xt                 ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_XTest_LIB Xtst            ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xv_LIB Xv                 ${X11_LIB_SEARCH_PATH})
-   FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc   ${X11_LIB_SEARCH_PATH})
- 
-+  FIND_X11(X11_Xcomposite X11/extensions/Xcomposite.h Xcomposite)
-+  FIND_X11(X11_Xinerama X11/extensions/Xinerama.h Xinerama)
-+  FIND_X11(X11_Xscreensaver X11/extensions/scrnsaver.h Xss)
-+
-   SET(X11_LIBRARY_DIR "")
-   IF(X11_X11_LIB)
-     GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH)
diff --git a/kde-base/kdelibs/files/kdelibs-4.0.0-alsa-optional.patch b/kde-base/kdelibs/files/kdelibs-4.0.0-alsa-optional.patch
deleted file mode 100644
index 77e9ae04dc16..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.0.0-alsa-optional.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/cmake/modules/FindAlsa.cmake
-+++ b/cmake/modules/FindAlsa.cmake
-@@ -13,10 +13,14 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
-+OPTION(WITH_Alsa "Support for the ALSA sound system." ON)
-+
- include(CheckIncludeFiles)
- include(CheckIncludeFileCXX)
- include(CheckLibraryExists)
- 
-+if(WITH_Alsa)
-+
- # Already done by toplevel
- find_library(ASOUND_LIBRARY asound)
- check_library_exists(asound snd_seq_create_simple_port ${ASOUND_LIBRARY} HAVE_LIBASOUND2)
-@@ -29,19 +33,22 @@
- 
- find_path(ALSA_INCLUDES alsa/version.h)
- 
-+endif(WITH_Alsa)
-+
- macro(ALSA_VERSION_STRING _result)
-     # check for version in alsa/version.h
--    if(ALSA_INCLUDES)
-+    if(WITH_Alsa AND ALSA_INCLUDES)
-         file(READ "${ALSA_INCLUDES}/alsa/version.h" _ALSA_VERSION_CONTENT)
-         string(REGEX REPLACE ".*SND_LIB_VERSION_STR.*\"(.*)\".*" "\\1" ${_result} ${_ALSA_VERSION_CONTENT})
--    else(ALSA_INCLUDES)
-+    else(WITH_Alsa AND ALSA_INCLUDES)
-         message(STATUS "ALSA version not known. ALSA output will probably not work correctly.")
--    endif(ALSA_INCLUDES)
-+    endif(WITH_Alsa AND ALSA_INCLUDES)
- endmacro(ALSA_VERSION_STRING _result)
- 
- 
- get_filename_component(_FIND_ALSA_MODULE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
- macro(ALSA_CONFIGURE_FILE _destFile)
-+	if(WITH_Alsa)
-     check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H)
-     check_include_files(machine/soundcard.h HAVE_MACHINE_SOUNDCARD_H)
- 
-@@ -58,6 +65,7 @@
-         set(HAVE_SND_PCM_RESUME 1)
-     endif(ASOUND_HAS_SND_PCM_RESUME)
- 
-+	endif(WITH_Alsa)
-     configure_file(${_FIND_ALSA_MODULE_DIR}/config-alsa.h.cmake ${_destFile})
- endmacro(ALSA_CONFIGURE_FILE _destFile)
- 
diff --git a/kde-base/kdelibs/files/kdelibs-4.0.0-flac-1.1.3.patch b/kde-base/kdelibs/files/kdelibs-4.0.0-flac-1.1.3.patch
deleted file mode 100644
index 130f69ba4ba2..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.0.0-flac-1.1.3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: kdelibs/cmake/modules/FindFlac.cmake
-===================================================================
---- kdelibs/cmake/modules/FindFlac.cmake        (revision 749960)
-+++ kdelibs/cmake/modules/FindFlac.cmake        (working copy)
-@@ -5,6 +5,9 @@
- #  FLAC_INCLUDE_DIR - the Flac include directory
- #  FLAC_LIBRARIES - Link these to use Flac
- #  FLAC_OGGFLAC_LIBRARIES - Link these to use OggFlac
-+#
-+# No version checking is done - use FLAC_API_VERSION_CURRENT to
-+# conditionally compile version-dependent code
- 
- # Copyright (c) 2006, Laurent Montel, <montel@kde.org>
- # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-@@ -23,18 +26,16 @@ FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC )
- 
- FIND_LIBRARY(FLAC_OGG_LIBRARY NAMES OggFLAC)
- 
--check_library_exists(FLAC FLAC__stream_encoder_set_write_callback "" HAVE_STREAM_ENCODER_WRITE_CALLBACK)
--
- 
- 
--IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
-+IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
-    SET(FLAC_FOUND TRUE)
-    IF (FLAC_OGG_LIBRARY)
-       SET(FLAC_OGGFLAC_LIBRARIES ${FLAC_OGG_LIBRARY} ${FLAC_LIBRARIES})
-    ENDIF (FLAC_OGG_LIBRARY)
--ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
-+ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
-    SET(FLAC_FOUND FALSE)
--ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
-+ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
- 
- IF(FLAC_FOUND)
-    IF(NOT Flac_FIND_QUIETLY)
diff --git a/kde-base/kdelibs/files/konqueror-3.5.7-185603-spoofing.diff b/kde-base/kdelibs/files/konqueror-3.5.7-185603-spoofing.diff
deleted file mode 100644
index 50a9ed17e1dc..000000000000
--- a/kde-base/kdelibs/files/konqueror-3.5.7-185603-spoofing.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- kdecore/kurl.cpp
-+++ kdecore/kurl.cpp
-@@ -30,6 +30,7 @@
- #include <kglobal.h>
- #include <kidna.h>
- #include <kprotocolinfo.h>
-+#include <kstringhandler.h>
- #endif
- 
- #include <stdio.h>
-@@ -183,7 +184,7 @@ static QString lazy_encode( const QStrin
-         (character == '?') || // Start of query delimiter
-         ((character == '@') && encodeAt) || // Username delimiter
-         (character == '#') || // Start of reference delimiter
--        ((character == 32) && (i+1 == old_length))) // A trailing space
-+        ((character == 32) && (i+1 == old_length || segment[i+1] == ' '))) // A trailing space
-     {
-       new_segment[ new_length++ ] = '%';
- 
-@@ -1540,7 +1541,13 @@ QString KURL::prettyURL( int _trailing )
-     u += "//";
-     if ( hasUser() )
-     {
--      u += lazy_encode(m_strUser);
-+      QString s = m_strUser;
-+#ifndef KDE_QT_ONLY
-+      // shorten the username, its unlikely to be valid without password anyway
-+      if (!hasPass())
-+          s = KStringHandler::csqueeze(s, 16);
-+#endif
-+      u += encode(s, 0, 0);
-       // Don't show password!
-       u += "@";
-     }