--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/wxwidgets-03-changeset_r61009.diff	Sun Jun 06 10:37:12 2010 +0000
@@ -0,0 +1,16 @@
+--- wxWidgets-2.8.10-orig/src/gtk/gsockgtk.cpp	2009-03-06 12:11:40.000000000 +0000
++++ wxWidgets-2.8.10/src/gtk/gsockgtk.cpp	2010-06-04 08:23:48.380627757 +0000
+@@ -15,8 +15,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+ 
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"