contrib: qt4: win32 rules

doesn't seem to build with mingw32

contrib/src/qt4/cross-win32.diff

+--- qt-everywhere-opensource-src-4.7.4/mkspecs/win32-g++/qmake.conf.orig	2011-09-28 14:32:02.709958498 -0400
++++ qt-everywhere-opensource-src-4.7.4/mkspecs/win32-g++/qmake.conf	2011-09-28 14:36:32.529954583 -0400
+@@ -1,5 +1,5 @@
+ #
+-# qmake configuration for win32-g++
++# qmake configuration for win32-i586-mingw32msvc-g++
+ #
+ # Written for MinGW
+ #
+@@ -14,7 +14,7 @@
+ QMAKE_EXT_OBJ           = .o
+ QMAKE_EXT_RES           = _res.o
+ 
+-QMAKE_CC		= gcc
++QMAKE_CC		= i586-mingw32msvc-gcc
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		=
+ QMAKE_YACC		= byacc
+@@ -23,11 +23,11 @@
+ QMAKE_CFLAGS_DEPS	= -M
+ QMAKE_CFLAGS_WARN_ON	= -Wall
+ QMAKE_CFLAGS_WARN_OFF	= -w
+-QMAKE_CFLAGS_RELEASE	= -O2
++QMAKE_CFLAGS_RELEASE	= -O3
+ QMAKE_CFLAGS_DEBUG	= -g
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ 
+-QMAKE_CXX		= g++
++QMAKE_CXX		= i586-mingw32msvc-g++
+ QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+@@ -50,8 +50,8 @@
+ QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
+ QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ 
+-QMAKE_LINK		= g++
+-QMAKE_LINK_C		= gcc
++QMAKE_LINK		= i586-mingw32msvc-g++
++QMAKE_LINK_C		= i586-mingw32msvc-gcc
+ QMAKE_LFLAGS		=
+ QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
+ QMAKE_LFLAGS_EXCEPTIONS_OFF =
+@@ -95,15 +95,15 @@
+     QMAKE_CHK_DIR_EXISTS	= if not exist
+ }
+ 
+-QMAKE_MOC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
+-QMAKE_UIC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
+-QMAKE_IDC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
++QMAKE_MOC		= moc
++QMAKE_UIC		= uic
++QMAKE_IDC		= idc
+ 
+ QMAKE_IDL		= midl
+-QMAKE_LIB		= ar -ru
+-QMAKE_RC		= windres
++QMAKE_LIB		= i586-mingw32msvc-ar -ru
++QMAKE_RC		= i586-mingw32msvc-windres
+ QMAKE_ZIP		= zip -r -9
+ 
+-QMAKE_STRIP		= strip
++QMAKE_STRIP		= i586-mingw32msvc-strip
+ QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+ load(qt_config)

contrib/src/qt4/cross-x64.diff → contrib/src/qt4/cross-win64.diff

---- qt-everywhere-opensource-src-4.7.4/configure.orig	2011-09-28 14:31:35.039958884 -0400
-+++ qt-everywhere-opensource-src-4.7.4/configure	2011-09-28 14:31:48.649958702 -0400
-@@ -4568,7 +4568,7 @@
- }
- 
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if [ '!' -f "$outpath/bin/qmake" ]; then
-     echo "Creating qmake. Please wait..."
- 
-     OLD_QCONFIG_H=
---- qt-everywhere-opensource-src-4.7.4/src/tools/tools.pro.orig	2011-09-28 14:33:24.119957315 -0400
-+++ qt-everywhere-opensource-src-4.7.4/src/tools/tools.pro	2011-09-28 14:33:56.619956845 -0400
-@@ -1,11 +1,6 @@
- TEMPLATE = subdirs
- 
--TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc
--!contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic
--!cross_compile {
--    contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
--    win32:!wince*: SRC_SUBDIRS += src_tools_idc
--}
-+TOOLS_SUBDIRS = src_tools_bootstrap 
- 
- # Set subdir and respective target name
- src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap
 --- qt-everywhere-opensource-src-4.7.4/mkspecs/win32-g++/qmake.conf.orig	2011-09-28 14:32:02.709958498 -0400
 +++ qt-everywhere-opensource-src-4.7.4/mkspecs/win32-g++/qmake.conf	2011-09-28 14:36:32.529954583 -0400
 @@ -1,5 +1,5 @@

contrib/src/qt4/rules.mak

@@ -3,8 +3,8 @@
 QT4_VERSION = 4.7.4
 QT4_URL := http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-$(QT4_VERSION).tar.gz
 
-# FIXME : OSX and win32 build
-ifdef HAVE_WIN64
+# FIXME : OSX build
+ifdef HAVE_WIN32
 PKGS += qt4
 endif
 
@@ -19,7 +19,14 @@ $(TARBALLS)/qt-$(QT4_VERSION).tar.gz:
 
 qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
 	$(UNPACK)
-	patch -p0 < $(SRC)/qt4/cross-x64.diff # FIXME : add new target, fix/add mingw32 target
+	patch -p0 < $(SRC)/qt4/tools.diff
+ifdef HAVE_WIN32
+ifdef HAVE_WIN64
+	patch -p0 < $(SRC)/qt4/cross-win64.diff
+else
+	patch -p0 < $(SRC)/qt4/cross-win32.diff
+endif
+endif
 	mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@
 
 .qt4: qt4

contrib/src/qt4/tools.diff

+--- qt-everywhere-opensource-src-4.7.4/configure.orig	2011-09-28 14:31:35.039958884 -0400
++++ qt-everywhere-opensource-src-4.7.4/configure	2011-09-28 14:31:48.649958702 -0400
+@@ -4568,7 +4568,7 @@
+ }
+ 
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if [ '!' -f "$outpath/bin/qmake" ]; then
+     echo "Creating qmake. Please wait..."
+ 
+     OLD_QCONFIG_H=
+--- qt-everywhere-opensource-src-4.7.4/src/tools/tools.pro.orig	2011-09-28 14:33:24.119957315 -0400
++++ qt-everywhere-opensource-src-4.7.4/src/tools/tools.pro	2011-09-28 14:33:56.619956845 -0400
+@@ -1,11 +1,6 @@
+ TEMPLATE = subdirs
+ 
+-TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc
+-!contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic
+-!cross_compile {
+-    contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
+-    win32:!wince*: SRC_SUBDIRS += src_tools_idc
+-}
++TOOLS_SUBDIRS = src_tools_bootstrap 
+ 
+ # Set subdir and respective target name
+ src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap