diff options
| author | James Meyer <james.meyer@operamail.com> | 2010-08-30 22:26:00 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2010-08-30 22:26:00 (GMT) |
| commit | 1f175a7b07b9553ce98d0546ac04dbb925ec0bc9 (patch) | |
| tree | c969070115611a8a75f23d468aa5e0cf86a08121 /abs/extra/wxgtk/gsocket.patch | |
| parent | c4bd4457b5d640e1c8f5afbca7cd54c53691e5fc (diff) | |
| download | linhes_pkgbuild-1f175a7b07b9553ce98d0546ac04dbb925ec0bc9.zip linhes_pkgbuild-1f175a7b07b9553ce98d0546ac04dbb925ec0bc9.tar.gz linhes_pkgbuild-1f175a7b07b9553ce98d0546ac04dbb925ec0bc9.tar.bz2 | |
RESYNC EXTRA:
synced extra-testing -> extra repo
Signed-off-by: James Meyer <james.meyer@operamail.com>
Diffstat (limited to 'abs/extra/wxgtk/gsocket.patch')
| -rw-r--r-- | abs/extra/wxgtk/gsocket.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/abs/extra/wxgtk/gsocket.patch b/abs/extra/wxgtk/gsocket.patch new file mode 100644 index 0000000..0f1fc7b --- /dev/null +++ b/abs/extra/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" |