Date: Saturday, October 30, 2010 @ 08:58:43 Author: andrea Revision: 97469
KDE 4.5.3 Modified: kdebase-workspace/trunk/PKGBUILD Deleted: kdebase-workspace/trunk/fix-information-bar-size.patch --------------------------------+ PKGBUILD | 15 +++++---------- fix-information-bar-size.patch | 13 ------------- 2 files changed, 5 insertions(+), 23 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-10-30 12:58:36 UTC (rev 97468) +++ PKGBUILD 2010-10-30 12:58:43 UTC (rev 97469) @@ -3,8 +3,8 @@ # Contributor: Pierre Schmitz <[email protected]> pkgname=kdebase-workspace -pkgver=4.5.2 -pkgrel=2 +pkgver=4.5.3 +pkgrel=1 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -26,17 +26,15 @@ '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' - 'fix-information-bar-size.patch') -sha1sums=('0a2ef4f3391e94371481226374c609fb52587243' + 'fixpath.patch' 'terminate-server.patch') +sha1sums=('7dda7cdd9162ea7ff9fc2a3ae0a1ded6610e8a94' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'f81831251a5e72f6510a2936d05bd4d74c0feacd') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -44,9 +42,6 @@ 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 Deleted: fix-information-bar-size.patch =================================================================== --- fix-information-bar-size.patch 2010-10-30 12:58:36 UTC (rev 97468) +++ fix-information-bar-size.patch 2010-10-30 12:58:43 UTC (rev 97469) @@ -1,13 +0,0 @@ ---- 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;
