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

[Eric Bélanger]

    Date: Thursday, August 15, 2013 @ 23:56:52
  Author: eric
Revision: 193085

upgpkg: qt3 1:3.3.8b-6

Rebuild against libmng 2.0.2, Add prepare function

Modified:
  qt3/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-15 20:40:30 UTC (rev 193084)
+++ PKGBUILD	2013-08-15 21:56:52 UTC (rev 193085)
@@ -3,7 +3,7 @@
 
 pkgname=qt3
 pkgver=3.3.8b
-pkgrel=5
+pkgrel=6
 epoch=1
 pkgdesc="A cross-platform application and UI framework"
 arch=('i686' 'x86_64')
@@ -31,13 +31,8 @@
 # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
 # other qt-patches come from fedora and gentoo
 
-build() {
-  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}"/qt-x11-free-${pkgver}
+prepare() {
+  cd qt-x11-free-${pkgver}
   # apply qt patches from kde.org
   for i in ../qt-copy-kde-patches/*; do
     patch -p0 -i $i 
@@ -57,12 +52,20 @@
   sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf
   sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
   sed -i "s|read acceptance|acceptance=yes|" configure
+}
 
+build() {
+  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++
+
   if [ "$CARCH" = "x86_64" ]; then
       export ARCH="-64"	
     else unset ARCH
   fi
 
+  cd qt-x11-free-${pkgver}
   ./configure \
     -prefix /usr \
     -bindir /usr/lib/qt3/bin \
@@ -88,7 +91,7 @@
 }
 
 package() {
-  cd "${srcdir}"/qt-x11-free-${pkgver}
+  cd qt-x11-free-${pkgver}
   make INSTALL_ROOT="${pkgdir}" install
   sed -i -e "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" -e "s|${srcdir}/||g" "${pkgdir}"/usr/lib/*.prl
   rm -rf "${pkgdir}"/usr/share/qt3/{phrasebooks,templates,translations}