diff options
| author | Heinz Wiesinger <pprkut@liwjatan.at> | 2010-04-20 00:51:49 -0500 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2010-05-15 10:38:34 +0200 |
| commit | 5e9800af732969afb665e7aa87e6f620992cd02a (patch) | |
| tree | 26c604b59d58944fc977ca5e5663b18721266dbb /libraries/wxPython/wxGTK-2.8.10.1-gsocket.patch | |
| parent | 0b6040200e5e23f40a6c6886ad0ca64bfe515b16 (diff) | |
libraries/wxPython: Build bump, BUILD=3
Added patch for newer glib.
Added patch for newer libpng.
Diffstat (limited to 'libraries/wxPython/wxGTK-2.8.10.1-gsocket.patch')
| -rw-r--r-- | libraries/wxPython/wxGTK-2.8.10.1-gsocket.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libraries/wxPython/wxGTK-2.8.10.1-gsocket.patch b/libraries/wxPython/wxGTK-2.8.10.1-gsocket.patch new file mode 100644 index 0000000000000..b875cb814ad6a --- /dev/null +++ b/libraries/wxPython/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" |