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

[Pierre Schmitz]

    Date: Thursday, June 25, 2009 @ 14:16:16
  Author: pierre
Revision: 43612

upgpkg: qt 4.5.2-1

Modified:
  qt/trunk/PKGBUILD
  qt/trunk/qdoc3.patch

-------------+
 PKGBUILD    |   15 ++++++++-------
 qdoc3.patch |   19 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-06-25 18:15:46 UTC (rev 43611)
+++ PKGBUILD	2009-06-25 18:16:16 UTC (rev 43612)
@@ -22,23 +22,24 @@
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
         'qdoc3.patch')
 md5sums=('28a7e8ac9805a6f614d2a27ee1a6ac9d'
-         '8a7314c43801ea17fde84ea04f30b0ea'
+         '69f190301a06e87b77d00da6422e0ba5'
          'b352b4b70faba2571af3fce5d119580a'
          '491a96682faa03407f768a53cca71db5'
          'cda7ed7e132689991dc2968a0043b4b0'
          '717669b728a0a795217d2f52969e454c'
-         '868056a3edab09fbac0f82ec8b4a4be3')
+         '9c0a0db3569e889a54a6cddcd55c538c')
 
 _create-kdeqt-patches() {
 	local codir=$(mktemp -d)
-	mkdir -p ${codir}/kde-qt{,-patches}
+	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")
-	git format-patch -k "v${pkgver}..${pkgver}-patched" -o kde-qt-patches
+	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
+	bsdtar -cjf "kde-qt-patches-${kdeqtver}.tar.bz2" kde-qt-patches-${kdeqtver}
 	popd
 	mv "${codir}/kde-qt-patches-${kdeqtver}.tar.bz2" .
 	rm -rf "${codir}"
@@ -53,10 +54,10 @@
 	cd $srcdir/$_pkgfqn
 	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

Modified: qdoc3.patch
===================================================================
--- qdoc3.patch	2009-06-25 18:15:46 UTC (rev 43611)
+++ qdoc3.patch	2009-06-25 18:16:16 UTC (rev 43612)
@@ -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
       }