Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-base
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2009-11-09 09:48:18 +0000
committerJonathan Callen <abcd@gentoo.org>2009-11-09 09:48:18 +0000
commitd33fc20802fec119268d034d160f29f833bfd840 (patch)
tree0772c29d4adf6b4540c6740a56608315da440d32 /kde-base
parentMissing dev-libs/boost[python] depend wrt #291660, thanks to Lars Wendler for... (diff)
downloadgentoo-2-d33fc20802fec119268d034d160f29f833bfd840.tar.gz
gentoo-2-d33fc20802fec119268d034d160f29f833bfd840.tar.bz2
gentoo-2-d33fc20802fec119268d034d160f29f833bfd840.zip
Drop unneeded patches
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdelibs/ChangeLog9
-rw-r--r--kde-base/kdelibs/files/4.2.4-CVE-2009-1687.patch20
-rw-r--r--kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch82
-rw-r--r--kde-base/kdelibs/files/4.2.4-CVE-2009-1698.patch41
-rw-r--r--kde-base/kdelibs/files/4.2.4-CVE-2009-1725.patch11
-rw-r--r--kde-base/kdelibs/files/4.2.4-fixPopupForPlasmaboard.patch43
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch22
7 files changed, 8 insertions, 220 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/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 <---
-