diff options
Diffstat (limited to 'extra/qt4/PKGBUILD')
| -rw-r--r-- | extra/qt4/PKGBUILD | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 7aeae075b..a35a577f3 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 197232 2013-10-24 13:09:09Z andrea $ +# $Id: PKGBUILD 201436 2013-12-11 15:31:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.5 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') pkgdesc='A cross-platform application and UI framework' depends=('libtiff' 'libpng' 'sqlite' 'ca-certificates' 'dbus' 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng') makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient' 'mesa') optdepends=('qtchooser: set the default Qt toolkit' @@ -36,7 +36,8 @@ source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pk 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' 'improve-cups-support.patch' 'declarative-fix-sigbus.patch' - 'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch') + 'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch' + 'libmng2.patch' 'CVE-2013-4549.patch') md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'a16638f4781e56e7887ff8212a322ecc' '8a28b3f52dbeb685d4b69440b520a3e1' @@ -47,7 +48,9 @@ md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'aac963d05a9d5733e2bfce9e26607f51' '6ed8d26a8e4a9bba1f6c08fb99cc8357' 'bb0e0fa6ba953fa590d81ac612374e11' - 'db343dcae522bc90d802ad1e83b7f5dd') + 'db343dcae522bc90d802ad1e83b7f5dd' + '0ba4ffc9ff1acb9bf8a5f592ba956d48' + '8701bd7445426c1ad5da3ddbd72df6b4') prepare() { cd ${_pkgfqn} @@ -65,6 +68,11 @@ prepare() { # (FS#36947) (QTBUG#32908) patch -p1 -i "${srcdir}"/qtbug-32908.patch + # (FS#38081) + patch -p1 -i "${srcdir}"/CVE-2013-4549.patch + # (QTBUG#34894) + patch -p1 -i "${srcdir}"/libmng2.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 @@ -80,8 +88,6 @@ build() { if [ "${CARCH}" = "mips64el" ]; then export CXXFLAGS="${CXXFLAGS} -fpermissive" - else - extra="-plugin-sql-ibase" fi cd ${_pkgfqn} @@ -113,8 +119,7 @@ build() { -optimized-qmake \ -reduce-relocations \ -dbus-linked \ - -no-openvg \ - $extra + -no-openvg make } |