aboutsummaryrefslogtreecommitdiff
path: root/libraries/wxGTK/newgtk.patch
diff options
context:
space:
mode:
authorNiels Horn <niels.horn@gmail.com>2010-04-08 22:24:38 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-15 10:26:56 +0200
commit9191a0182da794e46dd484b2f1161247c38bace0 (patch)
tree6913e7f7b496f206f1514c5740b6adbab52f72a7 /libraries/wxGTK/newgtk.patch
parent22f98c0cea108490e9eec406a84de64b7b6ad5ad (diff)
libraries/wxGTK: Updated for version 2.8.10.
Diffstat (limited to 'libraries/wxGTK/newgtk.patch')
-rw-r--r--libraries/wxGTK/newgtk.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/libraries/wxGTK/newgtk.patch b/libraries/wxGTK/newgtk.patch
new file mode 100644
index 0000000000000..eb8e653c9e316
--- /dev/null
+++ b/libraries/wxGTK/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"