diff -r 587c5f1c2792 src/atk.mk
--- a/src/atk.mk	Wed Nov 23 20:31:10 2011 +1100
+++ b/src/atk.mk	Wed Nov 23 23:56:13 2011 +0100
@@ -21,7 +21,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/atk/atkobject.c'
+    $(SED) -i 's,DllMain,atk_DllMain,' '$(1)/atk/atkobject.c'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
diff -r 587c5f1c2792 src/curl.mk
--- a/src/curl.mk	Wed Nov 23 20:31:10 2011 +1100
+++ b/src/curl.mk	Wed Nov 23 23:56:13 2011 +0100
@@ -10,7 +10,7 @@
 $(PKG)_FILE     := curl-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://curl.haxx.se/libcurl/
 $(PKG)_URL      := http://curl.haxx.se/download/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc gnutls libidn libssh2
+$(PKG)_DEPS     := gcc gnutls libidn
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://curl.haxx.se/download/?C=M;O=D' | \
diff -r 587c5f1c2792 src/gdk-pixbuf-1-fixes.patch
--- a/src/gdk-pixbuf-1-fixes.patch	Wed Nov 23 20:31:10 2011 +1100
+++ b/src/gdk-pixbuf-1-fixes.patch	Wed Nov 23 23:56:13 2011 +0100
@@ -24,7 +24,7 @@
  
  BOOL WINAPI
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++gdkpixbuf_DllMain (HINSTANCE hinstDLL,
           DWORD     fdwReason,
           LPVOID    lpvReserved)
  {
diff -r 587c5f1c2792 src/glib-1-fixes.patch
--- a/src/glib-1-fixes.patch	Wed Nov 23 20:31:10 2011 +1100
+++ b/src/glib-1-fixes.patch	Wed Nov 23 23:56:13 2011 +0100
@@ -1,42 +1,7 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 4693f62d3f01f7b7d26607e6eed843202cbf90f7 Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Thu, 23 Sep 2010 21:36:04 +0200
-Subject: [PATCH 1/5] no gtk doc check
-
-
-diff --git a/configure.ac b/configure.ac
-index a821267..2e541d2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2741,8 +2741,6 @@ dnl **************************
- dnl *** Checks for gtk-doc ***
- dnl **************************
- 
--GTK_DOC_CHECK([1.15])
--
- AC_ARG_ENABLE(man,
-               [AC_HELP_STRING([--enable-man],
-                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,
--- 
-1.7.1
-
-
-From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Thu, 23 Sep 2010 21:41:51 +0200
-Subject: [PATCH 2/5] optional gettext
-
-
-diff --git a/configure.ac b/configure.ac
-index 2e541d2..18c2dea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -464,8 +464,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
+diff -uNr glib-2.28.8-orig/configure.ac glib/configure.ac
+--- glib-2.28.8-orig/configure.ac	2011-06-06 01:18:49.000000000 +0200
++++ glib/configure.ac	2011-11-23 21:06:13.610941443 +0100
+@@ -457,8 +457,8 @@
  GLIB_GNU_GETTEXT
  
  if test "$gt_cv_have_gettext" != "yes" ; then
@@ -47,10 +12,62 @@
  *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
  ])
  fi
-diff --git a/glib/gi18n.h b/glib/gi18n.h
-index c710046..269bfdf 100644
---- a/glib/gi18n.h
-+++ b/glib/gi18n.h
+@@ -2692,7 +2692,7 @@
+ 	G_LIBS_EXTRA="-luser32 -lkernel32"
+     ;;
+   *-*-mingw*)
+-	G_LIBS_EXTRA="-lws2_32 -lole32"
++	G_LIBS_EXTRA="-lws2_32 -lole32 -lshlwapi"
+     ;;
+   *)
+ 	G_LIBS_EXTRA=""
+@@ -2735,8 +2735,6 @@
+ dnl *** Checks for gtk-doc ***
+ dnl **************************
+ 
+-GTK_DOC_CHECK([1.15])
+-
+ AC_ARG_ENABLE(man,
+               [AC_HELP_STRING([--enable-man],
+                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,
+diff -uNr glib-2.28.8-orig/gio/giomodule.c glib/gio/giomodule.c
+--- glib-2.28.8-orig/gio/giomodule.c	2011-01-05 22:44:06.000000000 +0100
++++ glib/gio/giomodule.c	2011-11-23 21:04:43.867004895 +0100
+@@ -489,10 +489,8 @@
+ 
+ static HMODULE gio_dll = NULL;
+ 
+-#ifdef DLL_EXPORT
+-
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++gio_DllMain (HINSTANCE hinstDLL,
+ 	 DWORD     fdwReason,
+ 	 LPVOID    lpvReserved)
+ {
+@@ -502,8 +500,6 @@
+   return TRUE;
+ }
+ 
+-#endif
+-
+ #undef GIO_MODULE_DIR
+ 
+ /* GIO_MODULE_DIR is used only in code called just once,
+diff -uNr glib-2.28.8-orig/gio-2.0.pc.in glib/gio-2.0.pc.in
+--- glib-2.28.8-orig/gio-2.0.pc.in	2011-02-10 00:31:42.000000000 +0100
++++ glib/gio-2.0.pc.in	2011-11-23 21:06:13.614941440 +0100
+@@ -10,6 +10,6 @@
+ Description: glib I/O library
+ Version: @VERSION@
+ Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
+-Libs: -L${libdir} -lgio-2.0
++Libs: -L${libdir} -lgio-2.0 -ldnsapi
+ Libs.private: @ZLIB_LIBS@ @LIBASYNCNS_LIBADD@
+ Cflags: 
+diff -uNr glib-2.28.8-orig/glib/gi18n.h glib/glib/gi18n.h
+--- glib-2.28.8-orig/glib/gi18n.h	2010-09-27 20:48:33.000000000 +0200
++++ glib/glib/gi18n.h	2011-11-23 21:06:13.610941443 +0100
 @@ -22,7 +22,12 @@
  
  #include <glib.h>
@@ -64,21 +81,45 @@
  #include <string.h>
  
  #define  _(String) gettext (String)
--- 
-1.7.1
-
-
-From 3473b5183b2e59d247cd1db053efc6c9ecaf2aab Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Thu, 23 Sep 2010 21:42:46 +0200
-Subject: [PATCH 3/5] fix tool paths
-
-
-diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
-index 3d1ac12..58e1ecf 100644
---- a/glib-2.0.pc.in
-+++ b/glib-2.0.pc.in
-@@ -3,9 +3,9 @@ address@hidden@
+diff -uNr glib-2.28.8-orig/glib/gutils.c glib/glib/gutils.c
+--- glib-2.28.8-orig/glib/gutils.c	2011-06-06 01:18:49.000000000 +0200
++++ glib/glib/gutils.c	2011-11-23 21:05:07.822988144 +0100
+@@ -144,10 +144,8 @@
+ 
+ static HMODULE glib_dll = NULL;
+ 
+-#ifdef DLL_EXPORT
+-
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++glib_DllMain (HINSTANCE hinstDLL,
+ 	 DWORD     fdwReason,
+ 	 LPVOID    lpvReserved)
+ {
+@@ -157,8 +155,6 @@
+   return TRUE;
+ }
+ 
+-#endif
+-
+ gchar *
+ _glib_get_dll_directory (void)
+ {
+@@ -166,10 +162,8 @@
+   gchar *p;
+   wchar_t wc_fn[MAX_PATH];
+ 
+-#ifdef DLL_EXPORT
+   if (glib_dll == NULL)
+     return NULL;
+-#endif
+ 
+   /* This code is different from that in
+    * g_win32_get_package_installation_directory_of_module() in that
+diff -uNr glib-2.28.8-orig/glib-2.0.pc.in glib/glib-2.0.pc.in
+--- glib-2.28.8-orig/glib-2.0.pc.in	2010-09-27 20:48:33.000000000 +0200
++++ glib/glib-2.0.pc.in	2011-11-23 21:06:13.614941440 +0100
+@@ -3,13 +3,13 @@
  address@hidden@
  address@hidden@
  
@@ -91,61 +132,8 @@
  
  Name: GLib
  Description: C Utility Library
--- 
-1.7.1
-
-
-From 0e57514812500d5d4dee03e1be8059a25876dd99 Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Thu, 23 Sep 2010 21:45:50 +0200
-Subject: [PATCH 4/5] fix dependency libs
-
-
-diff --git a/configure.ac b/configure.ac
-index 18c2dea..e472768 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2698,7 +2698,7 @@ case $host in
- 	G_LIBS_EXTRA="-luser32 -lkernel32"
-     ;;
-   *-*-mingw*)
--	G_LIBS_EXTRA="-lws2_32 -lole32"
-+	G_LIBS_EXTRA="-lws2_32 -lole32 -lshlwapi"
-     ;;
-   *)
- 	G_LIBS_EXTRA=""
-diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
-index 58e1ecf..17b2133 100644
---- a/glib-2.0.pc.in
-+++ b/glib-2.0.pc.in
-@@ -11,5 +11,5 @@ Name: GLib
- Description: C Utility Library
  Version: @VERSION@
  Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
 -Libs.private: @ICONV_LIBS@
 +Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
  Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
--- 
-1.7.1
-
-
-From 87931c81f6401fb0c25064ec0ba2edca9ec53924 Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Sat, 25 Sep 2010 00:07:33 +0200
-Subject: [PATCH 5/5] add -ldnsapi to gio-2.0.pc
-
-
-diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
-index 92cda85..7a4e224 100644
---- a/gio-2.0.pc.in
-+++ b/gio-2.0.pc.in
-@@ -10,6 +10,6 @@ Name: GIO
- Description: glib I/O library
- Version: @VERSION@
- Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
--Libs: -L${libdir} -lgio-2.0
-+Libs: -L${libdir} -lgio-2.0 -ldnsapi
- Libs.private: @ZLIB_LIBS@ @LIBASYNCNS_LIBADD@
- Cflags: 
--- 
-1.7.1
diff -r 587c5f1c2792 src/glib.mk
--- a/src/glib.mk	Wed Nov 23 20:31:10 2011 +1100
+++ b/src/glib.mk	Wed Nov 23 23:56:13 2011 +0100
@@ -66,7 +66,7 @@
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
         GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' \
         GLIB_COMPILE_SCHEMAS='$(PREFIX)/$(TARGET)/bin/glib-compile-schemas'
-    $(MAKE) -C '$(1)/glib'    -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)/glib'    -j '$(JOBS)' install
     $(MAKE) -C '$(1)/gmodule' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)/gthread' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)/gobject' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff -r 587c5f1c2792 src/gtk2-1-fixes.patch
--- a/src/gtk2-1-fixes.patch	Wed Nov 23 20:31:10 2011 +1100
+++ b/src/gtk2-1-fixes.patch	Wed Nov 23 23:56:13 2011 +0100
@@ -18,7 +18,7 @@
  
  int __stdcall
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++gdk_DllMain (HINSTANCE hinstDLL,
  	 DWORD     dwReason,
  	 LPVOID    reserved)
  {
@@ -31,7 +31,7 @@
  
  BOOL WINAPI
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++gtk_DllMain (HINSTANCE hinstDLL,
  	 DWORD     fdwReason,
  	 LPVOID    lpvReserved)
  {
diff -r 587c5f1c2792 src/pango-1-fixes.patch
--- a/src/pango-1-fixes.patch	Wed Nov 23 20:31:10 2011 +1100
+++ b/src/pango-1-fixes.patch	Wed Nov 23 23:56:13 2011 +0100
@@ -24,7 +24,7 @@
  
  BOOL WINAPI
 -DllMain (HINSTANCE hinstDLL,
-+static _disabled_DllMain (HINSTANCE hinstDLL,
++pango_DllMain (HINSTANCE hinstDLL,
  	 DWORD     fdwReason,
  	 LPVOID    lpvReserved)
  {