summaryrefslogtreecommitdiff
path: root/extra/qt
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-09-02 23:14:49 +0000
committerroot <root@rshg054.dnsready.net>2011-09-02 23:14:49 +0000
commitb37ee9de1a430956d9e5958ebd9d7e0dbfc79327 (patch)
tree087dd7d26bea36f9b3b7c485f9e8e8251cbe0423 /extra/qt
parenteb3d40c72c9dd19f6a5ef79b41e9d8ba73ccd928 (diff)
Fri Sep 2 23:14:49 UTC 2011
Diffstat (limited to 'extra/qt')
-rw-r--r--extra/qt/PKGBUILD17
1 files changed, 6 insertions, 11 deletions
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 44a2cff98..54f406960 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 126981 2011-06-09 07:23:06Z andrea $
+# $Id: PKGBUILD 136831 2011-09-01 23:43:27Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.3
-pkgrel=3
+pkgver=4.7.4
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
license=('GPL3' 'LGPL')
@@ -17,14 +17,12 @@ options=('!libtool')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
- 'qtconfig.desktop'
- 'qtbug-16292.patch')
-md5sums=('49b96eefb1224cc529af6fe5608654fe'
+ 'qtconfig.desktop')
+md5sums=('ddf7d83f912cf1283aa066368464fa22'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'dc7ed8c2e8c68a175f7f05a34dccc937')
+ '6b771c8a81dd90b45e8a79afa0e5bbfd')
build() {
unset QMAKESPEC
@@ -37,9 +35,6 @@ build() {
cd $srcdir/$_pkgfqn
- # Already fixed upstream
- patch -p1 -i "${srcdir}"/qtbug-16292.patch
-
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf