Drop old patches

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

4 files changed, 7 insertions, 69 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index d56ed8313e59..4e16ec0dc399 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.654 2009/12/10 20:12:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.655 2009/12/10 23:03:32 abcd Exp $
+
+  10 Dec 2009; Jonathan Callen <abcd@gentoo.org>
+  -files/kdelibs-4.3.1-crash-on-konqueror-tabs.patch,
+  -files/kdelibs-4.3.1-dom-docimpl-crash.patch,
+  -files/kdelibs-4.3.1-fix-crash-on-konqueror-tabs.patch:
+  Drop old patches
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -kdelibs-4.3.1-r1.ebuild, -kdelibs-4.3.1-r2.ebuild:
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.1-crash-on-konqueror-tabs.patch b/kde-base/kdelibs/files/kdelibs-4.3.1-crash-on-konqueror-tabs.patch
deleted file mode 100644
index 59d0f4a91962..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.1-crash-on-konqueror-tabs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: khtml/khtml_part.cpp
-===================================================================
---- khtml/khtml_part.cpp	(revision 1032786)
-+++ khtml/khtml_part.cpp	(revision 1032787)
-@@ -609,8 +609,8 @@
- 
-   if ( d->m_view )
-   {
--    d->m_view->hide();
--    d->m_view->viewport()->hide();
-+    if ( widget() )
-+      widget()->hide();
-     d->m_view->m_part = 0;
-   }
- 
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.1-dom-docimpl-crash.patch b/kde-base/kdelibs/files/kdelibs-4.3.1-dom-docimpl-crash.patch
deleted file mode 100644
index f508440759fb..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.1-dom-docimpl-crash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- khtml/xml/dom_docimpl.cpp	2009/06/24 10:17:04	986143
-+++ khtml/xml/dom_docimpl.cpp	2009/09/27 00:13:24	1028402
-@@ -2451,8 +2451,11 @@
- 
-     if (m_focusNode != newFocusNode) {
-         NodeImpl *oldFocusNode = m_focusNode;
--        // Set focus on the new node
--        m_focusNode = newFocusNode;
-+
-+        // We are blurring, so m_focusNode ATM is 0; this is observable to the
-+        // event handlers.
-+        m_focusNode = 0;
-+        
-         // Remove focus from the existing focus node (if any)
-         if (oldFocusNode) {
-             if (oldFocusNode->active())
-@@ -2470,7 +2473,8 @@
-             oldFocusNode->dispatchUIEvent(EventImpl::DOMFOCUSOUT_EVENT);
- 
-             if ((oldFocusNode == this) && oldFocusNode->hasOneRef()) {
--                oldFocusNode->deref(); // deletes this
-+                oldFocusNode->deref(); // may delete this, if there are not kids keeping it alive...
-+                                       // so we better not add any.
-                 return;
-             }
- 	    else {
-@@ -2478,7 +2482,11 @@
-             }
-         }
- 
--        if (m_focusNode) {
-+        // It's possible that one of the blur, etc. handlers has already set focus.
-+        // in that case, we don't want to override it.
-+        if (!m_focusNode && newFocusNode) {
-+            // Set focus on the new node
-+            m_focusNode = newFocusNode;
-             m_focusNode->ref();
-             m_focusNode->dispatchHTMLEvent(EventImpl::FOCUS_EVENT,false,false);
-             if (m_focusNode != newFocusNode) return;
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.1-fix-crash-on-konqueror-tabs.patch b/kde-base/kdelibs/files/kdelibs-4.3.1-fix-crash-on-konqueror-tabs.patch
deleted file mode 100644
index adfd99ba790a..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.1-fix-crash-on-konqueror-tabs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: khtml/khtml_part.cpp
-===================================================================
---- khtml/khtml_part.cpp	(revision 1032786)
-+++ khtml/khtml_part.cpp	(revision 1032787)
-@@ -609,8 +609,7 @@
- 
-   if ( d->m_view )
-   {
--    d->m_view->hide();
--    d->m_view->viewport()->hide();
-+    widget()->hide();
-     d->m_view->m_part = 0;
-   }
-