diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-03 16:10:12 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-03 16:10:12 -0300 |
| commit | 037bcb846a6662420bd0f5d1edaad58bda4c86a7 (patch) | |
| tree | 82494884d013c7b2cc9cd5df16c54cae0712d472 /extra/qt4/PKGBUILD | |
| parent | 830afd54d0d990fdb982292bed4c97f577dc195d (diff) | |
| parent | 3aa73e2018f321c9ccff8eca801b1c2fa9f18fa8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/darkhttpd/PKGBUILD
community/gnome-panel/PKGBUILD
community/gpicview/PKGBUILD
community/iftop/PKGBUILD
community/lazarus/PKGBUILD
community/netsurf/PKGBUILD
community/polkit-gnome/PKGBUILD
community/texvc/PKGBUILD
community/unbound/PKGBUILD
community/xfmedia/PKGBUILD
core/glibc/PKGBUILD
extra/arora/PKGBUILD
extra/cairo/PKGBUILD
extra/graphviz/PKGBUILD
extra/libmng/PKGBUILD
extra/mesa/PKGBUILD
extra/nx/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/sqlite/PKGBUILD
libre/midori-libre/PKGBUILD
~fauno/distccd-zeroconf/PKGBUILD
~fauno/kyotocabinet/PKGBUILD
~fauno/kyototycoon/PKGBUILD
Diffstat (limited to 'extra/qt4/PKGBUILD')
| -rw-r--r-- | extra/qt4/PKGBUILD | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index c46a82e66..7d211fa6a 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 189290 2013-07-02 11:12:21Z andrea $ +# $Id: PKGBUILD 193688 2013-08-28 00:06:07Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' -license=('GPL3' 'LGPL') +license=('GPL3' 'LGPL' 'FDL' 'custom') pkgdesc='A cross-platform application and UI framework' depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus' 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' @@ -35,7 +35,8 @@ 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' - 'declarative-fix-sigbus.patch') + 'declarative-fix-sigbus.patch' + 'qtbug-31579.patch' 'qtbug-32534.patch') md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'a16638f4781e56e7887ff8212a322ecc' '8a28b3f52dbeb685d4b69440b520a3e1' @@ -43,7 +44,9 @@ md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' '0e384663d3dd32abe35f5331c4147569' 'b859c5673e5098c39f72b2252947049e' 'c439c7731c25387352d8453ca7574971' - 'aac963d05a9d5733e2bfce9e26607f51') + 'aac963d05a9d5733e2bfce9e26607f51' + '6ed8d26a8e4a9bba1f6c08fb99cc8357' + 'bb0e0fa6ba953fa590d81ac612374e11') prepare() { cd ${_pkgfqn} @@ -54,6 +57,11 @@ prepare() { # MIPS N32-specific fix, shouldn't affect correctness on other platforms. patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch" + # (FS#36028) (QTBUG#31579) + patch -p1 -i "${srcdir}"/qtbug-31579.patch + # (FS#36394) (QTBUG#32534) + patch -p1 -i "${srcdir}"/qtbug-32534.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 sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf |