deleted plasma-workspace obsolete patches

5 files changed, 7 insertions, 76 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index ff782f59894..2d1fa46dfa3 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Mar 2009; Alex Alexander (wired) <alex.alexander@gmail.com>
+  -files/4.2.1-panelview-crash-fix.patch, -files/4.2-fix-quicklaunch.patch,
+  plasma-workspace-4.2.2.ebuild:
+  deleted obsolete patches
+
 *plasma-workspace-4.2.2 (27 Mar 2009)
 
   27 Mar 2009; Alex Alexander (wired) <alex.alexander@gmail.com>
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 0f2fba7eb44..a764b1a031b 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,10 +1,8 @@
-AUX 4.2-fix-quicklaunch.patch 1547 RMD160 97321b2543e4399ec7cdb59337d91163c4c5eb7f SHA1 49807510ad4a5731220d390c2476b57fef6c3a0e SHA256 2943f14c696f853a57f134f9dd20d603e15ff5db1f8a36c724bca1c6276f7ef7
-AUX 4.2.1-panelview-crash-fix.patch 948 RMD160 d067f0fa21a18623718e79fbdac4addf7895c352 SHA1 118dbf669243290c06464d957e98a356f093f9eb SHA256 2a7f11c47c6b9b5da6760ff6ef0de5cd8625c0c2e61cd685a2cb9cd472609a5e
 AUX plasma-workspace-4.1.72-fix.patch 958 RMD160 2922b5ac13b9cbd79a747181b3ff846691508872 SHA1 d3d889ebc5cb7c9f7bd7d00a0729b8350c09b481 SHA256 b2bb0ab8133cd07ca134b41394b0244d07286831a4a4b063b55d8bee157918b3
 DIST kdebase-workspace-4.2.2.tar.bz2 50800751 RMD160 a7cc0bedde529ff7e27ed9e0b6362ef6c20c4082 SHA1 9397220827f378cedf38e800e06e9ca8b1a1235d SHA256 1620cf0467eb08046aeee6bce46ca17948a703e98c0e3d0de3064ab39f196c2f
 DIST kdebase-workspace-4.2.67.tar.lzma 49804605 RMD160 5f2219f660e8682e76de2f93a99d0ccd68cacf16 SHA1 6c2de41a9824abe22e20ddf6209f7a604b6bd9b6 SHA256 c5273cc92db066a4d98469be2fb983f818911f247767e77287c10efc46b0b4ee
-EBUILD plasma-workspace-4.2.2.ebuild 2612 RMD160 b3acde8cbb3a83a61222a38b74ff74783c3b164c SHA1 3009945c3a7bdc9298ed92eda3303db3d72714c8 SHA256 bbcfeef06b595028dbfdc9b89835d4e7f07e2f99b74380185ba335ef93009d55
+EBUILD plasma-workspace-4.2.2.ebuild 2511 RMD160 b387fb8516ca00a9147932a26d5501b1c9b443f1 SHA1 b60f9850d565127f926ea9d5accd9f4f449c5155 SHA256 f15cbfce54249b78f68fb97ebea3bcae1af5659661b8bb7420e44657d8dba3df
 EBUILD plasma-workspace-4.2.67.ebuild 2286 RMD160 db75fb01f22cd613c8b1a815bd885205be28fb42 SHA1 4fe3cd715498f1157fccb281292a71883c1f9236 SHA256 2d2306799e0e8d6ce339653bd0dd5386a3d13efbca37e609d7bc90ae03b35dfb
 EBUILD plasma-workspace-9999.ebuild 2275 RMD160 672cbef75563b75e7145dcee4727ded9fc5aa888 SHA1 351fafe4a49fc83a3eea3f617a6bdbb98825540d SHA256 62471ef186f048eabb7c2d8f69659cbd9ee9beea3719d38d99001c6f46206c11
-MISC ChangeLog 8569 RMD160 2978b397444484c15e37bdb0ee6cddcc078ec7ee SHA1 6d9a2cb1148ac15ffb0dae13bf04abcf0f7da11c SHA256 b9248cc8d43aff0778ee9cd0cf3812720c321b69544ab1977d2687ec135d9dca
+MISC ChangeLog 8771 RMD160 48d1a0a8036f618de9b85b76dbecee9aaa3e6494 SHA1 39a944ed4f6ec4bcc79de8897c4266f71bfd76fb SHA256 4663a58289a974d0ad74c09008f3beaa80db19168f8f5f73fc3b00ae717b0a34
 MISC metadata.xml 332 RMD160 ca0d953faef7f42984b0853648b9524c304c7c46 SHA1 e79c7f7b292068daf0a6d5db386ff58fc4f9d6cd SHA256 55cde5f777627192cf9ae1935355902d496a45070fffe5a5ba2abd41168b4ce8
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 ad6ba1c4654..00000000000
--- 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 d14715684de..00000000000
--- 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()
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
index 1c7ed9a910c..55c4892021c 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
@@ -58,11 +58,6 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libtaskmanager"
 
-PATCHES=(
-	"${FILESDIR}/4.2.1-panelview-crash-fix.patch"
-	"${FILESDIR}/4.2-fix-quicklaunch.patch"
-)
-
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with google-gadgets Googlegadgets)