# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1253183648 -7200
# Node ID 5c2a094517588b1f488e8bc1a2378011bb1eb66d
# Parent  2c110965aa8bd571905e377ea6564f601c66aac0
Fix: wxWidgets build (patch gsockgtk.cpp)

diff -r 2c110965aa8b -r 5c2a09451758 wxWidgets/receipt
--- a/wxWidgets/receipt	Thu Sep 17 11:53:23 2009 +0200
+++ b/wxWidgets/receipt	Thu Sep 17 12:34:08 2009 +0200
@@ -11,7 +11,7 @@
 xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \
 xorg-libXfixes xorg-libXinerama xorg-libXrender"
 BUILD_DEPENDS="pkg-config gtk+ gtk+-dev expat-dev zlib-dev \
-xorg-dev xorg-xineramaproto"
+xorg-dev xorg-xineramaproto patch"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.wxwidgets.org/"
 WGET_URL="$SF_MIRROR/wxwindows/$TARBALL"
@@ -20,6 +20,7 @@
 compile_rules()
 {
 	cd $src
+	patch -p 0 < ../stuff/gsockgtk.patch || exit 1
 	./configure \
 		--prefix=/usr \
 		--enable-shared \
diff -r 2c110965aa8b -r 5c2a09451758 wxWidgets/stuff/gsockgtk.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wxWidgets/stuff/gsockgtk.patch	Thu Sep 17 12:34:08 2009 +0200
@@ -0,0 +1,16 @@
+--- src/gtk/gsockgtk.cpp	Fri Mar  6 13:11:40 2009
++++ src/gtk/gsockgtk.cpp	Thu Sep 17 12:10:10 2009
+@@ -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"