mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-25 10:03:03 +01:00
5e9800af73
Added patch for newer glib. Added patch for newer libpng.
16 lines
480 B
Diff
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"
|