glib-2.22.3 and wxgtk2-2.8.10_2 both declare GSocket [Re: [Fwd: XaraLX-devel-0.7r1768_3 failed on amd64 6]]

[Vasil Dimov]

On Sun, Dec 13, 2009 at 03:01:33 +0100, Koop Mast wrote:
[...]
> Vasil can you review this patch and or commit? It should fix the build.
[...]

Committed, thanks!

> ? xaralx-devel/work
> Index: xaralx/files/patch-wxOil_ftfonts.cpp
> ===================================================================
> RCS file: xaralx/files/patch-wxOil_ftfonts.cpp
> diff -N xaralx/files/patch-wxOil_ftfonts.cpp
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ xaralx/files/patch-wxOil_ftfonts.cpp	13 Dec 2009 00:53:32 -0000
> @@ -0,0 +1,12 @@
> +--- wxOil/ftfonts.cpp.orig	2009-12-12 23:53:05.000000000 +0100
> ++++ wxOil/ftfonts.cpp	2009-12-12 23:54:08.000000000 +0100
> +@@ -122,7 +122,9 @@ DECLARE_SOURCE( "$Revision: 1535 $" );
> + #include FT_TYPE1_TABLES_H
> + 
> + #ifdef __WXGTK20__
> ++#define GSocket GlibSocket
> + #include <gtk/gtk.h>
> ++#undef GSocket
> + extern GtkWidget *wxGetRootWindow();
> + #endif
> + 
> Index: xaralx-devel/Makefile
> ===================================================================
> RCS file: /home/pcvs/ports/graphics/xaralx-devel/Makefile,v
> retrieving revision 1.32
> diff -a -u -r1.32 Makefile
> --- xaralx-devel/Makefile	31 Jul 2009 13:52:53 -0000	1.32
> +++ xaralx-devel/Makefile	13 Dec 2009 00:53:32 -0000
> @@ -17,6 +17,7 @@
>  PLIST=		${.CURDIR}/pkg-plist
>  PATCHDIR=	${.CURDIR}/files
>  EXTRA_PATCHES=	${MASTERDIR}/files/patch-configure.in \
> +		${MASTERDIR}/files/patch-wxOil_ftfonts.cpp \
>  		${MASTERDIR}/files/patch-wxOil_compatdef.h
>  
>  .include "${MASTERDIR}/Makefile"


-- 
Vasil Dimov
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 163 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-gnome/attachments/20091229/fec7afe5/attachment.pgp