Add missing patch.

Package-Manager: portage-2.2_rc25/cvs/Linux x86_64

3 files changed, 49 insertions, 2 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 734d39ce3f8c..44ea36952570 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.13 2009/03/15 14:43:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.14 2009/03/15 18:26:17 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/4.2-fix-quicklaunch.patch:
+  Add missing patch.
 
 *plasma-workspace-4.2.1-r1 (15 Mar 2009)
 
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index d904f7de02f0..fcaf059eedc1 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,6 +1,7 @@
+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
 DIST kdebase-workspace-4.2.1.tar.bz2 50777207 RMD160 fe1debd87fb62c652925f6709905d0cf416b39c4 SHA1 412b8a6778d5c71a366c054b0136edae309bbef0 SHA256 fa8165cb1c64046c4a659cd69962cda79093453f72bf4fb6df869a34dfb87f98
 EBUILD plasma-workspace-4.2.1-r1.ebuild 2612 RMD160 b3acde8cbb3a83a61222a38b74ff74783c3b164c SHA1 3009945c3a7bdc9298ed92eda3303db3d72714c8 SHA256 bbcfeef06b595028dbfdc9b89835d4e7f07e2f99b74380185ba335ef93009d55
 EBUILD plasma-workspace-4.2.1.ebuild 2424 RMD160 d4d567434a8d148798aed6ebcee846e6a159961b SHA1 7630234a1735729e13114e0741a54c5089afb4a8 SHA256 7f68417fc645e32d9cce642113954d6f3d9c292983b5fd1c7b3645a6d19d4402
-MISC ChangeLog 2111 RMD160 0234d49c846615c27b50991e621805c104f58dc0 SHA1 db3f7111cef320d37b716b19beeeb8ab2f789d7f SHA256 5d9b48d17af06ff1416e8599cdc8f227cf1340d174e8897c52c52777370e7cb8
+MISC ChangeLog 2221 RMD160 5ffd978b080c016a0f58df86777b98cd56e02192 SHA1 041442a95f30f8c6ae8ba0a1719e75dca8ccee39 SHA256 324adc595734007a5a2fd063e7da402e8187ac15bee0fa2a05cd6fac7584714e
 MISC metadata.xml 232 RMD160 d028fb8b7f2b679b9b9ca34425e9e486613d1214 SHA1 0e593316c91dbc1ebf44fce61ab06fae59e31179 SHA256 56df5d6c9a58e369ad080bca94c3790fbd7d0f83fe90e29eec1e58266e10af8a
diff --git a/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch b/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch
new file mode 100644
index 000000000000..ad6ba1c4654a
--- /dev/null
+++ b/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch
@@ -0,0 +1,42 @@
+--- 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;
+     }