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

[Andrea Scarpino]

    Date: Tuesday, July 2, 2013 @ 13:12:11
  Author: andrea
Revision: 189289

upgpkg: qt4 4.8.5-1

Upstream release; Fix 32bit build on x86_64 (FS#35568)

Modified:
  qt4/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-02 09:20:23 UTC (rev 189288)
+++ PKGBUILD	2013-07-02 11:12:11 UTC (rev 189289)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=qt4
-pkgver=4.8.4
-pkgrel=18
+pkgver=4.8.5
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -28,11 +28,11 @@
 replaces=('qt<=4.8.4')
 conflicts=('qt')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
-source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
+source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz"
         'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
         'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
         'improve-cups-support.patch')
-md5sums=('89c5ecba180cae74c66260ac732dc5cb'
+md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
          'a16638f4781e56e7887ff8212a322ecc'
          '8a28b3f52dbeb685d4b69440b520a3e1'
          '9727c406c240990870c905696a8c5bd1'
@@ -40,19 +40,27 @@
          'b859c5673e5098c39f72b2252947049e'
          'c439c7731c25387352d8453ca7574971')
 
-build() {
+prepare() {
   cd ${_pkgfqn}
 
   # (FS#28381) (KDEBUG#180051)
   patch -p1 -i "${srcdir}"/improve-cups-support.patch
 
-  export QT4DIR="${srcdir}"/${_pkgfqn}
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
   sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
   sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
   sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
 
+  cp mkspecs/common/linux{,32}.conf
+  sed -i "/^QMAKE_LIBDIR\s/s|=|= /usr/lib32|g" mkspecs/common/linux32.conf
+  sed -i "s|common/linux.conf|common/linux32.conf|" mkspecs/linux-g++-32/qmake.conf
+}
+
+build() {
+  export QT4DIR="${srcdir}"/${_pkgfqn}
+  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+  
+  cd ${_pkgfqn}
+
   ./configure -confirm-license -opensource \
     -prefix /usr \
     -bindir /usr/lib/qt4/bin \