diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2009-08-06 04:56:07 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2009-08-06 04:56:07 +0000 |
| commit | 0268c7f135f56568f54e6c3b7eafe44ec4ebe82c (patch) | |
| tree | e25be70be31b251de195f37cfa7ddd493eb73680 /x11-libs/wxGTK/files | |
| parent | respecting CC variable, CFLAGS, LDFLAGS, omiting -Werror, fixing links, bugs ... (diff) | |
| download | gentoo-2-0268c7f135f56568f54e6c3b7eafe44ec4ebe82c.tar.gz gentoo-2-0268c7f135f56568f54e6c3b7eafe44ec4ebe82c.tar.bz2 gentoo-2-0268c7f135f56568f54e6c3b7eafe44ec4ebe82c.zip | |
Add patch from upstream to fix symbol conflict with GSocket struct from
developmental glib currently in gnome-overlay. Bug #278778.
(Portage version: 2.2_rc35/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/wxGTK/files')
| -rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch new file mode 100644 index 000000000000..b875cb814ad6 --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch @@ -0,0 +1,16 @@ +--- wxPython-src-2.8.10.1-orig/src/gtk/gsockgtk.cpp ++++ wxPython-src-2.8.10.1/src/gtk/gsockgtk.cpp +@@ -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" |