diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-09-18 21:28:25 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-09-18 21:28:25 +0800 |
| commit | d72a649d5109055d2d8fc5b2d58c54e916b29155 (patch) | |
| tree | 845b817108514c6e200fa043c731bc199877933d /x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp | |
| parent | 9a640a521086c04a1c33e6b93856b17d1584fc36 (diff) | |
| download | marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar.gz marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar.bz2 marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar.lz marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar.xz marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.tar.zst marcuscom-ports-d72a649d5109055d2d8fc5b2d58c54e916b29155.zip | |
Add upstream hack to fix the build of wxgtk26 and wxgtk28 with glib 2.21.x.
Submitted by: Dominique Goncalves on IRC
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12899 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp')
| -rw-r--r-- | x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp new file mode 100644 index 000000000..113f73e51 --- /dev/null +++ b/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp @@ -0,0 +1,16 @@ +--- src/gtk//gsockgtk.cpp.orig 2007-03-20 16:50:07.000000000 +0100 ++++ src/gtk/gsockgtk.cpp 2009-09-18 14:46:47.000000000 +0200 +@@ -14,8 +14,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" |