wok rev 4090
Fix: wxWidgets build (patch gsockgtk.cpp)
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Thu Sep 17 12:34:08 2009 +0200 (2009-09-17) |
parents | 2c110965aa8b |
children | 342badea5a35 |
files | wxWidgets/receipt wxWidgets/stuff/gsockgtk.patch |
line diff
1.1 --- a/wxWidgets/receipt Thu Sep 17 11:53:23 2009 +0200 1.2 +++ b/wxWidgets/receipt Thu Sep 17 12:34:08 2009 +0200 1.3 @@ -11,7 +11,7 @@ 1.4 xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \ 1.5 xorg-libXfixes xorg-libXinerama xorg-libXrender" 1.6 BUILD_DEPENDS="pkg-config gtk+ gtk+-dev expat-dev zlib-dev \ 1.7 -xorg-dev xorg-xineramaproto" 1.8 +xorg-dev xorg-xineramaproto patch" 1.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.10 WEB_SITE="http://www.wxwidgets.org/" 1.11 WGET_URL="$SF_MIRROR/wxwindows/$TARBALL" 1.12 @@ -20,6 +20,7 @@ 1.13 compile_rules() 1.14 { 1.15 cd $src 1.16 + patch -p 0 < ../stuff/gsockgtk.patch || exit 1 1.17 ./configure \ 1.18 --prefix=/usr \ 1.19 --enable-shared \
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/wxWidgets/stuff/gsockgtk.patch Thu Sep 17 12:34:08 2009 +0200 2.3 @@ -0,0 +1,16 @@ 2.4 +--- src/gtk/gsockgtk.cpp Fri Mar 6 13:11:40 2009 2.5 ++++ src/gtk/gsockgtk.cpp Thu Sep 17 12:10:10 2009 2.6 +@@ -15,8 +15,13 @@ 2.7 + #include <stdlib.h> 2.8 + #include <stdio.h> 2.9 + 2.10 ++// newer versions of glib define its own GSocket but we unfortunately use this 2.11 ++// name in our own (semi-)public header and so can't change it -- rename glib 2.12 ++// one instead 2.13 ++#define GSocket GlibGSocket 2.14 + #include <gdk/gdk.h> 2.15 + #include <glib.h> 2.16 ++#undef GSocket 2.17 + 2.18 + #include "wx/gsocket.h" 2.19 + #include "wx/unix/gsockunx.h"