diff -r 9a3381646ef2 src/gcc-macos-10.6.patch
--- a/src/gcc-macos-10.6.patch	Mon Apr 26 00:13:02 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
---- gcc-4.4.0-orig/gcc/cp/Make-lang.in	2009/09/09 08:14:36	151554
-+++ gcc-4.4.0/gcc/cp/Make-lang.in	2009/09/09 08:46:32	151555
-@@ -72,8 +72,8 @@
- # Shared with C front end:
- CXX_C_OBJS = attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o \
- 	c-dump.o $(CXX_TARGET_OBJS) c-pretty-print.o c-opts.o c-pch.o \
--	incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o \
--	c-gimplify.o c-omp.o tree-inline.o
-+	incpath.o c-ppoutput.o c-cppbuiltin.o prefix.o \
-+	c-gimplify.o c-omp.o
- 
- # Language-specific object files for C++ and Objective C++.
- CXX_AND_OBJCXX_OBJS = cp/call.o cp/decl.o cp/expr.o cp/pt.o cp/typeck2.o \
diff -r 9a3381646ef2 src/gcc-mpc.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gcc-mpc.mk	Tue Apr 27 01:10:56 2010 +1000
@@ -0,0 +1,13 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# MPC for GCC
+PKG             := gcc-mpc
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.8.1
+$(PKG)_CHECKSUM := 5ef03ca7aee134fe7dfecb6c9d048799f0810278
+$(PKG)_SUBDIR   := mpc-$($(PKG)_VERSION)
+$(PKG)_FILE     := mpc-$($(PKG)_VERSION).tar.gz
+$(PKG)_WEBSITE  := http://www.multiprecision.org
+$(PKG)_URL      := $($(PKG)_WEBSITE)/mpc/download/$($(PKG)_FILE)
+$(PKG)_DEPS     :=
diff -r 9a3381646ef2 src/gcc-tdm.mk
--- a/src/gcc-tdm.mk	Mon Apr 26 00:13:02 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
-
-# TDM-GCC
-PKG             := gcc-tdm
-$(PKG)_IGNORE   := 4.4.1-tdm-2
-$(PKG)_VERSION  := 4.4.0-tdm-1
-$(PKG)_CHECKSUM := ec1c81acf0581b4f1e2d5498ce9cd015b63e917b
-$(PKG)_SUBDIR   := .
-$(PKG)_FILE     := gcc-$($(PKG)_VERSION)-srcbase-2.zip
-$(PKG)_WEBSITE  := http://www.tdragon.net/recentgcc/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/TDM Sources/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
-
-define $(PKG)_UPDATE
-    $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/tdm-gcc/files/Sources/) | \
-    $(SED) -n 's,.*gcc-\([0-9][^>]*\)-srcbase[-0-9]*\.zip.*,\1,p' | \
-    tail -1
-endef
diff -r 9a3381646ef2 src/gcc.mk
--- a/src/gcc.mk	Mon Apr 26 00:13:02 2010 +0200
+++ b/src/gcc.mk	Tue Apr 27 01:10:56 2010 +1000
@@ -3,15 +3,15 @@
 
 # GCC
 PKG             := gcc
-$(PKG)_IGNORE   := 4.4.3
-$(PKG)_VERSION  := 4.4.0
-$(PKG)_CHECKSUM := 9215af6beb900ca1eef1d6a40c3dabe990203b25
+$(PKG)_IGNORE   := 
+$(PKG)_VERSION  := 4.5.0
+$(PKG)_CHECKSUM := 4beb8366ce1883f37255aa57f0258e7d3cd13a9b
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://gcc.gnu.org/
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.cs.tu-berlin.de/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := mingwrt mingwrt-dll w32api binutils gcc-gmp gcc-mpfr gcc-tdm gcc-pthreads
+$(PKG)_DEPS     := mingwrt mingwrt-dll w32api binutils gcc-gmp gcc-mpc gcc-mpfr gcc-pthreads
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \
@@ -34,19 +34,16 @@
         --disable-win32-registry \
         --enable-sjlj-exceptions
 
+#    --disable-sjlj-exceptions    \
+#    --with-dwarf2                \
+#    --disable-werror \
+
 define $(PKG)_BUILD
-    # unpack TDM-GCC
-    mkdir '$(1)/gcc-tdm'
-    cd    '$(1)/gcc-tdm' && $(call UNPACK_PKG_ARCHIVE,gcc-tdm)
-    # apply TDM-GCC patches
-    cd '$(1)' && \
-        for p in '$(1)'/gcc-tdm/*.patch; do \
-            $(SED) -i 's,\r$$,,' "$$p" || exit 1; \
-            patch -p1 -u < "$$p" || exit 1; \
-        done
     # unpack support libraries
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-gmp)
     mv '$(1)/$(gcc-gmp_SUBDIR)' '$(1)/gmp'
+    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpc)
+    mv '$(1)/$(gcc-mpc_SUBDIR)' '$(1)/mpc'
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpfr)
     mv '$(1)/$(gcc-mpfr_SUBDIR)' '$(1)/mpfr'
     # build everything of GCC except libgomp and libmudflap
diff -r 9a3381646ef2 src/glib.mk
--- a/src/glib.mk	Mon Apr 26 00:13:02 2010 +0200
+++ b/src/glib.mk	Tue Apr 27 01:10:56 2010 +1000
@@ -4,8 +4,8 @@
 # GLib
 PKG             := glib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.25.3
-$(PKG)_CHECKSUM := 5a8cf17c44decb27de3fbc202be05c89d55f647d
+$(PKG)_VERSION  := 2.24.0
+$(PKG)_CHECKSUM := 32714e64fff52d18db5f077732910215790e0c5b
 $(PKG)_SUBDIR   := glib-$($(PKG)_VERSION)
 $(PKG)_FILE     := glib-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtk.org/
@@ -38,7 +38,7 @@
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-regex \
-        --enable-threads \
+        --disable-threads \
         --disable-selinux \
         --disable-fam \
         --disable-xattr \
@@ -46,14 +46,9 @@
         CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \
         LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs'
     $(SED) -i 's,#define G_ATOMIC.*,,' '$(1).native/config.h'
-    $(MAKE) -C '$(1).native/glib'           -j '$(JOBS)'
-    $(MAKE) -C '$(1).native/gthread'        -j '$(JOBS)'
-    $(MAKE) -C '$(1).native/gobject'        -j '$(JOBS)' lib_LTLIBRARIES= install-exec
-    $(MAKE) -C '$(1).native/gmodule'        -j '$(JOBS)'
-    $(MAKE) -C '$(1).native/gio/xdgmime'    -j '$(JOBS)'
-    $(MAKE) -C '$(1).native/gio/inotify'    -j '$(JOBS)'
-    $(MAKE) -C '$(1).native/gio/libasyncns' -j '$(JOBS)'
-    $(MAKE) -C '$(1).native/gio'            -j '$(JOBS)'
+    $(MAKE) -C '$(1).native/glib'    -j '$(JOBS)'
+    $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)'
+    $(MAKE) -C '$(1).native/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec
 
     # cross build
     $(SED) -i 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' '$(1)/glib-2.0.pc.in'
@@ -69,8 +64,6 @@
         CXX='$(TARGET)-c++' \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
         GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal'
-    ln -s '$(1).native/gio/glib-compile-schemas' '$(1)/gio/glib-compile-schemas'
-    ln -s '$(1).native/gio/gschema-compile' '$(1)/gio/gschema-compile'
     $(MAKE) -C '$(1)/glib'    -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(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=
diff -r 9a3381646ef2 src/gtk.mk
--- a/src/gtk.mk	Mon Apr 26 00:13:02 2010 +0200
+++ b/src/gtk.mk	Tue Apr 27 01:10:56 2010 +1000
@@ -4,8 +4,8 @@
 # GTK+
 PKG             := gtk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.20.0
-$(PKG)_CHECKSUM := db8a8f1040a813fc1a7872d38b675b4805fa0446
+$(PKG)_VERSION  := 2.19.6
+$(PKG)_CHECKSUM := 0a42eeee67fe2f3022f39fdf1a2a3817e520c0ff
 $(PKG)_SUBDIR   := gtk+-$($(PKG)_VERSION)
 $(PKG)_FILE     := gtk+-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtk.org/
@@ -34,7 +34,6 @@
     $(SED) -i 's,enable_shared=yes,enable_shared=no,' '$(1)/configure'
     $(SED) -i 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJASPER,\1 $$LIBJASPER $$LIBJPEG,' '$(1)/configure'
     $(SED) -i 's/-Wl,-luuid/-luuid/' '$(1)/configure'
-    $(SED) -i 's/gio-unix/gio-windows/' '$(1)/configure'
     # wine confuses the cross-compiling detection, so set it explicitly
     $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \