slackbuilds_ponce/libraries/wxPython/wxGTK-2.8.10.1-gsocket.patch
Heinz Wiesinger 5e9800af73 libraries/wxPython: Build bump, BUILD=3
Added patch for newer glib.
  Added patch for newer libpng.
2010-05-15 10:38:34 +02:00

16 lines
480 B
Diff

--- 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"