[arch-commits] Commit in kdebase-workspace/trunk (2 files)

[Andrea Scarpino]

    Date: Monday, October 4, 2010 @ 08:45:55
  Author: andrea
Revision: 94082

add patch to fix information bar in Dolphin using Oxygen style (FS#21048)

Added:
  kdebase-workspace/trunk/fix-information-bar-size.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   11 ++++++++---
 fix-information-bar-size.patch |   13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-04 12:26:36 UTC (rev 94081)
+++ PKGBUILD	2010-10-04 12:45:55 UTC (rev 94082)
@@ -15,7 +15,7 @@
 #	but nvidia providing libgl does not depend on libxdamage
 depends=('polkit-kde' 'kdepimlibs' 'kdepim-runtime' 'kdebase-runtime' 'qimageblitz'
          'libxcomposite' 'lm_sensors' 'libxklavier' 'libxdamage'
-	 'xorg-utils' 'libxrandr' 'libraw1394' 'libqalculate' 'python2')
+	 'xorg-utils' 'libxrandr' 'libraw1394' 'libqalculate')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 'kdebindings-python' 'docbook-xsl' 'boost')
 replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
 conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
@@ -26,7 +26,8 @@
         'etc/pam.d/kscreensaver')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch')
+        'fixpath.patch' 'terminate-server.patch'
+        'fix-information-bar-size.patch')
 sha1sums=('0a2ef4f3391e94371481226374c609fb52587243'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -34,7 +35,8 @@
           '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+          'f81831251a5e72f6510a2936d05bd4d74c0feacd')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -42,6 +44,9 @@
 	patch -p0 -i ${srcdir}/fixpath.patch
 	patch -p0 -i ${srcdir}/terminate-server.patch
 
+	# Already fixed in 4.5.3
+	patch -Np5 -i ${srcdir}/fix-information-bar-size.patch
+
 	cd ${srcdir}
 	mkdir build
 	cd build

Added: fix-information-bar-size.patch
===================================================================
--- fix-information-bar-size.patch	                        (rev 0)
+++ fix-information-bar-size.patch	2010-10-04 12:45:55 UTC (rev 94082)
@@ -0,0 +1,13 @@
+--- branches/KDE/4.5/kdebase/workspace/kstyles/oxygen/oxygenstyle.cpp	2010/10/02 17:21:35	1181905
++++ branches/KDE/4.5/kdebase/workspace/kstyles/oxygen/oxygenstyle.cpp	2010/10/02 17:23:29	1181906
+@@ -1450,7 +1450,9 @@
+             case ProgressBar::BusyIndicator:
+             {
+ 
+-                if( r.width() < 4 || r.height() < 4 ) return true;
++                if( orientation == Qt::Horizontal && r.width() < 4 ) return true;
++                else if( orientation == Qt::Vertical && r.height() < 4 ) return true;
++
+                 QPixmap pixmap( _helper.progressBarIndicator( pal, rect ) );
+                 p->drawPixmap( rect.adjusted(-1, -2, 0, 0).topLeft(), pixmap );
+                 return true;