Drop unneeded patches

Package-Manager: portage--svn/cvs/Linux i686

8 files changed, 9 insertions, 227 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 8ca44ca98679..0140c61b760f 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.638 2009/11/09 09:35:08 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.639 2009/11/09 09:48:17 abcd Exp $
+
+  09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+  -files/4.2.4-CVE-2009-1687.patch,
+  -files/4.2.4-fixPopupForPlasmaboard.patch,
+  -files/kdelibs-4.2-fixx11h.h.patch, -files/4.2.4-CVE-2009-1690.patch,
+  -files/4.2.4-CVE-2009-1698.patch, -files/4.2.4-CVE-2009-1725.patch:
+  Drop unneeded patches
 
   09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
   -files/kdelibs-3.5.8-kinit-CVE-2008-1671.patch, -kdelibs-3.5.9-r4.ebuild,
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index d6e5c2fb6aa0..666aa3d904ec 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,8 +1,3 @@
-AUX 4.2.4-CVE-2009-1687.patch 750 RMD160 cca97b9669755ea7c0475ce35275a2e2e19dcd25 SHA1 aa1a6c255362b050ebb8e0bbbcbc254f76bb3b21 SHA256 0297462875b43fe4e0efd3f1af9aeaa3c867e17fabb043c975d6e6afa84ba5fb
-AUX 4.2.4-CVE-2009-1690.patch 2437 RMD160 9ef96f67e0ee878d112d270339b979c3263fd93e SHA1 bc253af5e4b6329935e88a6999c7925e6c6ddf08 SHA256 8e8b32827e2e5375ce61b08e8264085b285e58a4838028165b2cfeefa1d38010
-AUX 4.2.4-CVE-2009-1698.patch 1601 RMD160 92420a3d855ab98a2ce1eeace6f9e63b0a4c5264 SHA1 cb5b09ab4883401db32fd7372914aa0d7cdbeacd SHA256 7d0aab8ba1a60d94643e6b60d1363be0486de8c3a54dcbbe50f01b33c6adfc82
-AUX 4.2.4-CVE-2009-1725.patch 513 RMD160 d550faf7faba495ea043c1298f4bda5e0512b20b SHA1 777b0e7e74dc5fd561c17214fcfa99ba99fa20a7 SHA256 842bff809b0413eccbae4f6c73c67d83180c1e0598b99c9e3e4396b960c06577
-AUX 4.2.4-fixPopupForPlasmaboard.patch 2180 RMD160 bc24d337f03f05be742f7963e8eb14161f643183 SHA1 bd40ad5289c2ec5b17d3a46d53e4fc5b205dc3f3 SHA256 627fef9fbd0df29c1c11ffd0e7fbb979189c31b11ec16d7db1ae981053384669
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
 AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
 AUX dist/09_disable_debug_messages_if_not_explicitly_enabled.patch 1840 RMD160 097372c9264497b1aabb8b21e8b9959c24cca2f1 SHA1 f19dd9bbf3ed0868442a970a4c588640922c6cbc SHA256 92b8a8c8f46f06a0bfd93babb52f6d87c7b3f5dc6478b4f5d8e8c56c9e4e5bce
@@ -12,7 +7,6 @@ AUX kdelibs-3.5.10-glibc-2.10.patch 887 RMD160 467ea27befe92e3cf11fd8104e450e49f
 AUX kdelibs-3.5.10-kde4-apps.patch 2505 RMD160 5213545e46cc5aa9d0d49f821c42b75a1740ffff SHA1 3c63987dee7dece95ab244811e02895d4965aebe SHA256 d12787734c1c64f830d9ab9cdc1d46828a30d2a4d9cf369ae8fae7e12e5f541c
 AUX kdelibs-3.5.10-khtml.patch 457 RMD160 71012469caf76fbaa75b147c624a5df32eafae19 SHA1 749d5a64a7b49d2b92f30f16b840e79f6bea8d83 SHA256 94d024590f7f846b85fd95745782e4c3f14c5d42004b652bf8bb904622b35dad
 AUX kdelibs-3.5.10-kjs-gcc44.patch 8730 RMD160 d1d139782c7c9a34b8b7c2c46f360ad7d8f853ec SHA1 3228dd6b9a6612bff3fe010b79b2c2141214eb59 SHA256 8345b6f585af834e9ad3e03db87dbf3b2a5ba17886aef426da7f6d691d360526
-AUX kdelibs-4.2-fixx11h.h.patch 460 RMD160 153e677156f30d2b308c5344b12989be466e9d2c SHA1 da868fc661ce8ec514d70533b7fe6232151eb653 SHA256 307c78bb8a0056b6773380d55429458df9fd2516608077e9437fb1c0592aa7f5
 AUX kdelibs-4.3.1-crash-on-konqueror-tabs.patch 372 RMD160 0d0bc7eed8535ab7635d8e2aacf78db03a8dd460 SHA1 741a017aa9f5c8c2e7a1e175a32e11cbb05aac17 SHA256 e6804cb3f5f811d00b5fa645e9359c3b7ca8e2cc51e9365ee62d73eac2297e8a
 AUX kdelibs-4.3.1-dom-docimpl-crash.patch 1547 RMD160 7943693fcdd9e03bab297518fd36b085ac94b760 SHA1 07eb02f50ca172eb9c9f10d675a98bb9647532a0 SHA256 fd3153f39f8fce96be1bb04b7a21308415d8b693b0adf7546ea1a8eec988f169
 AUX kdelibs-4.3.1-fix-crash-on-konqueror-tabs.patch 349 RMD160 dd79ab167971d1266ce4ef72aae4431caa5c24cb SHA1 fa392cfb329d29c0a8b3a3d8a4b8982cba1b90d3 SHA256 1af1cd5f326eb9538b118083284872706a25d62ad754af2220bf51c8f2895005
@@ -28,5 +22,5 @@ EBUILD kdelibs-3.5.10-r6.ebuild 7407 RMD160 5b14da6e63445a43c1729a0d75519374914a
 EBUILD kdelibs-4.3.1-r1.ebuild 6433 RMD160 3f0a829ef8c9c927da8760d367a1c1e9f7d8983d SHA1 5ee2c2e5cfd4b7b3e344dfcc45e484e128b39cdc SHA256 1bf55897439b9f25873fd8d35f8e2f9ccfdbb4f2d13aab61bbd1e96493782a87
 EBUILD kdelibs-4.3.1-r2.ebuild 6429 RMD160 e1e0e5698301f1d27cef09a20f18a40815a231d9 SHA1 23675761bdc73b70fd9ae3a98206e3b50097c27b SHA256 c876c4a38c5f6cd77acec396d4bd1e629a3c1c6f30fb72077ae334385ecc3b1f
 EBUILD kdelibs-4.3.3.ebuild 6336 RMD160 4be81b879855b3adb0e3eaf920ed29cf7139d602 SHA1 f812720df12ad6928fddecd9827d0c2dfd9190ec SHA256 d308f1bb873858ffaf7f1da730d30e7ad60e60a5ed365ef3368fb362e073815b
-MISC ChangeLog 107050 RMD160 75e025dd950df96feab39c753bbb768aab98491b SHA1 81fec418930cbef5e2a41216a3778a48725905a5 SHA256 238ec2e44afb1de6031a0cdb3a29cadb8a662d16e1933793c7de6a56c8cfb51a
+MISC ChangeLog 107347 RMD160 c87682fd59bd661ff7d128bb2f7d023b2bf68a63 SHA1 408de82710e0fa3d863d6819ac3cf60a26218aa4 SHA256 475aad3222ed45f9bd99c5d9e3f50c2cdedc9350df1cf0d95d6f159408165d02
 MISC metadata.xml 421 RMD160 1ac2a2321b85031d1a7d25ff97fd87fd7376cc12 SHA1 473e157bcd1bfbef6704dbc47fbe86688973e79e SHA256 03af52377b9a607997590a9cda326fa515c4e21207bf33953cb0e67b5831336d
diff --git a/kde-base/kdelibs/files/4.2.4-CVE-2009-1687.patch b/kde-base/kdelibs/files/4.2.4-CVE-2009-1687.patch
deleted file mode 100644
index 603be3807425..000000000000
--- a/kde-base/kdelibs/files/4.2.4-CVE-2009-1687.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- branches/KDE/4.3/kdelibs/kjs/collector.cpp	2009/07/26 03:35:55	1002472
-+++ branches/KDE/4.3/kdelibs/kjs/collector.cpp	2009/07/26 03:35:57	1002473
-@@ -31,6 +31,7 @@
- #include "value.h"
- 
- #include <setjmp.h>
-+#include <limits.h>
- #include <algorithm>
- 
- #if PLATFORM(DARWIN)
-@@ -109,6 +110,9 @@
- 
-     void append(CollectorBlock* block) {
-         if (m_used == m_capacity) {
-+            static const size_t maxNumBlocks = ULONG_MAX / sizeof(CollectorBlock*) / GROWTH_FACTOR;
-+            if (m_capacity > maxNumBlocks)
-+                CRASH();
-             m_capacity = max(MIN_ARRAY_SIZE, m_capacity * GROWTH_FACTOR);
-             m_data = static_cast<CollectorBlock **>(fastRealloc(m_data, m_capacity * sizeof(CollectorBlock *)));
-         }
diff --git a/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch b/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch
deleted file mode 100644
index c274996f2709..000000000000
--- a/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=274566
-http://websvn.kde.org/?view=rev&revision=983302
-http://websvn.kde.org/?view=rev&revision=983316
-
---- khtml/html/htmlparser.cpp
-+++ khtml/html/htmlparser.cpp
-@@ -216,7 +216,6 @@
- 
-     form = 0;
-     map = 0;
--    head = 0;
-     end = false;
-     isindex = 0;
- 
-@@ -678,8 +677,7 @@
-             case ID_BASE:
-                 if(!head) {
-                     head = new HTMLHeadElementImpl(document);
--                    e = head;
--                    insertNode(e);
-+                    insertNode(head.get());
-                     handled = true;
-                 }
-                 break;
-@@ -894,7 +892,7 @@
-     case ID_HEAD:
-         if(!head && (current->id() == ID_HTML || current->isDocumentNode())) {
-             head = new HTMLHeadElementImpl(document);
--            n = head;
-+            n = head.get();
-         }
-         break;
-     case ID_BODY:
-@@ -1800,19 +1798,19 @@
-     head = new HTMLHeadElementImpl(document);
-     HTMLElementImpl *body = doc()->body();
-     int exceptioncode = 0;
--    doc()->documentElement()->insertBefore(head, body, exceptioncode);
-+    doc()->documentElement()->insertBefore(head.get(), body, exceptioncode);
-     if ( exceptioncode ) {
- #ifdef PARSER_DEBUG
-         kDebug( 6035 ) << "creation of head failed!!!!:" << exceptioncode;
- #endif
--        delete head;
-+        delete head.get();
-         head = 0;
-     }
-         
-     // If the body does not exist yet, then the <head> should be pushed as the current block.
-     if (head && !body) {
-         pushBlock(head->id(), tagPriority(head->id()));
--        setCurrent(head);
-+        setCurrent(head.get());
-     }
- }
- 
---- khtml/html/htmlparser.h
-+++ khtml/html/htmlparser.h
-@@ -155,7 +155,7 @@
-     /*
-      * the head element. Needed for crappy html which defines <base> after </head>
-      */
--    DOM::HTMLHeadElementImpl *head;
-+    RefPtr<DOM::HTMLHeadElementImpl> head;
- 
-     /*
-      * a possible <isindex> element in the head. Compatibility hack for
---- khtml/svg/SVGList.h
-+++ khtml/svg/SVGList.h
-@@ -97,7 +97,11 @@
- 
-         Item insertItemBefore(Item newItem, unsigned int index, ExceptionCode&)
-         {
--            m_vector.insert(index, newItem);
-+            if (index < m_vector.size()) {
-+                m_vector.insert(index, newItem);
-+            } else {
-+                m_vector.append(newItem);
-+            }
-             return newItem;
-         }
- 
diff --git a/kde-base/kdelibs/files/4.2.4-CVE-2009-1698.patch b/kde-base/kdelibs/files/4.2.4-CVE-2009-1698.patch
deleted file mode 100644
index 0754c5f02ea0..000000000000
--- a/kde-base/kdelibs/files/4.2.4-CVE-2009-1698.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- branches/KDE/4.3/kdelibs/khtml/css/css_valueimpl.cpp	2009/07/26 03:39:55	1002474
-+++ branches/KDE/4.3/kdelibs/khtml/css/css_valueimpl.cpp	2009/07/26 03:40:47	1002475
-@@ -1212,7 +1212,9 @@
- 	    text = getValueName(m_value.ident);
- 	    break;
- 	case CSSPrimitiveValue::CSS_ATTR:
--	    // ###
-+            text = "attr(";
-+            text += DOMString( m_value.string );
-+            text += ")";
- 	    break;
- 	case CSSPrimitiveValue::CSS_COUNTER:
-             text = "counter(";
-
---- branches/KDE/4.3/kdelibs/khtml/css/cssparser.cpp	2009/07/26 03:39:55	1002474
-+++ branches/KDE/4.3/kdelibs/khtml/css/cssparser.cpp	2009/07/26 03:40:47	1002475
-@@ -1513,6 +1513,14 @@
-                 if ( args->size() != 1)
-                     return false;
-                 Value *a = args->current();
-+                if (a->unit != CSSPrimitiveValue::CSS_IDENT) {
-+                    isValid=false;
-+                    break;
-+                }
-+                if (qString(a->string)[0] == '-') {
-+                    isValid=false;
-+                    break;
-+                }
-                 parsedValue = new CSSPrimitiveValueImpl(domString(a->string), CSSPrimitiveValue::CSS_ATTR);
-             }
-             else
-@@ -1565,7 +1573,8 @@
- 
-     CounterImpl *counter = new CounterImpl;
-     Value *i = args->current();
--//    if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid;
-+    if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid;
-+    if (qString(i->string)[0] == '-') goto invalid;
-     counter->m_identifier = domString(i->string);
-     if (counters) {
-         i = args->next();
diff --git a/kde-base/kdelibs/files/4.2.4-CVE-2009-1725.patch b/kde-base/kdelibs/files/4.2.4-CVE-2009-1725.patch
deleted file mode 100644
index 18feec792d75..000000000000
--- a/kde-base/kdelibs/files/4.2.4-CVE-2009-1725.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- branches/KDE/4.3/kdelibs/khtml/html/htmltokenizer.cpp	2009/07/25 09:02:54	1002162
-+++ branches/KDE/4.3/kdelibs/khtml/html/htmltokenizer.cpp	2009/07/25 09:05:44	1002163
-@@ -1038,7 +1038,7 @@
- #ifdef TOKEN_DEBUG
-                 kDebug( 6036 ) << "unknown entity!";
- #endif
--                checkBuffer(10);
-+                checkBuffer(11);
-                 // ignore the sequence, add it to the buffer as plaintext
-                 *dest++ = '&';
-                 for(unsigned int i = 0; i < cBufferPos; i++)
diff --git a/kde-base/kdelibs/files/4.2.4-fixPopupForPlasmaboard.patch b/kde-base/kdelibs/files/4.2.4-fixPopupForPlasmaboard.patch
deleted file mode 100644
index cf6dec7caf9c..000000000000
--- a/kde-base/kdelibs/files/4.2.4-fixPopupForPlasmaboard.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: kdelibs/plasma/popupapplet.cpp
-===================================================================
---- kdelibs/plasma/popupapplet.cpp	(Revision 976120)
-+++ kdelibs/plasma/popupapplet.cpp	(Arbeitskopie)
-@@ -275,11 +275,7 @@
-                 //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.
--                dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
--                updateDialogFlags();
--                KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
--                dialog->installEventFilter(q);
--
-+		
-                 q->setMinimumSize(QSize(0, 0));
-                 if (gWidget) {
-                     Corona *corona = qobject_cast<Corona *>(gWidget->scene());
-@@ -289,14 +285,25 @@
-                         corona->addOffscreenWidget(gWidget);
-                         dialog->setGraphicsWidget(gWidget);
-                     }
-+
-+		    dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (gWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
-                 } else if (qWidget) {
-                     QVBoxLayout *l_layout = new QVBoxLayout(dialog);
-                     l_layout->setSpacing(0);
-                     l_layout->setMargin(0);
-                     l_layout->addWidget(qWidget);
-                     dialog->adjustSize();
-+
-+		    dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (qWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
-                 }
-+		else {
-+                    dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
-+		}
-+                updateDialogFlags();
-+                KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
-+                dialog->installEventFilter(q);
- 
-+
-                 QObject::connect(dialog, SIGNAL(dialogResized()), q, SLOT(dialogSizeChanged()));
-                 QObject::connect(dialog, SIGNAL(dialogVisible(bool)), q, SLOT(dialogStatusChanged(bool)));
-             }
diff --git a/kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch b/kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch
deleted file mode 100644
index 0263856e5a4b..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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 <---
-