From d5e3e74b1bd98e0b3e5e828ce958a66d57a3c658 Mon Sep 17 00:00:00 2001 From: Marco Cavallini Date: Mon, 12 Oct 2009 10:40:58 +0200 Subject: Added recipes/wxwidgets/wxwidgets-2.8.10/gsockgtk-cpp-wx2810.diff without this patch wxwidgets do not build using latest dependecies for details see http://trac.wxwidgets.org/ticket/10883 --- .../wxwidgets/wxwidgets-2.8.10/gsockgtk-cpp-wx2810.diff | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 recipes/wxwidgets/wxwidgets-2.8.10/gsockgtk-cpp-wx2810.diff (limited to 'recipes/wxwidgets/wxwidgets-2.8.10/gsockgtk-cpp-wx2810.diff') diff --git a/recipes/wxwidgets/wxwidgets-2.8.10/gsockgtk-cpp-wx2810.diff b/recipes/wxwidgets/wxwidgets-2.8.10/gsockgtk-cpp-wx2810.diff new file mode 100644 index 0000000000..f1b796f0ed --- /dev/null +++ b/recipes/wxwidgets/wxwidgets-2.8.10/gsockgtk-cpp-wx2810.diff @@ -0,0 +1,16 @@ +--- wxwidgets-2.8.10/src/gtk/gsockgtk-old.cpp 2009-03-06 13:11:40.000000000 +0100 ++++ wxwidgets-2.8.10/src/gtk/gsockgtk.cpp 2009-10-11 20:47:24.000000000 +0200 +@@ -15,8 +15,13 @@ + #include + #include + ++// 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 + #include ++#undef GSocket + + #include "wx/gsocket.h" + #include "wx/unix/gsockunx.h" -- cgit v1.2.3