rpms/kdebase-runtime/F-9 kdebase-runtime-4.2.3-kde#186340.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 kdebase-runtime.spec, 1.70, 1.71 kdebase-runtime-4.2.2-persistent_notify.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30693

Modified Files:
	.cvsignore kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.2.3-kde#186340.patch 
Removed Files:
	kdebase-runtime-4.2.2-persistent_notify.patch 
Log Message:
* Tue May 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
- toolbar text under icons cut off (kde#186340)


kdebase-runtime-4.2.3-kde#186340.patch:

--- NEW FILE kdebase-runtime-4.2.3-kde#186340.patch ---
diff -up kdebase-runtime-4.2.3/kstyles/oxygen/oxygen.cpp.kde#186340 kdebase-runtime-4.2.3/kstyles/oxygen/oxygen.cpp
--- kdebase-runtime-4.2.3/kstyles/oxygen/oxygen.cpp.kde#186340	2009-04-30 04:11:54.000000000 -0500
+++ kdebase-runtime-4.2.3/kstyles/oxygen/oxygen.cpp	2009-05-12 10:43:10.253144149 -0500
@@ -3055,7 +3055,8 @@ QSize OxygenStyle::sizeFromContents(Cont
 
             if (const QStyleOptionToolButton* tbOpt = qstyleoption_cast<const QStyleOptionToolButton*>(option)) {
                 if ((!tbOpt->icon.isNull()) && (!tbOpt->text.isEmpty()) && tbOpt->toolButtonStyle == Qt::ToolButtonTextUnderIcon)
-                    size.setHeight(size.height()-9);
+                    // TODO: Make this font size dependent
+                    size.setHeight(size.height()-5);
             }
 
             // We want to avoid super-skiny buttons, for things like "up" when icons + text


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	1 Apr 2009 23:17:00 -0000	1.19
+++ .cvsignore	12 May 2009 19:25:32 -0000	1.20
@@ -1 +1 @@
-kdebase-runtime-4.2.2.tar.bz2
+kdebase-runtime-4.2.3.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- kdebase-runtime.spec	6 May 2009 12:25:44 -0000	1.70
+++ kdebase-runtime.spec	12 May 2009 19:25:32 -0000	1.71
@@ -8,7 +8,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.3
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -23,6 +23,8 @@ Patch2:        kdebase-runtime-4.1.1-kne
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 
 ## Upstream patches
+# http://bugs.kde.org/186340
+Patch100: kdebase-runtime-4.2.3-kde#186340.patch
 
 #ifarch noarch
 ## icons now provided by standalone oxygen-icon-theme
@@ -127,6 +129,7 @@ BuildArch: noarch
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
+%patch100 -p1 -b .kde#186340
 
 
 %build
@@ -387,6 +390,9 @@ fi
 
 
 %changelog
+* Tue May 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
+- toolbar text under icons cut off (kde#186340)
+
 * Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
 - 4.2.3
 


--- kdebase-runtime-4.2.2-persistent_notify.patch DELETED ---