wxgtk: fixed build with current glib

This commit is contained in:
Antti Nykanen 2009-10-05 19:03:11 +03:00
parent 0a9f201cdd
commit 6ad7704043
3 changed files with 19 additions and 4 deletions

View File

@ -1 +1,2 @@
88b867bc118a183af56efc67014bdf27 wxGTK-2.8.10.tar.bz2
b0f076508f35b78a6c6d10c06afc38f5 wxgtk-2.8.10-gsocket.patch

View File

@ -5,14 +5,14 @@
name=wxgtk
version=2.8.10
release=1
source=(http://dl.sf.net/wxwindows/wxGTK-$version.tar.bz2)
# alternate mirror
# ftp://biolpc22.york.ac.uk/pub/$version/wxGTK-$version.tar.bz2
release=2
source=(http://dl.sf.net/wxwindows/wxGTK-$version.tar.bz2
$name-$version-gsocket.patch)
build() {
export LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
cd wxGTK-$version
patch -p0 -i $SRC/$name-$version-gsocket.patch
./configure \
--prefix=/usr \
--enable-gtk2 \

View File

@ -0,0 +1,14 @@
--- src/gtk/gsockgtk.cpp~
+++ src/gtk/gsockgtk.cpp
@@ -16,6 +16,11 @@
#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"