From f0fee13952cdf846f3d0da11d21eeb0e7c4fd7d4 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 28 Aug 2013 00:40:36 +0000
Subject: [PATCH] extra/qt3 to 3.3.8b-6

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

diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index c15de2324..284fb6bc2 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -11,7 +11,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')
@@ -39,13 +39,8 @@ sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
 # 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 
@@ -67,12 +62,20 @@ build() {
   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 \
@@ -98,7 +101,7 @@ build() {
 }
 
 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}