From: Mirko Vogt <mirko@openwrt.org>
Date: Sat, 17 Jul 2010 17:43:32 +0000 (+0000)
Subject: qt4: avoiding the use of member variable <defname> of struct <__res_state>, as it... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3ce96de1ab7eb5776fa1adf2f5a3d7a16f2ad232;p=openwrt%2Fsvn-archive%2Fpackages.git

qt4: avoiding the use of member variable <defname> of struct <__res_state>, as it's disabled in uclibc, bloated and deprecated anyway <dnsrch[i]> should contain the domain name(s) - however more verification is needed, whether <dnsrch[i]> is an appropriate replacement for <defdname>

SVN-Revision: 22262
---

diff --git a/Xorg/lib/qt4/patches/100-do_not_use_res.defdname.patch b/Xorg/lib/qt4/patches/100-do_not_use_res.defdname.patch
index 57c3a540a..0b2d0ef3b 100644
--- a/Xorg/lib/qt4/patches/100-do_not_use_res.defdname.patch
+++ b/Xorg/lib/qt4/patches/100-do_not_use_res.defdname.patch
@@ -9,3 +9,27 @@
      resolveLibrary();
      if (local_res_ninit) {
          // using thread-safe version
+--- qt-everywhere-opensource-src-4.7.0-beta1/src/qt3support/network/q3dns.cpp	2010-05-04 02:43:25.000000000 +0200
++++ qt-everywhere-opensource-src-4.7.0-beta1/src/qt3support/network/q3dns.cpp.new	2010-06-20 14:43:48.565315801 +0200
+@@ -2499,8 +2499,8 @@
+ 		break;
+ 	}
+ #  endif
+-	if ( *res.defdname )
+-	    theDomains->append( QString::fromLatin1( res.defdname ).lower().local8Bit() );
++//	if ( *res.defdname )
++//	    theDomains->append( QString::fromLatin1( res.defdname ).lower().local8Bit() );
+ #else
+ 	res_init();
+ 	int i;
+@@ -2515,8 +2515,8 @@
+ 		break;
+ 	}
+ #  endif
+-	if ( *_res.defdname )
+-	    theDomains->append( QString::fromLatin1( _res.defdname ).lower().local8Bit() );
++//	if ( *_res.defdname )
++//	    theDomains->append( QString::fromLatin1( _res.defdname ).lower().local8Bit() );
+ #endif
+ 
+ 	// the code above adds "0.0.0.0" as a name server at the slightest