merge of 945d26824bc94348e306d9812e110b32ec79fcd9

     and cbbc5114b1d187a53a4373cf2183c825d68cd1eb

4 files changed, 160 insertions, 0 deletions

diff --git a/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty b/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty
diff --git a/packages/qt/qt-x11-free-4.0.1/cross-compile.patch b/packages/qt/qt-x11-free-4.0.1/cross-compile.patch
new file mode 100644
index 0000000000..39d095d7a0
--- /dev/null
+++ b/packages/qt/qt-x11-free-4.0.1/cross-compile.patch
@@ -0,0 +1,128 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-opensource-src-4.0.1/configure~cross-compile
++++ qt-x11-opensource-src-4.0.1/configure
+@@ -477,7 +477,7 @@
+             UNKNOWN_ARG=yes
+         fi
+         ;;
+-    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey)
++    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-crossarch)
+         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+         shift
+         VAL=$1
+@@ -768,6 +768,9 @@
+     xplatform)
+         XPLATFORM="$VAL"
+         ;;
++    crossarch)
++        CROSSARCH="$VAL"
++        ;;
+     debug-and-release)
+         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+             CFG_DEBUG_RELEASE="$VAL"
+@@ -1649,100 +1652,7 @@
+     echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)"
+ fi
+ 
+-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
+-    case "$CFG_EMBEDDED" in
+-    x86)
+-        ARCH=i386
+-        ;;
+-    ipaq|sharp)
+-        ARCH=arm
+-        ;;
+-    *)
+-        ARCH="$CFG_EMBEDDED"
+-        ;;
+-    esac
+-else
+-    case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
+-    IRIX*:*:*)
+-        ARCH=`uname -p`
+-        if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    SGI ($ARCH)"
+-        fi
+-        ;;
+-    SunOS:5*:sun4*)
+-        if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    Sun SPARC (sparc)"
+-        fi
+-        ARCH=sparc
+-        ;;
+-    Darwin:*:Power?Macintosh)
+-        if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    32-bit Apple PowerPC (powerpc)"
+-        fi
+-        ARCH=powerpc
+-        ;;
+-    Darwin:*:x86)
+-        if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    32-bit Apple Intel (x86)"
+-        fi
+-        ARCH=i386
+-        ;;
+-    AIX:*:00????????00)
+-        if [ "$OPT_VERBOSE" = "yes" ]; then
+-        echo "    64-bit IBM PowerPC (powerpc)"
+-        fi
+-        ARCH=powerpc
+-        ;;
+-    HP-UX:*:9000*)
+-        if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    HP PA-RISC (parisc)"
+-        fi
+-        ARCH=parisc
+-        ;;
+-    *:*:i?86)
+-        if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    32-bit Intel 80x86 (i386)"
+-        fi
+-        ARCH=i386
+-        ;;
+-    *:*:x86_64)
+-        if [ "$PLATFORM" = "linux-g++-32" ]; then
+-            if [ "$OPT_VERBOSE" = "yes" ]; then
+-                echo "    32 bit on 64-bit AMD 80x86 (i386)"
+-            fi
+-            ARCH=i386
+-        else
+-            if [ "$OPT_VERBOSE" = "yes" ]; then
+-                echo "    64-bit AMD 80x86 (x86_64)"
+-            fi
+-            ARCH=x86_64
+-        fi
+-        ;;
+-    *:*:ppc)
+-        if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    32-bit PowerPC (powerpc)"
+-        fi
+-        ARCH=powerpc
+-        ;;
+-    *:*:*)
+-        if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    Trying '$UNAME_MACHINE'..."
+-        fi
+-        ARCH="$UNAME_MACHINE"
+-        ;;
+-    esac
+-fi
+-
+-if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then
+-    if [ "$OPT_VERBOSE" = "yes" ]; then
+-        echo "    '$ARCH' is supported"
+-    fi
+-else
+-    if [ "$OPT_VERBOSE" = "yes" ]; then
+-        echo "    '$ARCH' is unsupported, using 'generic'"
+-    fi
+-    ARCH=generic
+-fi
++ARCH="$CROSSARCH"
+ 
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+         echo "System architecture: '$ARCH'"
diff --git a/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch b/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch
new file mode 100644
index 0000000000..bc30cab216
--- /dev/null
+++ b/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-opensource-src-4.0.1/src/qt3support/network/q3dns.cpp~fix-resinit-declaration
++++ qt-x11-opensource-src-4.0.1/src/qt3support/network/q3dns.cpp
+@@ -30,7 +30,7 @@
+ # include <netinet/in.h>
+ # include <arpa/nameser.h>
+ # include <resolv.h>
+-extern "C" int res_init();
++extern "C" int res_init() throw ();
+ #endif
+ 
+ // POSIX Large File Support redefines open -> open64
diff --git a/packages/qt/qt-x11-free-4.0.1/no-tools.patch b/packages/qt/qt-x11-free-4.0.1/no-tools.patch
new file mode 100644
index 0000000000..75a146a838
--- /dev/null
+++ b/packages/qt/qt-x11-free-4.0.1/no-tools.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-opensource-src-4.0.1/src/src.pro~no-tools
++++ qt-x11-opensource-src-4.0.1/src/src.pro
+@@ -3,7 +3,7 @@
+ 
+ # this order is important
+ win32:SUBDIRS += winmain
+-SUBDIRS += tools/moc tools/rcc tools/uic corelib xml gui sql network
++SUBDIRS += corelib xml gui sql network
+ !embedded:contains(QT_CONFIG, opengl): SUBDIRS += opengl
+ contains(QT_CONFIG, qt3support): SUBDIRS += qt3support
+ !cross_compile {