[arch-commits] Commit in qt/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Tuesday, March 24, 2009 @ 16:46:40
  Author: pierre
Revision: 31157

enable exceptions and update qt-copy-patches

Modified:
  qt/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-24 20:43:41 UTC (rev 31156)
+++ PKGBUILD	2009-03-24 20:46:40 UTC (rev 31157)
@@ -3,8 +3,8 @@
 
 pkgname=qt
 pkgver=4.5.0
-pkgrel=3
-_qtcopyver=936035
+pkgrel=4
+_qtcopyver=942255
 pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
 url='http://www.qtsoftware.com/'
@@ -23,7 +23,7 @@
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
         'qdoc3.patch')
 md5sums=('55e8c74a89e1bc128a5a6f1ff6b8b5ba'
-         'c1847bd4ba2240a849dfe34bb5486d26'
+         '95c2318cf97a4ed72db8baaff8543251'
          'b352b4b70faba2571af3fce5d119580a'
          '491a96682faa03407f768a53cca71db5'
          'cda7ed7e132689991dc2968a0043b4b0'
@@ -39,10 +39,10 @@
 	cd $srcdir/$_pkgfqn
 	for i in $srcdir/qt-copy-patches-${_qtcopyver}/*; do
 		echo "applying $i"
-		patch -p0 -i $i || return 1
+		patch -p0 -i $i
 	done
 
-	patch -p1 -i $srcdir/qdoc3.patch || return 1
+	patch -p1 -i $srcdir/qdoc3.patch
 
 	sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
 
@@ -65,11 +65,10 @@
 		-nomake docs \
 		-no-phonon \
 		-optimized-qmake \
-		-reduce-relocations \
-		-no-exceptions || return 1
+		-reduce-relocations
 
-	make || return 1
-	make INSTALL_ROOT=$pkgdir install || return 1
+	make
+	make INSTALL_ROOT=$pkgdir install
 
 	install -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/pixmaps/assistant.png
 	install -D -m644 tools/linguist/linguist/images/appicon.png ${pkgdir}/usr/share/pixmaps/linguist.png