Wed Apr 27 22:24:53 UTC 2011

1 files changed, 25 insertions, 14 deletions

diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index c7f6570e2..6f07433c0 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 114776 2011-03-15 23:09:15Z andrea $
+# $Id: PKGBUILD 120507 2011-04-24 15:55:09Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
@@ -17,7 +17,11 @@ makedepends=('mysql' 'postgresql>=8.2.3' 'unixodbc' 'sqlite3')
 optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
 source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2 qt3-png14.patch qt.profile \
         qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 utf8-bug-qt3.diff \
-	qt-font-default-subst.diff mysql.patch eastern_asian_languagues.diff qt-odbc.patch)
+	    qt-font-default-subst.diff
+        mysql.patch
+        eastern_asian_languagues.diff
+        qt-odbc.patch
+        gcc-4.6.patch)
 options=(!libtool)
 md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
          '1dc671df42b9030dbdf68bb61cd3375e'
@@ -28,7 +32,8 @@ md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
          '9370d82e85f2c799335ed0dcc1d53189'
          '7d40ed1bd40d33d8b9b27a2076a5d22a'
          '616f1f3029cf8375256ad6a406de3549'
-         '2178ca88dfd75a230918593b30eb0dbe')
+         '2178ca88dfd75a230918593b30eb0dbe'
+         '75177de5b08e1efd437c887c6e606c5b')
 
 # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
 # other qt-patches come from fedora and gentoo
@@ -42,24 +47,26 @@ build() {
   cd ${srcdir}/$pkgfqn
   # apply qt patches from kde.org
   for i in ../qt-copy-kde-patches/*; do
-    patch -Np0 -i $i || return 1
+    patch -Np0 -i $i 
   done
   # apply other qt patches and one security fix from debian/gentoo
   for i in ../qt-patches/*; do
-    patch -Np1 -i $i || return 1
+    patch -Np1 -i $i 
   done
   # fix utf8 bug
-  patch -Np0 -i ../utf8-bug-qt3.diff || return 1
+  patch -Np0 -i ../utf8-bug-qt3.diff 
   # fix asia fonts
-  patch -Np0 -i ../qt-font-default-subst.diff || return 1
+  patch -Np0 -i ../qt-font-default-subst.diff 
   # fix segfaults on exit when using mysql DB driver
-  patch -Np0 -i ../mysql.patch || return 1
+  patch -Np0 -i ../mysql.patch 
   # fix CJK font/chars select error (FS#11245)
-  patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1
+  patch -p1 -i ${srcdir}/eastern_asian_languagues.diff 
   # fix build problem against new unixODBC
-  patch -p1 -i ${srcdir}/qt-odbc.patch || return 1
+  patch -p1 -i ${srcdir}/qt-odbc.patch 
+  # fix build with gcc 4.6.0
+  patch -p1 -i ${srcdir}/gcc-4.6.patch
 
-  patch -p0 -i ${srcdir}/qt3-png14.patch || return 1
+  patch -p0 -i ${srcdir}/qt3-png14.patch 
   # start compiling qt
   sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
   rm -rf doc/html examples tutorial
@@ -91,7 +98,7 @@ build() {
   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/uilib/Makefile
 
   cd ${srcdir}/$pkgfqn
-  make -C qmake || return 1
+  make -C qmake 
   cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/mysql
   ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
   cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/psql
@@ -100,7 +107,11 @@ build() {
   cd ${srcdir}/$pkgfqn
   # fix the broken makefiles
   #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgfqn
   make INSTALL_ROOT=${pkgdir} install
   rm -rf ${pkgdir}/opt/qt/{phrasebooks,templates,translations}
   sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" ${pkgdir}/opt/qt/lib/*.prl
@@ -110,7 +121,7 @@ build() {
   rm -f ${pkgdir}/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
 
   # install man pages
-  mkdir -p ${pkgdir}/opt/qt/man
+  install -d -m755 ${pkgdir}/opt/qt/man
   cp -r ${srcdir}/$pkgfqn/doc/man/{man1,man3} ${pkgdir}/opt/qt/man/
 
   install -d -m755 ${pkgdir}/etc/ld.so.conf.d/