diff options
Diffstat (limited to 'extra/qt/PKGBUILD')
| -rw-r--r-- | extra/qt/PKGBUILD | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 68fb9962e..1491eaf99 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148904 2012-02-05 11:55:04Z ibiru $ +# $Id: PKGBUILD 151653 2012-02-29 18:44:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.0 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -17,34 +17,36 @@ options=('!libtool') _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop' 'declarative-fix-sigbus.patch' - 'fix-qurl.patch') + 'qtconfig.desktop' + 'fix-qgraphicsscene-regression.patch' + 'improved-filter-event.patch' + 'qurl-backward-compatibility.patch' + 'declarative-fix-sigbus.patch') md5sums=('e8a5fdbeba2927c948d9f477a6abe904' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'aac963d05a9d5733e2bfce9e26607f51' - '7bc255a36733d0fbc80c1902ade4beca') + 'c2e91fc028250a590e76effe234468e2' + '444ebeb716d7c7379835efb8aa88e6c8' + '7bc255a36733d0fbc80c1902ade4beca' + 'aac963d05a9d5733e2bfce9e26607f51') build() { cd "${srcdir}"/${_pkgfqn} # MIPS N32-specific fix, shouldn't affect correctness on other platforms. patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch" - # (FS#27757) - patch -p1 -i "${srcdir}"/fix-qurl.patch + # (FS#28707) + patch -p1 -i "${srcdir}"/fix-qgraphicsscene-regression.patch + # (FS#27757) (KDEBUG#275469) + patch -p1 -i "${srcdir}"/improved-filter-event.patch + patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - if [ "${CARCH}" = "mips64el" ] ; then - export CXXFLAGS="${CXXFLAGS} -fpermissive" - # Raster renders incorrectly. - graphicssystem="" - else - graphicssystem="-graphicssystem raster" - fi + [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive" 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 @@ -65,7 +67,7 @@ build() { -no-phonon \ -no-phonon-backend \ -no-webkit \ - $graphicssystem \ + -graphicssystem raster \ -openssl-linked \ -nomake demos \ -nomake examples \ |