From 68e8645dcd1ce619af6d92f3645c43b15bc5ac71 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Jul 2013 00:48:29 -0700 Subject: Wed Jul 3 00:48:29 PDT 2013 --- extra/qt4/PKGBUILD | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'extra/qt4') diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 2ed9bc142..03c78f6df 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185057 2013-05-10 18:09:28Z andrea $ +# $Id: PKGBUILD 189290 2013-07-02 11:12:21Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=qt4 -pkgver=4.8.4 -pkgrel=18 +pkgver=4.8.5 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -14,7 +14,8 @@ depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient' 'mesa-libgl') -optdepends=('postgresql-libs: PostgreSQL driver' +optdepends=('qtchooser: set the default Qt toolkit' + 'postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' 'libfbclient: Firebird/iBase driver' @@ -27,11 +28,11 @@ options=('!libtool') replaces=('qt<=4.8.4') conflicts=('qt') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz" +source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz" 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' 'improve-cups-support.patch') -md5sums=('89c5ecba180cae74c66260ac732dc5cb' +md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'a16638f4781e56e7887ff8212a322ecc' '8a28b3f52dbeb685d4b69440b520a3e1' '9727c406c240990870c905696a8c5bd1' @@ -39,19 +40,27 @@ md5sums=('89c5ecba180cae74c66260ac732dc5cb' 'b859c5673e5098c39f72b2252947049e' 'c439c7731c25387352d8453ca7574971') -build() { +prepare() { cd ${_pkgfqn} # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch - export QT4DIR="${srcdir}"/${_pkgfqn} - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - 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 + cp mkspecs/common/linux{,32}.conf + sed -i "/^QMAKE_LIBDIR\s/s|=|= /usr/lib32|g" mkspecs/common/linux32.conf + sed -i "s|common/linux.conf|common/linux32.conf|" mkspecs/linux-g++-32/qmake.conf +} + +build() { + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + cd ${_pkgfqn} + ./configure -confirm-license -opensource \ -prefix /usr \ -bindir /usr/lib/qt4/bin \ @@ -104,7 +113,7 @@ package() { install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \ "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \ - "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdusviewer-qt4.png + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt4.png install -d "${pkgdir}"/usr/share/applications install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \ -- cgit v1.2.3-54-g00ecf