From 46783b68621b6ad45cdd9ed64cfa8cdcfbc6f318 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 8 Jan 2012 23:14:45 +0000
Subject: Sun Jan  8 23:14:45 UTC 2012

---
 multilib/lib32-qt/PKGBUILD | 50 +++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

(limited to 'multilib/lib32-qt')

diff --git a/multilib/lib32-qt/PKGBUILD b/multilib/lib32-qt/PKGBUILD
index 90518ecf5..df9d41c2e 100644
--- a/multilib/lib32-qt/PKGBUILD
+++ b/multilib/lib32-qt/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 55134 2011-09-03 13:56:53Z bluewind $
+# $Id: PKGBUILD 61795 2012-01-07 22:38:21Z bluewind $
 # Maintainer: Florian Pritz <flo@xssn.at>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 _pkgbasename=qt
 pkgname=lib32-$_pkgbasename
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 pkgdesc='A cross-platform application and UI framework (32-bit)'
 arch=('x86_64')
-url='http://qt.nokia.com/'
+url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
 depends=(lib32-{fontconfig,sqlite3,alsa-lib,glib2,dbus-core,openssl}
          lib32-lib{png,tiff,mng,gl,sm,xrandr,xv,xi} $_pkgbasename)
@@ -18,19 +18,24 @@ optdepends=('lib32-libxinerama: Xinerama support'
             'lib32-libxfixes: Xfixes support')
 makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2})
 options=('!libtool')
-_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
-source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz")
-md5sums=('ddf7d83f912cf1283aa066368464fa22')
+_pkgfqn="${_pkgbasename}-everywhere-opensource-src-${pkgver}"
+source=("ftp://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz")
+md5sums=('e8a5fdbeba2927c948d9f477a6abe904')
 
 build() {
-  unset QMAKESPEC
+  cd $srcdir/$_pkgfqn
+
   export QT4DIR=$srcdir/$_pkgfqn
-  export PATH=${QT4DIR}/bin:${PATH}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd $srcdir/$_pkgfqn
-
+  # some of those are likely unnecessary, but I'm too lazy to find and remove them
+  sed -i "/^QMAKE_LINK\s/s|g++|g++ -m32|g" mkspecs/common/g++-base.conf
+  sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/g++-base.conf
+  sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/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} -m32|g" mkspecs/common/gcc-base.conf
+  sed -i "s|-Wl,-O1|-m32 -Wl,-O1|" mkspecs/common/g++-unix.conf
   sed -e "s|-O2|$CXXFLAGS -m32|" \
       -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \
       -e "/^QMAKE_LINK\s/s|g++|g++ -m32|g" \
@@ -45,34 +50,21 @@ build() {
     -datadir /usr/share/qt \
     -translationdir /usr/share/qt/translations \
     -sysconfdir /etc \
-    -largefile \
     -system-sqlite \
-    -xmlpatterns \
     -no-phonon \
     -no-phonon-backend \
-    -svg \
-    -webkit \
-    -script \
-    -scripttools \
-    -system-zlib \
-    -system-libtiff \
-    -system-libpng \
-    -system-libmng \
-    -system-libjpeg \
+    -no-webkit \
+    -graphicssystem raster \
+    -openssl-linked \
     -nomake demos \
     -nomake examples \
     -nomake docs \
     -nomake tools \
-    -no-rpath \
-    -openssl-linked \
     -optimized-qmake \
-    -dbus \
+    -no-rpath \
+    -dbus-linked \
     -reduce-relocations \
-    -no-separate-debug-info \
-    -gtkstyle \
-    -opengl \
-    -no-openvg \
-    -glib
+    -no-openvg
 
   make
 }
-- 
cgit v1.2.3-54-g00ecf