[arch-commits] CVS update of extra/lib/qt (PKGBUILD)

[Pierre Schmitz]

    Date: Sunday, March 30, 2008 @ 12:14:07
  Author: pierre
    Path: /home/cvs-extra/extra/lib/qt

Modified: PKGBUILD (1.40 -> 1.41)

upgpkg: qt 4.3.4-1
    updated to 4.3.4; added gcc-4.3 patch; removed kde-patches


----------+
 PKGBUILD |   29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)


Index: extra/lib/qt/PKGBUILD
diff -u extra/lib/qt/PKGBUILD:1.40 extra/lib/qt/PKGBUILD:1.41
--- extra/lib/qt/PKGBUILD:1.40	Thu Jan 24 13:58:09 2008
+++ extra/lib/qt/PKGBUILD	Sun Mar 30 12:14:07 2008
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.40 2008/01/24 18:58:09 pierre Exp $
+# $Id: PKGBUILD,v 1.41 2008/03/30 16:14:07 pierre Exp $
 # Contributer: Vinay S Shastry (vinayshastry at gmail.com)
 pkgname=qt
-pkgver=4.3.3
-pkgrel=4
+pkgver=4.3.4
+pkgrel=1
 pkgdesc="The QT gui toolkit."
 arch=('i686' 'x86_64')
 url="http://www.trolltech.com/products/qt"
@@ -15,9 +15,14 @@
 replaces=('qt4')
 conflicts=('qt4')
 _pkgfqn=qt-x11-opensource-src-$pkgver
-source=(ftp://ftp.trolltech.com/qt/source/$_pkgfqn.tar.gz \
-        ftp://ftp.archlinux.org/other/qt/qt-copy-kde-patches.tar.bz2 \
-        qt4-assistant.desktop  qt4-designer.desktop qt4-linguist.desktop )
+source=("ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.gz" \
+        'qt-x11-opensource-src-4.3.4-aliasing.patch' \
+        'qt4-assistant.desktop' 'qt4-designer.desktop' 'qt4-linguist.desktop')
+md5sums=('9499101ec54eb7b0de195b3c5e3ffa93'
+         '73871785cfc4c0271eca59e658ab3a44'
+         '67adab60dd87270e733d25552a826950'
+         '40a36635b14c32bd2923e408c2e877bf'
+         'cd6e1c951e079e2eace67bce5e63966c')
 
 build() {
   unset QMAKESPEC
@@ -26,10 +31,7 @@
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
   cd $startdir/src/$_pkgfqn
 
-  # patches from qt-copy (http://websvn.kde.org/trunk/qt-copy/patches/)
-  for i in ../qt-copy-kde-patches/* ; do
-    patch -Np0 -i $i || return 1
-  done
+  patch -p1 -i ../qt-x11-opensource-src-4.3.4-aliasing.patch || return 1
 
   # remove docs
   rm -rf doc
@@ -80,9 +82,4 @@
   #sed -i -e "s|-L$startdir/src/${_pkgfqn}/lib||g" $startdir/pkg/usr/lib/*.prl $startdir/pkg/usr/share/doc/qt/demos/shared/libdemo_shared.prl
   sed -i -e "s|$startdir/src/${_pkgfqn}/bin/moc|/usr/bin/moc|g" $startdir/pkg/usr/lib/pkgconfig/*.pc
   sed -i -e "s|$startdir/src/${_pkgfqn}/bin/uic|/usr/bin/uic|g" $startdir/pkg/usr/lib/pkgconfig/*.pc
-}
-md5sums=('19678fe35170559cd6a6fa531c57799c'
-         'a8f21e87f7ccba4107ba06aa5c6eac25'
-         '67adab60dd87270e733d25552a826950'
-         '40a36635b14c32bd2923e408c2e877bf'
-         'cd6e1c951e079e2eace67bce5e63966c')
+}
\ No newline at end of file