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

[Pierre Schmitz]

    Date: Thursday, July 31, 2008 @ 18:42:41
  Author: pierre
Revision: 7381

upgpkg: qt 4.4.1-1

Modified:
  qt/trunk/PKGBUILD
Deleted:
  qt/trunk/ipv6-dns.patch

----------------+
 PKGBUILD       |   25 +++++++++++--------------
 ipv6-dns.patch |   10 ----------
 2 files changed, 11 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-31 22:29:59 UTC (rev 7380)
+++ PKGBUILD	2008-07-31 22:42:41 UTC (rev 7381)
@@ -1,26 +1,26 @@
 # $Id$
 
 pkgname=qt
-pkgver=4.4.0
-pkgrel=7
+pkgver=4.4.1
+pkgrel=1
+_qtcopyver=840171
 pkgdesc="The QT gui toolkit."
 arch=('i686' 'x86_64')
 url="http://www.trolltech.com/products/qt"
 license=('GPL3')
 options=('!libtool')
-depends=('libpng' 'libxi' 'mesa' 'fontconfig' 'libxrandr' 'glib2' 'libtiff' 'libmng')
-optdepends=('libmysqlclient' 'unixodbc' 'sqlite3')
-makedepends=('mysql' 'unixodbc' 'sqlite3')
+depends=('libpng' 'libxi' 'mesa' 'fontconfig' 'libxrandr' 'glib2' 'libtiff' 'libmng' 'sqlite3')
+optdepends=('libmysqlclient' 'unixodbc')
+makedepends=('mysql' 'unixodbc')
 provides=("qt4=${pkgver}")
 replaces=('qt4')
 conflicts=('qt4')
 _pkgfqn=qt-x11-opensource-src-$pkgver
-# svn export svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches/ qt-copy-patches
+# svn export -r -${_qtcopyver} svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches/ qt-copy-patches-${_qtcopyver}
 source=("ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.gz" 
-        'ftp://ftp.archlinux.org/other/qt/qt-copy-patches-838035.tar.bz2'
-        'ipv6-dns.patch')
-md5sums=('f13ad0aa75efad314715930e663bad55' 'e0375497071a54a1ba9090884c3c75c3'
-         '458efa856961bcfc91ab73a5021cd4f9')
+        "ftp://ftp.archlinux.org/other/qt/qt-copy-patches-${_qtcopyver}.tar.bz2")
+md5sums=('b09decad252b5181f300135e3122481d'
+         '9a48c310c89e3e7b0f494b4537f208b2')
 
 build() {
 	unset QMAKESPEC
@@ -29,14 +29,11 @@
 	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
 	cd $srcdir/$_pkgfqn
-	for i in $srcdir/qt-copy-patches/*.diff; do
+	for i in $srcdir/qt-copy-patches-${_qtcopyver}/*.diff; do
 		echo "applying $i"
 		patch -p0 -i $i || return 1
 	done
 	
-	# avoid ipv6 lookups when ipv6 disabled
-	patch -p0 -i $srcdir/ipv6-dns.patch || return 1
-
 	# remove unwanted mkspecs
 	cd mkspecs/
 	find . -maxdepth 1 -regextype posix-egrep -type d ! -regex "./linux.*|./common|./features|./qws" -exec rm -rf "{}" \;

Deleted: ipv6-dns.patch
===================================================================
--- ipv6-dns.patch	2008-07-31 22:29:59 UTC (rev 7380)
+++ ipv6-dns.patch	2008-07-31 22:42:41 UTC (rev 7381)
@@ -1,10 +0,0 @@
---- src/network/kernel/qhostinfo_unix.cpp	2008-04-28 13:11:19.000000000 +0000
-+++ src/network/kernel/qhostinfo_unix.cpp.new	2008-07-22 12:40:32.000000000 +0000
-@@ -167,6 +167,7 @@
-     struct addrinfo hints;
-     memset(&hints, 0, sizeof(hints));
-     hints.ai_family = PF_UNSPEC;
-+    hints.ai_flags = AI_ADDRCONFIG;
- 
-     int result = getaddrinfo(hostName.toLatin1().constData(), 0, &hints, &res);
-     if (result == 0) {