diff options
| author | Thierry N <thierryn1 at hispeed dot ch> | 2009-08-16 21:05:50 +0200 |
|---|---|---|
| committer | Thierry N <thierryn1 at hispeed dot ch> | 2009-08-16 21:05:50 +0200 |
| commit | e5fbb6ab58ea813f093618d44bb47ac68b07b41d (patch) | |
| tree | 7b9a5bea93402492880303045aa2c49d2aff8c66 /extra/wxgtk/glib-2.21.patch | |
| parent | 61951a8bfebebb342e60d31461a99727afc799f0 (diff) | |
| download | nutyx-pakxe-e5fbb6ab58ea813f093618d44bb47ac68b07b41d.tar.gz nutyx-pakxe-e5fbb6ab58ea813f093618d44bb47ac68b07b41d.tar.bz2 nutyx-pakxe-e5fbb6ab58ea813f093618d44bb47ac68b07b41d.tar.xz nutyx-pakxe-e5fbb6ab58ea813f093618d44bb47ac68b07b41d.zip | |
Ajout de wxgtk#2.8.10-1
Diffstat (limited to 'extra/wxgtk/glib-2.21.patch')
| -rw-r--r-- | extra/wxgtk/glib-2.21.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/extra/wxgtk/glib-2.21.patch b/extra/wxgtk/glib-2.21.patch new file mode 100644 index 000000000..079fe28d6 --- /dev/null +++ b/extra/wxgtk/glib-2.21.patch @@ -0,0 +1,16 @@ +--- 2.8/src/gtk/gsockgtk.cpp (revision 60599) ++++ 2.8/src/gtk/gsockgtk.cpp (working copy) +@@ -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" |