Thu Dec 22 23:15:04 UTC 2011

1 files changed, 37 insertions, 47 deletions

diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index c0e86f867..c0e85d265 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,55 +1,45 @@
-# $Id: PKGBUILD 123699 2011-05-12 15:47:03Z andrea $
-# Maintainer:
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
+# $Id: PKGBUILD 145341 2011-12-21 20:47:33Z andrea $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=qt3
 pkgver=3.3.8
-pkgrel=20
+pkgrel=21
 pkgdesc="The QT3 gui toolkit"
 arch=('i686' 'x86_64')
-license=('GPL')
 url="http://www.trolltech.com/products/qt/index.html"
-pkgfqn=qt-x11-free-${pkgver}
-install=qt.install
+license=('GPL')
 depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft'
          'libxrandr' 'libmng')
 makedepends=('mysql' 'postgresql' '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
-        gcc-4.6.patch)
-options=(!libtool)
-md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
-         '1dc671df42b9030dbdf68bb61cd3375e'
-         'f72d1eb4eb49b9a9467c1f6035194266'
-         'f2a2dbdbfee9422c90efc3ef3f86197c'
-         '2f00e5c0c1e2c2a23dddc982cd79f3e0'
-         'f6b3b39040f2b8f19ba1cf1445468c28'
-         '9370d82e85f2c799335ed0dcc1d53189'
-         '7d40ed1bd40d33d8b9b27a2076a5d22a'
-         '616f1f3029cf8375256ad6a406de3549'
-         '2178ca88dfd75a230918593b30eb0dbe'
-         '75177de5b08e1efd437c887c6e606c5b')
+options=('!libtool')
+install=qt.install
+source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2
+        qt.profile qt3-png14.patch 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 gcc-4.6.patch)
+sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7'
+          'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
+          'c8ea644266f4d6d6be9adf894f03138b8eca3fc2'
+          '9cb2e5bec782069692ee337cfa171539d9d73753'
+          '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
+          'ca5ecb29c7f1c826d48703339a3371038e306bb7'
+          'd928ff55adb52c4bab2fb268df022651551cd70c'
+          'bb6aad81cce143c23ff7840b1d79f6b2007a0c04'
+          '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17'
+          '1346320614f6f86fbeb10b9fbad721dea29f5b61'
+          'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f')
 
 # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
 # other qt-patches come from fedora and gentoo
 
 build() {
   unset QMAKESPEC
-  export QTDIR="${srcdir}"/$pkgfqn
+  export QTDIR="${srcdir}"/qt-x11-free-${pkgver}
   export PATH=${QTDIR}/bin:${PATH}
   export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
   export QMAKESPEC=$QTDIR/mkspecs/linux-g++
-  cd "${srcdir}"/$pkgfqn
+  cd "${srcdir}"/qt-x11-free-${pkgver}
   # apply qt patches from kde.org
   for i in ../qt-copy-kde-patches/*; do
     patch -Np0 -i $i 
@@ -105,30 +95,30 @@ build() {
     -plugin-sql-{mysql,psql,sqlite,odbc}
 
   # fix /opt/qt/lib path
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/src/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/designer/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/editor/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/assistant/lib/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/$pkgfqn/tools/designer/uilib/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile
 
-  cd "${srcdir}"/$pkgfqn
+  cd "${srcdir}"/qt-x11-free-${pkgver}
   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
-  "${srcdir}"/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
+  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql
+  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
+  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql
+  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
 
-  cd "${srcdir}"/$pkgfqn
+  cd "${srcdir}"/qt-x11-free-${pkgver}
   # fix the broken makefiles
   #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
   make
 }
 
 package() {
-  cd "${srcdir}"/$pkgfqn
+  cd "${srcdir}"/qt-x11-free-${pkgver}
   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
+  sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
   install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake
   install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh
   ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config 
@@ -136,7 +126,7 @@ package() {
 
   # install man pages
   install -d -m755 "${pkgdir}"/opt/qt/man
-  cp -r "${srcdir}"/$pkgfqn/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
+  cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
 
   install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
   echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf