diff options
author | root <root@rshg054.dnsready.net> | 2013-10-25 02:08:36 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-10-25 02:08:36 -0700 |
commit | 5a3821aec094b38a412cf5e6997c08b6428d6f77 (patch) | |
tree | 80caf9e8d169d5c43d828ede599cb91fa065d8df /extra/qt4/PKGBUILD | |
parent | 94ded0cb27161b972228cfef8ea2e6f60af0f2b2 (diff) |
Fri Oct 25 02:07:10 PDT 2013
Diffstat (limited to 'extra/qt4/PKGBUILD')
-rw-r--r-- | extra/qt4/PKGBUILD | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index f46993815..807b5477e 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197140 2013-10-22 17:14:15Z andrea $ +# $Id: PKGBUILD 197232 2013-10-24 13:09:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.5 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -32,7 +32,7 @@ source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pk 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' 'improve-cups-support.patch' - 'qtbug-31579.patch' 'qtbug-32534.patch') + 'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch') md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'a16638f4781e56e7887ff8212a322ecc' '8a28b3f52dbeb685d4b69440b520a3e1' @@ -41,7 +41,8 @@ md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'b859c5673e5098c39f72b2252947049e' 'c439c7731c25387352d8453ca7574971' '6ed8d26a8e4a9bba1f6c08fb99cc8357' - 'bb0e0fa6ba953fa590d81ac612374e11') + 'bb0e0fa6ba953fa590d81ac612374e11' + 'db343dcae522bc90d802ad1e83b7f5dd') prepare() { cd ${_pkgfqn} @@ -53,6 +54,8 @@ prepare() { patch -p1 -i "${srcdir}"/qtbug-31579.patch # (FS#36394) (QTBUG#32534) patch -p1 -i "${srcdir}"/qtbug-32534.patch + # (FS#36947) (QTBUG#32908) + patch -p1 -i "${srcdir}"/qtbug-32908.patch 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 |