From a0a367c302376227ba54cf367e176b6dfbdc130d Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Sat, 10 Oct 2009 22:46:11 +0200
Subject: [PATCH] disable a disturbing build mechanism which is unnecessary
 when cross compiling in package qt

---
 src/qt-win32.patch | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/qt-win32.patch b/src/qt-win32.patch
index b1774163..ec16fdcb 100644
--- a/src/qt-win32.patch
+++ b/src/qt-win32.patch
@@ -43,7 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
      fi
  
      # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-@@ -5035,7 +5039,9 @@
+@@ -5035,7 +5037,9 @@
              echo " You might need to modify the include and library search paths by editing"
              echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
              echo " ${XQMAKESPEC}."
@@ -54,7 +54,25 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
          fi
          case "$PLATFORM" in
          hpux*)
-@@ -7594,7 +7600,11 @@
+@@ -6087,11 +6091,12 @@
+     QT_CONFIG="$QT_CONFIG freetype"
+ fi
+ 
+-if [ "x$PLATFORM_MAC" = "xyes" ]; then
+-    #On Mac we implicitly link against libz, so we
+-    #never use the 3rdparty stuff.
+-    [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
+-fi
++# We're cross compiling, so we respect the user setting.
++#if [ "x$PLATFORM_MAC" = "xyes" ]; then
++#    #On Mac we implicitly link against libz, so we
++#    #never use the 3rdparty stuff.
++#    [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
++#fi
+ if [ "$CFG_ZLIB" = "yes" ]; then
+     QT_CONFIG="$QT_CONFIG zlib"
+ elif [ "$CFG_ZLIB" = "system" ]; then
+@@ -7594,7 +7599,11 @@
          [ "$IN_ROOT" = "no" ] && continue
  
          case $a in