[arch-commits] Commit in qt/repos (extra-i686 extra-i686/PKGBUILD)

[Pierre Schmitz]

    Date: Monday, August 11, 2008 @ 19:03:10
  Author: pierre
Revision: 8462

Merged revisions 7386-8461 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/qt/trunk

........
  r8458 | pierre | 2008-08-11 22:14:38 +0000 (Mo, 11 Aug 2008) | 1 line
  
  fixing FS#8513
........

Modified:
  qt/repos/extra-i686/	(properties)
  qt/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


Property changes on: qt/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /qt/trunk:1-7385
   + /qt/trunk:1-8461

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-08-11 22:58:12 UTC (rev 8461)
+++ extra-i686/PKGBUILD	2008-08-11 23:03:10 UTC (rev 8462)
@@ -2,7 +2,7 @@
 
 pkgname=qt
 pkgver=4.4.1
-pkgrel=1
+pkgrel=2
 _qtcopyver=840171
 pkgdesc="The QT gui toolkit."
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@
 conflicts=('qt4')
 _pkgfqn=qt-x11-opensource-src-$pkgver
 # svn export -r -${_qtcopyver} svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches/ qt-copy-patches-${_qtcopyver}
-source=("ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.gz" 
+source=("ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.gz"
         "ftp://ftp.archlinux.org/other/qt/qt-copy-patches-${_qtcopyver}.tar.bz2")
 md5sums=('b09decad252b5181f300135e3122481d'
          '9a48c310c89e3e7b0f494b4537f208b2')
@@ -29,11 +29,11 @@
 	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
 	cd $srcdir/$_pkgfqn
-	for i in $srcdir/qt-copy-patches-${_qtcopyver}/*.diff; do
+	for i in $srcdir/qt-copy-patches-${_qtcopyver}/*; do
 		echo "applying $i"
 		patch -p0 -i $i || return 1
 	done
-	
+
 	# remove unwanted mkspecs
 	cd mkspecs/
 	find . -maxdepth 1 -regextype posix-egrep -type d ! -regex "./linux.*|./common|./features|./qws" -exec rm -rf "{}" \;