rpms/kdebase-workspace/devel kdebase-workspace-4.2.1-kde#185585.patch, NONE, 1.1 kdebase-workspace.spec, 1.200, 1.201

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10767

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.1-kde#185585.patch 
Log Message:
* Thu Mar 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-7
- fix quicklauch (kdebug#185585,rh#489769)
- -wallpapers: make noarch (f11+, for now)


kdebase-workspace-4.2.1-kde#185585.patch:

--- NEW FILE kdebase-workspace-4.2.1-kde#185585.patch ---
Index: plasma/applets/quicklaunch/quicklaunchApplet.cpp
===================================================================
--- plasma/applets/quicklaunch/quicklaunchApplet.cpp	(revision 923295)
+++ plasma/applets/quicklaunch/quicklaunchApplet.cpp	(working copy)
@@ -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;
     }


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- kdebase-workspace.spec	10 Mar 2009 13:29:02 -0000	1.200
+++ kdebase-workspace.spec	12 Mar 2009 15:36:46 -0000	1.201
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.1
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -46,6 +46,8 @@
 Patch104: kdebase-workspace-4.2.1-kde#185736.patch
 #Â 4.3, https://bugs.kde.org/show_bug.cgi?id=184152
 Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
+# 4.2, http://bugs.kde.org/185585
+Patch106: kdebase-workspace-4.2.1-kde#185585.patch
 
 Provides: kdebase-kdm = 6:%{version}-%{release}
 Provides: kdm = %{version}-%{release}
@@ -164,6 +166,9 @@
 Summary: KDE wallpapers
 Group: User Interface/Desktops
 Requires: kde-filesystem
+%if 0%{?fedora} > 10
+BuildArch: noarch
+%endif
 %description wallpapers
 %{summary}.
 
@@ -228,6 +233,7 @@
 %patch103 -p1 -b .kde#180576
 %patch104 -p5 -b .kde#185736
 %patch105 -p0 -b .desktopnumbers
+%patch106 -p0 -b .kde#185585
 
 %build
 
@@ -376,6 +382,10 @@
 
 
 %changelog
+* Thu Mar 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-7
+- fix quicklauch (kdebug#185585,rh#489769)
+- -wallpapers: make noarch (f11+, for now)
+
 * Tue Mar 10 2009 Than Ngo <than at redhat.com> - 4.2.1-6
 - fix konsole patch to use invokeTerminal