diff options
author | James Meyer <james.meyer@operamail.com> | 2010-03-21 17:53:37 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2010-03-21 17:53:37 (GMT) |
commit | ae1bd59670b5cc296524d1d66fabdcbebca58d5b (patch) | |
tree | 68b661aecb0842eb49d2c2653e8e728ba371f663 /abs/extra-testing/wxgtk/gsocket.patch | |
parent | b6b7cd41b193c21fbed23c47dc56dbc16c113be9 (diff) | |
download | linhes_pkgbuild-ae1bd59670b5cc296524d1d66fabdcbebca58d5b.zip linhes_pkgbuild-ae1bd59670b5cc296524d1d66fabdcbebca58d5b.tar.gz linhes_pkgbuild-ae1bd59670b5cc296524d1d66fabdcbebca58d5b.tar.bz2 |
wxgtk: updated to 2.8.10.1
ref 508
Diffstat (limited to 'abs/extra-testing/wxgtk/gsocket.patch')
-rw-r--r-- | abs/extra-testing/wxgtk/gsocket.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/abs/extra-testing/wxgtk/gsocket.patch b/abs/extra-testing/wxgtk/gsocket.patch new file mode 100644 index 0000000..0f1fc7b --- /dev/null +++ b/abs/extra-testing/wxgtk/gsocket.patch @@ -0,0 +1,18 @@ +Index: 2.8/src/gtk/gsockgtk.cpp +=================================================================== +--- 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" |