[kde-base/plasma-workspace] Clean unneeded patches

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 5 insertions, 68 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 99a2763d4120..ffad5118c2ba 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.26 2009/06/14 11:54:50 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.27 2009/06/14 13:31:30 alexxy Exp $
+
+  14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  -files/4.2.1-panelview-crash-fix.patch, -files/4.2-fix-quicklaunch.patch:
+  Clean unneeded patches
 
   14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -plasma-workspace-4.2.3.ebuild:
diff --git a/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch b/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch
deleted file mode 100644
index ad6ba1c4654a..000000000000
--- a/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- kdebase-workspace-4.2.1-orig/plasma/applets/quicklaunch/quicklaunchApplet.cpp	2009-02-26 15:17:02.000000000 +0100
-+++ kdebase-workspace-4.2.1/plasma/applets/quicklaunch/quicklaunchApplet.cpp	2009-03-08 13:53:49.000000000 +0100
-@@ -44,6 +44,8 @@
- 
- QuicklaunchApplet::QuicklaunchApplet(QObject *parent, const QVariantList &args)
-   : Plasma::Applet(parent, args),
-+    m_layout(0),
-+    m_innerLayout(0),
-     m_visibleIcons(6),
-     m_rowCount(2),
-     m_dialogRowCount(2),
-@@ -53,9 +55,7 @@
-     m_addDialog(0),
-     m_rightClickedIcon(0),
-     m_addAction(0),
--    m_removeAction(0),
--    m_layout(0),
--    m_innerLayout(0)
-+    m_removeAction(0)
- {
-     setHasConfigurationInterface(true);
-     setAcceptDrops(true);
-@@ -141,16 +141,11 @@
-         if (!m_innerLayout) {
-             return sizeHint;
-         }
-+        qreal newWidth = m_innerLayout->columnCount() * sizeHint.height() / qMax(1, m_innerLayout->rowCount());
-         if (m_icons.size() > m_visibleIcons) {
--            qreal factor = m_innerLayout->rowCount() * m_innerLayout->columnCount() + size().height();
--            if (factor) {
--                sizeHint.setWidth(sizeHint.height() / factor);
--            }
-+            sizeHint.setWidth(newWidth + sizeHint.height());
-         } else {
--            qreal factor = m_innerLayout->rowCount() * m_innerLayout->columnCount();
--            if (factor) {
--                sizeHint.setWidth(sizeHint.height() / factor);
--            }
-+            sizeHint.setWidth(newWidth);
-         }
-         return sizeHint;
-     }
diff --git a/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch b/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch
deleted file mode 100644
index d14715684dea..000000000000
--- a/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/kdebase/workspace/plasma/shells/desktop/panelview.cpp	2009/02/24 04:51:03	930724
-+++ b/kdebase/workspace/plasma/shells/desktop/panelview.cpp	2009/03/03 23:39:55	934863
-@@ -203,6 +203,11 @@
-       m_triggerEntered(false)
- {
-     Q_ASSERT(qobject_cast<Plasma::Corona*>(panel->scene()));
-+
-+    m_strutsTimer = new QTimer(this);
-+    m_strutsTimer->setSingleShot(true);
-+    connect(m_strutsTimer, SIGNAL(timeout()), this, SLOT(updateStruts()));
-+
-     if (panel) {
-         connect(panel, SIGNAL(destroyed(QObject*)), this, SLOT(panelDeleted()));
-         connect(panel, SIGNAL(toolBoxToggled()), this, SLOT(togglePanelController()));
-@@ -248,10 +253,6 @@
-     KWindowSystem::setOnAllDesktops(winId(), true);
- 
-     QTimer::singleShot(0, this, SLOT(init()));
--
--    m_strutsTimer = new QTimer(this);
--    m_strutsTimer->setSingleShot(true);
--    connect(m_strutsTimer,SIGNAL(timeout()),this,SLOT(updateStruts()));
- }
- 
- PanelView::~PanelView()