diff options
Diffstat (limited to 'extra/qt/PKGBUILD')
| -rw-r--r-- | extra/qt/PKGBUILD | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 1bec2cbf5..89e96034f 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122539 2011-05-04 13:21:18Z andrea $ +# $Id: PKGBUILD 125344 2011-05-26 00:12:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.7.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') @@ -17,12 +17,14 @@ options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop') + 'qtconfig.desktop' + 'qtbug-16292.patch') md5sums=('49b96eefb1224cc529af6fe5608654fe' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd') + '6b771c8a81dd90b45e8a79afa0e5bbfd' + 'dc7ed8c2e8c68a175f7f05a34dccc937') build() { unset QMAKESPEC @@ -31,6 +33,9 @@ build() { export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} cd $srcdir/$_pkgfqn + + # Already fixed upstream + patch -p1 -i "${srcdir}"/qtbug-16292.patch sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf |