qt: update to version 4.5.2

2 files changed, 60 insertions, 25 deletions

diff --git a/abs/core-testing/qt/PKGBUILD b/abs/core-testing/qt/PKGBUILD
index b581564..fec68bc 100644
--- a/abs/core-testing/qt/PKGBUILD
+++ b/abs/core-testing/qt/PKGBUILD
@@ -2,33 +2,49 @@
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qt
-pkgver=4.5.1
-pkgrel=2
-_qtcopyver=958581
+pkgver=4.5.2
+pkgrel=3
+_kdeqtver=2d1727e396d5dca24ae0fb6a45d35ffc1abd0c12
 pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
 url='http://www.qtsoftware.com/'
 license=('GPL3' 'LGPL')
-depends=('libpng' 'mesa' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama' 'libxrender')
+depends=('libpng' 'mesa' 'fontconfig' 'libtiff>=3.8.2-5' 'libmng>=1.0.10-2' 'sqlite3'
+         'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama' 'libxrender')
 optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
-makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'libxfixes')
+makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'libxfixes' 'gtk2')
 provides=("qt4=${pkgver}")
 replaces=('qt4')
 conflicts=('qt4')
 options=('!libtool')
 _pkgfqn="qt-x11-opensource-src-${pkgver}"
-# svn export -r${_qtcopyver} svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches/ qt-copy-patches-${_qtcopyver}
 source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.bz2"
-        "ftp://ftp.archlinux.org/other/qt/qt-copy-patches-${_qtcopyver}.tar.bz2"
+        "ftp://ftp.archlinux.org/other/kde-qt/kde-qt-patches-${_kdeqtver}.tar.bz2"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
         'qdoc3.patch')
-md5sums=('afc43e566341cf3e5ed0bcb974f0c3b2'
-         'b57b08ac7f990f91b85a7b1b1106e36b'
+md5sums=('28a7e8ac9805a6f614d2a27ee1a6ac9d'
+         '4b333add3031f59538629b35858178d9'
          'b352b4b70faba2571af3fce5d119580a'
          '491a96682faa03407f768a53cca71db5'
          'cda7ed7e132689991dc2968a0043b4b0'
          '717669b728a0a795217d2f52969e454c'
-         '868056a3edab09fbac0f82ec8b4a4be3')
+         '9c0a0db3569e889a54a6cddcd55c538c')
+
+_create-kdeqt-patches() {
+	local codir=$(mktemp -d)
+	mkdir -p "${codir}/kde-qt"
+	git clone git://gitorious.org/+kde-developers/qt/kde-qt.git "${codir}/kde-qt"
+	pushd "${codir}/kde-qt"
+	local kdeqtver=$(git --no-pager show --format='%H' "${pkgver}-patched")
+	mkdir "../kde-qt-patches-${kdeqtver}"
+	git format-patch -k "v${pkgver}..${pkgver}-patched" -o "../kde-qt-patches-${kdeqtver}"
+	popd
+	pushd "${codir}"
+	bsdtar -cjf "kde-qt-patches-${kdeqtver}.tar.bz2" kde-qt-patches-${kdeqtver}
+	popd
+	mv "${codir}/kde-qt-patches-${kdeqtver}.tar.bz2" .
+	rm -rf "${codir}"
+}
 
 build() {
 	unset QMAKESPEC
@@ -37,17 +53,17 @@ build() {
 	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
 	cd $srcdir/$_pkgfqn
-	for i in $srcdir/qt-copy-patches-${_qtcopyver}/*; do
+	for i in $srcdir/kde-qt-patches-${_kdeqtver}/*; do
 		echo "applying $i"
-		patch -p0 -i $i || return 1
+		patch -p1 -i $i || return 1
 	done
 
-	patch -p1 -i $srcdir/qdoc3.patch
+	patch -p0 -i $srcdir/qdoc3.patch
 
 	sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
+	sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
 
 	./configure -confirm-license -opensource \
-		-silent \
 		-prefix /usr \
 		-sysconfdir /etc \
 		-plugindir /usr/lib/qt/plugins \
@@ -56,16 +72,32 @@ build() {
 		-docdir /usr/share/doc/qt \
 		-examplesdir /usr/share/doc/qt/examples \
 		-demosdir /usr/share/doc/qt/demos \
-		-no-separate-debug-info \
+		-largefile \
 		-plugin-sql-{psql,mysql,sqlite,odbc} \
 		-system-sqlite \
+		-xmlpatterns \
+		-no-phonon \
+		-svg \
+		-webkit \
+		-scripttools \
+		-system-zlib \
+		-system-libtiff \
+		-system-libpng \
+		-system-libmng \
+		-system-libjpeg \
 		-openssl-linked \
 		-nomake demos \
 		-nomake examples \
 		-nomake docs \
-		-no-phonon \
+		-no-rpath \
+		-silent \
 		-optimized-qmake \
-		-reduce-relocations
+		-dbus \
+		-reduce-relocations \
+		-no-separate-debug-info \
+		-gtkstyle \
+		-opengl \
+		-glib
 
 	make
 	make INSTALL_ROOT=$pkgdir install
diff --git a/abs/core-testing/qt/qdoc3.patch b/abs/core-testing/qt/qdoc3.patch
index 38ae735..c967b6e 100644
--- a/abs/core-testing/qt/qdoc3.patch
+++ b/abs/core-testing/qt/qdoc3.patch
@@ -1,17 +1,20 @@
-diff -up qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro
---- qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3	2009-02-25 15:09:26.000000000 -0600
-+++ qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro	2009-03-04 09:30:05.000000000 -0600
-@@ -106,3 +106,7 @@ win32 {
-         QT_WINCONFIG = debug
-     }    
+--- tools/qdoc3/qdoc3.pro       2009-06-25 17:34:42.000000000 +0200
++++ tools/qdoc3/qdoc3.pro.new   2009-06-25 17:35:42.000000000 +0200
+@@ -8,6 +8,11 @@
+     CONFIG -= build_all
+     CONFIG += release
  }
 +
 +TARGET= qdoc3
 +target.path = $$[QT_INSTALL_BINS]
 +INSTALLS += target
++
+ mac:CONFIG -= app_bundle
+ HEADERS += apigenerator.h \
+            archiveextractor.h \
 diff -up qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/tools.pro
---- qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3	2009-02-25 15:09:27.000000000 -0600
-+++ qt-x11-opensource-src-4.5.0/tools/tools.pro	2009-03-04 09:44:18.000000000 -0600
+--- tools/tools.pro.qdoc3	2009-02-25 15:09:27.000000000 -0600
++++ tools/tools.pro	2009-03-04 09:44:18.000000000 -0600
 @@ -13,6 +13,7 @@ no-png {
           SUBDIRS += designer
       }