summaryrefslogtreecommitdiff
path: root/development/amaya/newgtk.patch
diff options
context:
space:
mode:
Diffstat (limited to 'development/amaya/newgtk.patch')
-rw-r--r--development/amaya/newgtk.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/development/amaya/newgtk.patch b/development/amaya/newgtk.patch
new file mode 100644
index 0000000000..eb8e653c9e
--- /dev/null
+++ b/development/amaya/newgtk.patch
@@ -0,0 +1,16 @@
+--- wxGTK-2.8.10/src/gtk/gsockgtk.cpp 2009-03-06 09:18:08.000000000 -0300
++++ wxGTK-2.8.10_patched/src/gtk/gsockgtk.cpp 2010-03-27 08:32:57.000000000 -0300
+@@ -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"