# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1285753457 -7200
# Node ID 72289a2c36fc9afdae94031b2917be689507283c
# Parent  686a80e66ce1508a282c1aaaa71da20c4aba4a3a# Parent  9d25713309ca7ccbdafe6209f7d5888d14f87aa6
merge

diff -r 686a80e66ce1 -r 72289a2c36fc src/atkmm.mk
--- a/src/atkmm.mk	Wed Sep 29 11:43:27 2010 +0200
+++ b/src/atkmm.mk	Wed Sep 29 11:44:17 2010 +0200
@@ -4,8 +4,8 @@
 # ATKmm
 PKG             := atkmm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.21.2
-$(PKG)_CHECKSUM := 5aa7ef7733bd614e5ef922d300a2559c59a5d9dc
+$(PKG)_VERSION  := 2.22.0
+$(PKG)_CHECKSUM := eec035b8312b38f3b835d6c1ec4a5813dbaee5f8
 $(PKG)_SUBDIR   := atkmm-$($(PKG)_VERSION)
 $(PKG)_FILE     := atkmm-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtkmm.org/
diff -r 686a80e66ce1 -r 72289a2c36fc src/freetds-1-fastforward.patch
--- a/src/freetds-1-fastforward.patch	Wed Sep 29 11:43:27 2010 +0200
+++ b/src/freetds-1-fastforward.patch	Wed Sep 29 11:44:17 2010 +0200
@@ -155871,3 +155871,378 @@
  			encoding = 3;
  		else if (strcmp(enc_name, "UCS-4LE") == 0)
  			encoding = 4;
+
+commit 19ec31900bd23e3320284bd9b65b6942d471d93b
+Author: jklowden <jklowden>
+Date:   Mon Sep 27 21:53:48 2010 +0000
+
+    fix Win32 problems
+
+diff --git a/ChangeLog b/ChangeLog
+index 0c54ccd..1e2c386 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++Mon Sep 27 17:53:10 EDT 2010	JK Lowden <jklowden@freetds.org>
++	* Nmakefile src/tds/config.c src/tds/mem.c
++	- fix Win32 problems 
++
+ Mon Sep 27 09:25:08 CEST 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
+ 	* src/replacements/iconv.c: add utf16 support to iconv replacement
+ 
+@@ -2909,4 +2913,4 @@ Wed Jan  9 19:54:43 EST 2008	JK Lowden <jklowden@freetds.org>
+ 	* ChangeLog-0.82 added because of release
+ 	
+ $FreeTDS$
+-$Id: ChangeLog,v 1.3131 2010/09/27 07:25:24 freddy77 Exp $
++$Id: ChangeLog,v 1.3132 2010/09/27 21:53:48 jklowden Exp $
+diff --git a/Nmakefile b/Nmakefile
+index bc360ed..fbac636 100755
+--- a/Nmakefile
++++ b/Nmakefile
+@@ -1,4 +1,4 @@
+-# $Id: Nmakefile,v 1.4 2010/01/26 18:15:39 jklowden Exp $
++# $Id: Nmakefile,v 1.5 2010/09/27 21:53:48 jklowden Exp $
+ # Build FreeTDS and assorted utilities for Win32/Win64 without an IDE. 
+ # Makefiles, unlike Visual Studio project files, are stable over time.  
+ # Contributed to the public domain by James K. Lowden, February 2009
+@@ -90,6 +90,7 @@ TDS_SRC =	$(TDS_DIR)\bulk.c \
+ 		$(TDS_DIR)\token.c \
+ 		$(TDS_DIR)\util.c \
+ 		$(TDS_DIR)\vstrbuild.c \
++		$(TDS_DIR)\win_mutex.c \
+ 		$(TDS_DIR)\write.c 
+ 
+ TDS_OBJ =	$(TDS_OUT)\bulk.obj \
+@@ -119,6 +120,7 @@ TDS_OBJ =	$(TDS_OUT)\bulk.obj \
+ 		$(TDS_OUT)\token.obj \
+ 		$(TDS_OUT)\util.obj \
+ 		$(TDS_OUT)\vstrbuild.obj \
++		$(TDS_OUT)\win_mutex.obj \
+ 		$(TDS_OUT)\write.obj 
+ 
+ # not yet:	$(APPS_DIR)\bsqlodbc.c 
+@@ -250,7 +252,7 @@ REL = -MT  -O2 -D "_NDEBUG" -Zi
+ 
+ MSLIBS = Ws2_32.lib shell32.lib	
+ 
+-CC = cl $(FLG) $(DEF) $(INC)
++CC = cl $(CFLAGS) $(FLG) $(DEF) $(INC)
+ CC32 = $(CC)
+ CC64 = $(CC)
+ 
+@@ -329,6 +331,8 @@ CC64 = $(CC)
+ #
+ # Utilities
+ #
++$(APPS_EXE): $(DBLIB_OUT)\db-lib.lib
++
+ {$(APPS_DIR)}.c{$(APPS_DIR)\win32\debug}.exe:
+ 	@if not exist $(APPS_OUT) $(MKDIR) $(APPS_OUT)
+ 	$(CC32) $(DBG) 	-Fd"$(APPS_OUT)\vc80.pdb" -Fe$@ \
+diff --git a/src/tds/config.c b/src/tds/config.c
+index 357f958..b079351 100644
+--- a/src/tds/config.c
++++ b/src/tds/config.c
+@@ -80,7 +80,7 @@
+ #include <dmalloc.h>
+ #endif
+ 
+-TDS_RCSID(var, "$Id: config.c,v 1.160 2010/09/16 07:37:23 freddy77 Exp $");
++TDS_RCSID(var, "$Id: config.c,v 1.161 2010/09/27 21:53:48 jklowden Exp $");
+ 
+ static void tds_config_login(TDSCONNECTION * connection, TDSLOGIN * login);
+ static void tds_config_env_tdsdump(TDSCONNECTION * connection);
+@@ -768,6 +768,8 @@ tds_config_verstr(const char *tdsver, TDSCONNECTION * connection)
+ 	if (connection)
+ 		connection->tds_version = version;
+ 
++	tdsdump_log(TDS_DBG_INFO1, "Setting tds version to %s (0x%0x) from $TDSVER.\n", tdsver, version);
++
+ 	return version;
+ }
+ 
+diff --git a/src/tds/mem.c b/src/tds/mem.c
+index 9ad97cb..dbd6414 100644
+--- a/src/tds/mem.c
++++ b/src/tds/mem.c
+@@ -53,7 +53,7 @@
+ #include <dmalloc.h>
+ #endif
+ 
+-TDS_RCSID(var, "$Id: mem.c,v 1.206 2010/07/27 08:53:12 freddy77 Exp $");
++TDS_RCSID(var, "$Id: mem.c,v 1.207 2010/09/27 21:53:48 jklowden Exp $");
+ 
+ static void tds_free_env(TDSSOCKET * tds);
+ static void tds_free_compute_results(TDSSOCKET * tds);
+@@ -860,7 +860,6 @@ tds_alloc_connection(TDSLOCALE * locale)
+ 		if (encoding && atoi(encoding) > 0) {
+ 			char *p;
+ 			if (asprintf(&p, "CP%s", encoding) >= 0) {
+-				free(encoding);
+ 				lc_all = encoding = p;
+ 			}
+ 		}
+
+commit e8c1a9b824996273a6d81a251817ec2b20ff9814
+Author: freddy77 <freddy77>
+Date:   Tue Sep 28 08:14:17 2010 +0000
+
+    fix problem for UNI(VAR)CHAR encoding
+
+diff --git a/ChangeLog b/ChangeLog
+index 1e2c386..5123d89 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Tue Sep 28 10:13:57 CEST 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
++	* src/tds/token.c: fix problem for UNI(VAR)CHAR encoding
++
+ Mon Sep 27 17:53:10 EDT 2010	JK Lowden <jklowden@freetds.org>
+ 	* Nmakefile src/tds/config.c src/tds/mem.c
+ 	- fix Win32 problems 
+@@ -2913,4 +2916,4 @@ Wed Jan  9 19:54:43 EST 2008	JK Lowden <jklowden@freetds.org>
+ 	* ChangeLog-0.82 added because of release
+ 	
+ $FreeTDS$
+-$Id: ChangeLog,v 1.3132 2010/09/27 21:53:48 jklowden Exp $
++$Id: ChangeLog,v 1.3133 2010/09/28 08:14:17 freddy77 Exp $
+diff --git a/src/tds/token.c b/src/tds/token.c
+index 502da71..7c496b6 100644
+--- a/src/tds/token.c
++++ b/src/tds/token.c
+@@ -43,7 +43,7 @@
+ #include <dmalloc.h>
+ #endif
+ 
+-TDS_RCSID(var, "$Id: token.c,v 1.388 2010/07/25 08:40:19 freddy77 Exp $");
++TDS_RCSID(var, "$Id: token.c,v 1.389 2010/09/28 08:14:17 freddy77 Exp $");
+ 
+ #define USE_ICONV tds->use_iconv
+ 
+@@ -3541,13 +3541,22 @@ adjust_character_column_size(const TDSSOCKET * tds, TDSCOLUMN * curcol)
+ 	if (is_unicode_type(curcol->on_server.column_type))
+ 		curcol->char_conv = tds->char_convs[client2ucs2];
+ 
+-	/* Sybase UNI(VAR)CHAR fields are transmitted via SYBLONGBINARY and in UTF-16*/
++	/* Sybase UNI(VAR)CHAR fields are transmitted via SYBLONGBINARY and in UTF-16 */
+ 	if (curcol->on_server.column_type == SYBLONGBINARY && (
+ 		curcol->column_usertype == USER_UNICHAR_TYPE ||
+ 		curcol->column_usertype == USER_UNIVARCHAR_TYPE)) {
+-		/* FIXME ucs2 is not UTF-16... */
+-		/* FIXME what happen if client is big endian ?? */
+-		curcol->char_conv = tds->char_convs[client2ucs2];
++#ifdef WORDS_BIGENDIAN
++		static const char sybase_utf[] = "UTF-16BE";
++#else
++		static const char sybase_utf[] = "UTF-16LE";
++#endif
++
++		curcol->char_conv = tds_iconv_get(tds, tds->char_convs[client2ucs2]->client_charset.name, sybase_utf);
++
++		/* fallback to UCS-2LE */
++		/* FIXME should be useless. Does not works always */
++		if (!curcol->char_conv)
++			curcol->char_conv = tds->char_convs[client2ucs2];
+ 	}
+ 
+ 	/* FIXME: and sybase ?? */
+
+commit 1e52a517fd4ce2dbc23de5016288e5283fcc53c0
+Author: freddy77 <freddy77>
+Date:   Tue Sep 28 08:20:11 2010 +0000
+
+    fix memory leak
+
+diff --git a/ChangeLog b/ChangeLog
+index 5123d89..bfa7514 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Tue Sep 28 10:19:51 CEST 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
++	* src/tds/mem.c: fix memory leak
++
+ Tue Sep 28 10:13:57 CEST 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
+ 	* src/tds/token.c: fix problem for UNI(VAR)CHAR encoding
+ 
+@@ -2916,4 +2919,4 @@ Wed Jan  9 19:54:43 EST 2008	JK Lowden <jklowden@freetds.org>
+ 	* ChangeLog-0.82 added because of release
+ 	
+ $FreeTDS$
+-$Id: ChangeLog,v 1.3133 2010/09/28 08:14:17 freddy77 Exp $
++$Id: ChangeLog,v 1.3134 2010/09/28 08:20:11 freddy77 Exp $
+diff --git a/src/tds/mem.c b/src/tds/mem.c
+index dbd6414..d1da84e 100644
+--- a/src/tds/mem.c
++++ b/src/tds/mem.c
+@@ -53,7 +53,7 @@
+ #include <dmalloc.h>
+ #endif
+ 
+-TDS_RCSID(var, "$Id: mem.c,v 1.207 2010/09/27 21:53:48 jklowden Exp $");
++TDS_RCSID(var, "$Id: mem.c,v 1.208 2010/09/28 08:20:11 freddy77 Exp $");
+ 
+ static void tds_free_env(TDSSOCKET * tds);
+ static void tds_free_compute_results(TDSSOCKET * tds);
+@@ -860,6 +860,7 @@ tds_alloc_connection(TDSLOCALE * locale)
+ 		if (encoding && atoi(encoding) > 0) {
+ 			char *p;
+ 			if (asprintf(&p, "CP%s", encoding) >= 0) {
++				free(lc_all);
+ 				lc_all = encoding = p;
+ 			}
+ 		}
+
+commit c195d4306ccaddb7be59d9028768bd6a08337454
+Author: freddy77 <freddy77>
+Date:   Tue Sep 28 09:01:19 2010 +0000
+
+    add missing exports
+
+diff --git a/ChangeLog b/ChangeLog
+index bfa7514..cf8e8d8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Tue Sep 28 11:00:33 CEST 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
++	* win32/FreeTDS_w.def: add missing exports
++
+ Tue Sep 28 10:19:51 CEST 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
+ 	* src/tds/mem.c: fix memory leak
+ 
+@@ -2919,4 +2922,4 @@ Wed Jan  9 19:54:43 EST 2008	JK Lowden <jklowden@freetds.org>
+ 	* ChangeLog-0.82 added because of release
+ 	
+ $FreeTDS$
+-$Id: ChangeLog,v 1.3134 2010/09/28 08:20:11 freddy77 Exp $
++$Id: ChangeLog,v 1.3135 2010/09/28 09:01:19 freddy77 Exp $
+diff --git a/win32/FreeTDS_w.def b/win32/FreeTDS_w.def
+index 0a61e01..fe56b14 100644
+--- a/win32/FreeTDS_w.def
++++ b/win32/FreeTDS_w.def
+@@ -89,20 +89,24 @@ EXPORTS
+ 	SQLExecDirectW
+ 	SQLForeignKeysW
+ 	SQLGetConnectAttrW
++	SQLGetConnectOptionW
+ 	SQLGetCursorNameW
+ 	SQLGetDescFieldW
+ 	SQLGetDescRecW
+ 	SQLGetDiagFieldW
+ 	SQLGetDiagRecW
+ 	SQLGetInfoW
++	SQLGetStmtAttrW
+ 	SQLNativeSqlW
+ 	SQLPrepareW
+ 	SQLPrimaryKeysW
+ 	SQLProcedureColumnsW
+ 	SQLProceduresW
+ 	SQLSetConnectAttrW
++	SQLSetConnectOptionW
+ 	SQLSetCursorNameW
+ 	SQLSetDescFieldW
++	SQLSetStmtAttrW
+ 	SQLSpecialColumnsW
+ 	SQLStatisticsW
+ 	SQLTablePrivilegesW
+
+commit a5458e39f8429dc7193526f45356ae2c2f664627
+Author: freddy77 <freddy77>
+Date:   Tue Sep 28 09:55:26 2010 +0000
+
+    remove warning
+
+diff --git a/ChangeLog b/ChangeLog
+index cf8e8d8..ba85348 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Tue Sep 28 11:55:05 CEST 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
++	* src/tds/token.c: remove warning
++
+ Tue Sep 28 11:00:33 CEST 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
+ 	* win32/FreeTDS_w.def: add missing exports
+ 
+@@ -2922,4 +2925,4 @@ Wed Jan  9 19:54:43 EST 2008	JK Lowden <jklowden@freetds.org>
+ 	* ChangeLog-0.82 added because of release
+ 	
+ $FreeTDS$
+-$Id: ChangeLog,v 1.3135 2010/09/28 09:01:19 freddy77 Exp $
++$Id: ChangeLog,v 1.3136 2010/09/28 09:55:26 freddy77 Exp $
+diff --git a/src/tds/token.c b/src/tds/token.c
+index 7c496b6..ba50fd7 100644
+--- a/src/tds/token.c
++++ b/src/tds/token.c
+@@ -43,7 +43,7 @@
+ #include <dmalloc.h>
+ #endif
+ 
+-TDS_RCSID(var, "$Id: token.c,v 1.389 2010/09/28 08:14:17 freddy77 Exp $");
++TDS_RCSID(var, "$Id: token.c,v 1.390 2010/09/28 09:55:26 freddy77 Exp $");
+ 
+ #define USE_ICONV tds->use_iconv
+ 
+@@ -76,7 +76,7 @@ static int tds_process_end(TDSSOCKET * tds, int marker, /*@out@*/ int *flags_par
+ static int tds_get_data(TDSSOCKET * tds, TDSCOLUMN * curcol);
+ static int tds_get_data_info(TDSSOCKET * tds, TDSCOLUMN * curcol, int is_param);
+ static /*@observer@*/ const char *tds_token_name(unsigned char marker);
+-static void adjust_character_column_size(const TDSSOCKET * tds, TDSCOLUMN * curcol);
++static void adjust_character_column_size(TDSSOCKET * tds, TDSCOLUMN * curcol);
+ static int determine_adjusted_size(const TDSICONV * char_conv, int size);
+ static /*@observer@*/ const char *tds_pr_op(int op);
+ static int tds_alloc_get_string(TDSSOCKET * tds, /*@special@*/ char **string, int len) /*allocates *string*/;
+@@ -3533,7 +3533,7 @@ tds_token_name(unsigned char marker)
+  * Adjust column size according to client's encoding 
+  */
+ static void
+-adjust_character_column_size(const TDSSOCKET * tds, TDSCOLUMN * curcol)
++adjust_character_column_size(TDSSOCKET * tds, TDSCOLUMN * curcol)
+ {
+ 	CHECK_TDS_EXTRA(tds);
+ 	CHECK_COLUMN_EXTRA(curcol);
+
+commit c22feade8b88544bc99ecdd94433a67d9b209a6d
+Author: freddy77 <freddy77>
+Date:   Tue Sep 28 15:09:39 2010 +0000
+
+    removed a warning compiling for big endian
+
+diff --git a/ChangeLog b/ChangeLog
+index ba85348..31a9694 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Tue Sep 28 17:09:28 CEST 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
++	* src/tds/challenge.c: removed a warning compiling for big endian
++
+ Tue Sep 28 11:55:05 CEST 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
+ 	* src/tds/token.c: remove warning
+ 
+@@ -2925,4 +2928,4 @@ Wed Jan  9 19:54:43 EST 2008	JK Lowden <jklowden@freetds.org>
+ 	* ChangeLog-0.82 added because of release
+ 	
+ $FreeTDS$
+-$Id: ChangeLog,v 1.3136 2010/09/28 09:55:26 freddy77 Exp $
++$Id: ChangeLog,v 1.3137 2010/09/28 15:09:39 freddy77 Exp $
+diff --git a/src/tds/challenge.c b/src/tds/challenge.c
+index d048a90..7822810 100644
+--- a/src/tds/challenge.c
++++ b/src/tds/challenge.c
+@@ -45,7 +45,7 @@
+ #include <dmalloc.h>
+ #endif
+ 
+-TDS_RCSID(var, "$Id: challenge.c,v 1.41 2010/07/17 20:05:52 freddy77 Exp $");
++TDS_RCSID(var, "$Id: challenge.c,v 1.42 2010/09/28 15:09:39 freddy77 Exp $");
+ 
+ /**
+  * \ingroup libtds
+@@ -584,7 +584,7 @@ fill_names_blob_prefix(names_blob_prefix_t * prefix)
+ 	prefix->reserved1 = 0x0000;
+ 	prefix->reserved2 = 0x00000000;
+ #ifdef WORDS_BIGENDIAN
+-	tds_swap_bytes(&nttime, 8);
++	tds_swap_bytes((unsigned char *) &nttime, 8);
+ #endif
+ 	prefix->timestamp = nttime;
+ 	generate_random_buffer(prefix->challenge, sizeof(prefix->challenge));
diff -r 686a80e66ce1 -r 72289a2c36fc src/gdk-pixbuf.mk
--- a/src/gdk-pixbuf.mk	Wed Sep 29 11:43:27 2010 +0200
+++ b/src/gdk-pixbuf.mk	Wed Sep 29 11:44:17 2010 +0200
@@ -26,6 +26,8 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --disable-modules \
+        --with-included-loaders
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
diff -r 686a80e66ce1 -r 72289a2c36fc src/gtk-1-fixes.patch
--- a/src/gtk-1-fixes.patch	Wed Sep 29 11:43:27 2010 +0200
+++ b/src/gtk-1-fixes.patch	Wed Sep 29 11:44:17 2010 +0200
@@ -154,14 +154,14 @@
  #define VARIABLE extern 
  #endif
 
-commit 1f0f8944278d888d6d81df1a03458ec7913cde09
+commit 69568bc7c8627d117521548192730665a9623b80
 Author: Mark Brand <mabrand@mabrand.nl>
 Date:   Fri Sep 24 14:17:22 2010 +0200
 
     fix gtk+-2.0.pc.in
 
 diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in
-index 46853e1..bb53ed2 100644
+index 46853e1..7f3eb22 100644
 --- a/gtk+-2.0.pc.in
 +++ b/gtk+-2.0.pc.in
 @@ -11,5 +11,5 @@ Name: GTK+
@@ -169,10 +169,10 @@
  Version: @VERSION@
  Requires: gdk-${target}-2.0 @GTK_PACKAGES@
 -Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@
-+Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_DEP_LIBS@
++Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_DEP_LIBS@ -lwinspool -lcomctl32 -lcomdlg32
  Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@
 
-commit 74854514567b97b4862e4e6339d1273256bbf747
+commit 1f60f6943b5c67a199660618e546de5f0faafeef
 Author: Mark Brand <mabrand@mabrand.nl>
 Date:   Fri Sep 24 14:48:31 2010 +0200
 
@@ -192,7 +192,7 @@
  	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
  	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
 
-commit 6e2c98deed33a2a8052176a037229075b0c692ad
+commit e24f3fb7d18d0690dddd1fdb1a629a06d49b4c11
 Author: Mark Brand <mabrand@mabrand.nl>
 Date:   Fri Sep 24 14:49:50 2010 +0200
 
@@ -212,7 +212,7 @@
  testpixbuf_drawable_DEPENDENCIES = $(DEPS)
  testpixbuf_save_DEPENDENCIES = $(DEPS)
 
-commit 6a7535018b0530f5d6cf2fc39e3194dae226e443
+commit b34df7c9461a798e9a8202eec886ac5e173da3ea
 Author: Mark Brand <mabrand@mabrand.nl>
 Date:   Fri Sep 24 14:51:04 2010 +0200
 
@@ -310,7 +310,7 @@
      ;;
    esac
 
-commit 1a86c4abd517485c154224fd78b851118ac3c0b7
+commit 831f94ccf7a26662bfc9e8d22b9ae9eaea740bbb
 Author: Mark Brand <mabrand@mabrand.nl>
 Date:   Fri Sep 24 14:53:18 2010 +0200
 
@@ -330,7 +330,7 @@
    USE_WIN32_TRUE=
    USE_WIN32_FALSE='#'
 
-commit 6d32f30c154a6fcc459f6efebae913a7b3325e79
+commit 2ec5f9d9ea8d7d80758c5272ff2e94fd0e7856e8
 Author: Mark Brand <mabrand@mabrand.nl>
 Date:   Fri Sep 24 14:54:15 2010 +0200
 
@@ -353,7 +353,7 @@
    GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
  fi
 
-commit 61da66059b505c8d489f44eaef9bd34846d3c2a8
+commit 3e9c211536912bf78c44172b7f6ecd8860887166
 Author: Mark Brand <mabrand@mabrand.nl>
 Date:   Fri Sep 24 14:55:33 2010 +0200
 
@@ -382,7 +382,7 @@
      if test "$cross_compiling" = maybe; then
  	cross_compiling=yes
 
-commit bd50ae9f7b151743c7f301aed2a71017f3bf0e13
+commit 01cc2d128be8a19c1434b912e378deae3b1bfcf9
 Author: Mark Brand <mabrand@mabrand.nl>
 Date:   Fri Sep 24 15:30:49 2010 +0200
 
diff -r 686a80e66ce1 -r 72289a2c36fc src/gtk.mk
--- a/src/gtk.mk	Wed Sep 29 11:43:27 2010 +0200
+++ b/src/gtk.mk	Wed Sep 29 11:44:17 2010 +0200
@@ -45,5 +45,5 @@
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gtk.exe' \
-        `'$(TARGET)-pkg-config' gtk+-2.0 --cflags --libs` -ldnsapi
+        `'$(TARGET)-pkg-config' gtk+-2.0 --cflags --libs`
 endef
diff -r 686a80e66ce1 -r 72289a2c36fc src/gtkmm.mk
--- a/src/gtkmm.mk	Wed Sep 29 11:43:27 2010 +0200
+++ b/src/gtkmm.mk	Wed Sep 29 11:44:17 2010 +0200
@@ -4,8 +4,8 @@
 # GTKMM
 PKG             := gtkmm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.20.3
-$(PKG)_CHECKSUM := ad53f52f18cc3021b7fd6cd06f965471039d5333
+$(PKG)_VERSION  := 2.22.0
+$(PKG)_CHECKSUM := 4a43945ecf20d0db7679daf95d504c2e97fb0a72
 $(PKG)_SUBDIR   := gtkmm-$($(PKG)_VERSION)
 $(PKG)_FILE     := gtkmm-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtkmm.org/
@@ -33,6 +33,5 @@
     '$(TARGET)-g++' \
         -W -Wall -Werror -pedantic -std=c++0x \
         '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-gtkmm.exe' \
-        `'$(TARGET)-pkg-config' gtkmm-2.4 --cflags --libs` \
-        -lwinspool -lcomctl32 -lcomdlg32 -ldnsapi
+        `'$(TARGET)-pkg-config' gtkmm-2.4 --cflags --libs`
 endef
diff -r 686a80e66ce1 -r 72289a2c36fc src/librsvg.mk
--- a/src/librsvg.mk	Wed Sep 29 11:43:27 2010 +0200
+++ b/src/librsvg.mk	Wed Sep 29 11:44:17 2010 +0200
@@ -24,7 +24,7 @@
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --enable-pixbuf-loader \
+        --disable-pixbuf-loader \
         --disable-gtk-theme \
         --disable-mozilla-plugin \
         --disable-gtk-doc \
diff -r 686a80e66ce1 -r 72289a2c36fc src/pango-1-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pango-1-fixes.patch	Wed Sep 29 11:44:17 2010 +0200
@@ -0,0 +1,195 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+commit ed3371ed8a13f169cfd1920ecc794b30bb69cc0b
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Wed Sep 29 00:52:59 2010 +0200
+
+    s,DllMain,static _disabled_DllMain,
+
+diff --git a/pango/pango-utils.c b/pango/pango-utils.c
+index 100dbc7..f60be42 100644
+--- a/pango/pango-utils.c
++++ b/pango/pango-utils.c
+@@ -657,12 +657,12 @@ pango_config_key_get (const char *key)
+ 
+ #ifdef G_OS_WIN32
+ 
+-/* DllMain function needed to tuck away the DLL handle */
++/* static _disabled_DllMain function needed to tuck away the DLL handle */
+ 
+ static HMODULE pango_dll;
+ 
+ BOOL WINAPI
+-DllMain (HINSTANCE hinstDLL,
++static _disabled_DllMain (HINSTANCE hinstDLL,
+ 	 DWORD     fdwReason,
+ 	 LPVOID    lpvReserved)
+ {
+
+commit b33f70af495cdaddab9ddccd79aef777e005bb85
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Wed Sep 29 00:55:07 2010 +0200
+
+    static, not shared
+
+diff --git a/configure b/configure
+index 352c9c4..a78ace5 100755
+--- a/configure
++++ b/configure
+@@ -5942,9 +5942,9 @@ if test "${enable_static+set}" = set; then :
+   enableval=$enable_static; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_static=yes ;;
+-    no) enable_static=no ;;
++    no) enable_static=yes ;;
+     *)
+-     enable_static=no
++     enable_static=yes
+       # Look at the argument we got.  We use all the common list separators.
+       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+       for pkg in $enableval; do
+@@ -5957,7 +5957,7 @@ if test "${enable_static+set}" = set; then :
+       ;;
+     esac
+ else
+-  enable_static=no
++  enable_static=yes
+ fi
+ 
+ 
+@@ -5971,15 +5971,15 @@ fi
+ 
+ if test "$pango_os_win32" = "yes"; then
+   if test x$enable_static = xyes -o x$enable_static = x; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling static library build, must build as DLL on Windows." >&5
+-$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;}
+-    enable_static=no
++    { $as_echo "(disabled warning)" >&5
++$as_echo "(disabled warning)" >&2;}
++    enable_static=yes
+   fi
+   if test x$enable_shared = xno; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling shared library build, must build as DLL on Windows." >&5
+-$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
++    { $as_echo "(disabled warning)" >&5
++$as_echo "(disabled warning)" >&2;}
+   fi
+-  enable_shared=yes
++  enable_shared=no
+ fi
+ 
+ case `pwd` in
+@@ -8969,7 +8969,7 @@ fi
+ if test "${enable_shared+set}" = set; then :
+   enableval=$enable_shared; p=${PACKAGE-default}
+     case $enableval in
+-    yes) enable_shared=yes ;;
++    yes) enable_shared=no ;;
+     no) enable_shared=no ;;
+     *)
+       enable_shared=no
+@@ -8978,14 +8978,14 @@ if test "${enable_shared+set}" = set; then :
+       for pkg in $enableval; do
+ 	IFS="$lt_save_ifs"
+ 	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
++	  enable_shared=no
+ 	fi
+       done
+       IFS="$lt_save_ifs"
+       ;;
+     esac
+ else
+-  enable_shared=yes
++  enable_shared=no
+ fi
+ 
+ 
+@@ -12572,7 +12572,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
+   # are all built from PIC.
+   case $host_os in
+   aix3*)
+-    test "$enable_shared" = yes && enable_static=no
++    test "$enable_shared" = yes && enable_static=yes
+     if test -n "$RANLIB"; then
+       archive_cmds="$archive_cmds~\$RANLIB \$lib"
+       postinstall_cmds='$RANLIB $lib'
+@@ -12581,7 +12581,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
+ 
+   aix[4-9]*)
+     if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-      test "$enable_shared" = yes && enable_static=no
++      test "$enable_shared" = yes && enable_static=yes
+     fi
+     ;;
+   esac
+
+commit 4601f723ef49c010656ef800ce705cd8677833d4
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Wed Sep 29 00:57:12 2010 +0200
+
+    no pango-querymodules
+
+diff --git a/modules/Makefile.in b/modules/Makefile.in
+index 0d48e08..df71e02 100644
+--- a/modules/Makefile.in
++++ b/modules/Makefile.in
+@@ -643,7 +643,7 @@ uninstall-am: uninstall-local
+ 
+ @CROSS_COMPILING_FALSE@all-local: pango.modules
+ 
+-install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
++install-data-local:
+ 	@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then 	\
+ 	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& 	\
+ 	  $(top_builddir)/pango/pango-querymodules$(EXEEXT) 		\
+
+commit 53bd7d3d3a83e40eb7d02568b560840ceadd7c0a
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Wed Sep 29 00:58:13 2010 +0200
+
+    wine workaround s,^install-data-local:.*,install-data-local:,
+
+diff --git a/configure b/configure
+index a78ace5..92b1334 100755
+--- a/configure
++++ b/configure
+@@ -694,7 +694,7 @@ ac_default_prefix=/usr/local
+ ac_clean_files=
+ ac_config_libobj_dir=.
+ LIBOBJS=
+-cross_compiling=no
++cross_compiling=yes
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+@@ -3873,7 +3873,7 @@ $as_echo "$ac_try_echo"; } >&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }; then
+-    cross_compiling=no
++    cross_compiling=yes
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+
+commit ccd472e0aee0109932e261eb1f7d9d24bbf1870c
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Wed Sep 29 00:50:08 2010 +0200
+
+    add missing lib to pango.pc for static linking
+
+diff --git a/pango.pc.in b/pango.pc.in
+index 5cc3ef8..745b8f0 100644
+--- a/pango.pc.in
++++ b/pango.pc.in
+@@ -9,5 +9,5 @@ Name: Pango
+ Description: Internationalized text handling
+ Version: @VERSION@
+ Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
+-Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@
++Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ -lusp10
+ Cflags: -I${includedir}/pango-1.0
diff -r 686a80e66ce1 -r 72289a2c36fc src/pango.mk
--- a/src/pango.mk	Wed Sep 29 11:43:27 2010 +0200
+++ b/src/pango.mk	Wed Sep 29 11:44:17 2010 +0200
@@ -4,8 +4,8 @@
 # Pango
 PKG             := pango
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.28.1
-$(PKG)_CHECKSUM := 2d5907f0ff108cb9c27f69d8e4de564ff3d30221
+$(PKG)_VERSION  := 1.28.2
+$(PKG)_CHECKSUM := 326e9afa015ac5328fb1f9ecc2212e327396008c
 $(PKG)_SUBDIR   := pango-$($(PKG)_VERSION)
 $(PKG)_FILE     := pango-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.pango.org/
@@ -20,13 +20,6 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/pango/pango-utils.c'
-    $(SED) -i 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' '$(1)/configure'
-    $(SED) -i 's,enable_static=no,enable_static=yes,' '$(1)/configure'
-    $(SED) -i 's,enable_shared=yes,enable_shared=no,' '$(1)/configure'
-    $(SED) -i 's,^install-data-local:.*,install-data-local:,' '$(1)/modules/Makefile.in'
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \