Date: Sunday, February 24, 2013 @ 21:11:32 Author: andrea Revision: 178511
upgpkg: qt4 4.8.4-6 No need to replace the qtwebkit package anymore Modified: qt4/trunk/PKGBUILD Deleted: qt4/trunk/ld-gold.patch ---------------+ PKGBUILD | 19 ++++++------------- ld-gold.patch | 22 ---------------------- 2 files changed, 6 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-02-24 20:03:42 UTC (rev 178510) +++ PKGBUILD 2013-02-24 20:11:32 UTC (rev 178511) @@ -4,7 +4,7 @@ pkgname=qt4 pkgver=4.8.4 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -23,18 +23,16 @@ 'icu: Unicode support') install="${pkgname}.install" options=('!libtool') -replaces=('qt<=4.8.4' 'qtwebkit<=2.3.beta2') -conflicts=('qt<=4.8.4' 'qtwebkit<=2.3.beta2') +replaces=('qt<=4.8.4') +conflicts=('qt<=4.8.4') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz" 'qtconfig.desktop' 'qt4.profile' - 'improve-cups-support.patch' - 'ld-gold.patch') + 'improve-cups-support.patch') md5sums=('89c5ecba180cae74c66260ac732dc5cb' '20ca06ef59775d749b9451ce7437fa9a' '4ed0bd79a310e2b5d34fc71760b99139' - 'c439c7731c25387352d8453ca7574971' - '864de59a34a2f72ab2668dd918634b64') + 'c439c7731c25387352d8453ca7574971') build() { cd ${_pkgfqn} @@ -42,9 +40,6 @@ # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch - # build on i686 fails - patch -p1 -i "${srcdir}"/ld-gold.patch - export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} @@ -68,6 +63,7 @@ -system-sqlite \ -no-phonon \ -no-phonon-backend \ + -no-webkit \ -graphicssystem raster \ -openssl-linked \ -nomake demos \ @@ -118,7 +114,4 @@ rm "${pkgdir}"/usr/lib/qt4/bin/{assistant,designer,linguist} rm -r "${pkgdir}"/usr/lib/qt4/plugins/designer rm "${pkgdir}"/usr/share/qt4/translations/{assistant,designer,linguist,qt_help}_*.qm - - # Remove tests - rm -r "${pkgdir}"/usr/tests } Deleted: ld-gold.patch =================================================================== --- ld-gold.patch 2013-02-24 20:03:42 UTC (rev 178510) +++ ld-gold.patch 2013-02-24 20:11:32 UTC (rev 178511) @@ -1,22 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me 2012-01-24 13:05:50.460890750 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri 2012-01-24 13:19:08.836799974 +0100 -@@ -3,12 +3,12 @@ - contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 - contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 - --linux-g++ { --isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -- message(Using gold linker) -- QMAKE_LFLAGS+=-fuse-ld=gold --} --} -+#linux-g++ { -+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -+# message(Using gold linker) -+# QMAKE_LFLAGS+=-fuse-ld=gold -+#} -+#} - - # We use this flag on production branches - # See https://bugs.webkit.org/show_bug.cgi?id=60824