diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2010-09-05 06:13:57 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2010-09-05 06:13:57 (GMT) |
| commit | b172f79fadb565ecfbcec9508f9377d8618a4f4c (patch) | |
| tree | bf8823b07e3313c3afa000a9b31e4f9a735cb818 /abs/extra/wxgtk/gsocket.patch | |
| parent | f9d54ab7c3853208484e304bc6cf40ab0f79d400 (diff) | |
| parent | 5e7027c6194237ca1dc5fcbb3648483a970fb500 (diff) | |
| download | linhes_pkgbuild-b172f79fadb565ecfbcec9508f9377d8618a4f4c.zip linhes_pkgbuild-b172f79fadb565ecfbcec9508f9377d8618a4f4c.tar.gz linhes_pkgbuild-b172f79fadb565ecfbcec9508f9377d8618a4f4c.tar.bz2 | |
Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD
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" |