[arch-commits] Commit in qt/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Thursday, June 25, 2009 @ 11:09:14
  Author: pierre
Revision: 43583

prepare 4.5.2 update

Modified:
  qt/trunk/PKGBUILD

----------+
 PKGBUILD |   30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-06-25 15:01:12 UTC (rev 43582)
+++ PKGBUILD	2009-06-25 15:09:14 UTC (rev 43583)
@@ -2,9 +2,9 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=qt
-pkgver=4.5.1
-pkgrel=3
-_qtcopyver=979410
+pkgver=4.5.2
+pkgrel=1
+_kdeqtver=766bf1d15ff245e186aae19b9152c0506125ec2f
 pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
 url='http://www.qtsoftware.com/'
@@ -17,19 +17,33 @@
 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'
-         'e72e384c846186846d3c0d81b7f3dda5'
+md5sums=('28a7e8ac9805a6f614d2a27ee1a6ac9d'
+         '8a7314c43801ea17fde84ea04f30b0ea'
          'b352b4b70faba2571af3fce5d119580a'
          '491a96682faa03407f768a53cca71db5'
          'cda7ed7e132689991dc2968a0043b4b0'
          '717669b728a0a795217d2f52969e454c'
          '868056a3edab09fbac0f82ec8b4a4be3')
 
+_create-kdeqt-patches() {
+	local codir=$(mktemp -d)
+	mkdir -p ${codir}/kde-qt{,-patches}
+	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")
+	git format-patch -k "v${pkgver}..${pkgver}-patched" -o kde-qt-patches
+	popd
+	pushd "${codir}"
+	bsdtar -cjf "kde-qt-patches-${kdeqtver}.tar.bz2" kde-qt-patches
+	popd
+	mv "${codir}/kde-qt-patches-${kdeqtver}.tar.bz2" .
+	rm -rf "${codir}"
+}
+
 build() {
 	unset QMAKESPEC
 	export QT4DIR=$srcdir/$_pkgfqn
@@ -37,7 +51,7 @@
 	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
 	done