Date: Tue, 29 Dec 2009 10:07:14 +0200 From: Vasil Dimov <vd@freebsd.org> To: Koop Mast <kwm@freebsd.org> Cc: gnome@freebsd.org, Pav Lucistnik <pav@freebsd.org>, fjoe@freebsd.org Subject: Re: glib-2.22.3 and wxgtk2-2.8.10_2 both declare GSocket [Re: [Fwd: XaraLX-devel-0.7r1768_3 failed on amd64 6]] Message-ID: <20091229080713.GA64341@hag.hw.v5d.org> In-Reply-To: <1260669695.4303.841.camel@headache.rainbow-runner.nl> References: <1260402728.11917.18.camel@hood.oook.cz> <20091210073045.GA41397@hag.hw.v5d.org> <op.u4t9btr99aq2h7@localhost> <1260669695.4303.841.camel@headache.rainbow-runner.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
--pf9I7BMVVzbSWLtt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
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
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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
> +=20
> + #ifdef __WXGTK20__
> ++#define GSocket GlibSocket
> + #include <gtk/gtk.h>
> ++#undef GSocket
> + extern GtkWidget *wxGetRootWindow();
> + #endif
> +=20
> Index: xaralx-devel/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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=3D ${.CURDIR}/pkg-plist
> PATCHDIR=3D ${.CURDIR}/files
> EXTRA_PATCHES=3D ${MASTERDIR}/files/patch-configure.in \
> + ${MASTERDIR}/files/patch-wxOil_ftfonts.cpp \
> ${MASTERDIR}/files/patch-wxOil_compatdef.h
> =20
> .include "${MASTERDIR}/Makefile"
--=20
Vasil Dimov
--pf9I7BMVVzbSWLtt
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
iEYEARECAAYFAks5uLEACgkQFw6SP/bBpCDipQCg2lm5d1IDqJhJLsgHUZFjT8/c
YsEAoNNdXisD0rvPcHSHOl07FcgGT5Gn
=EKDT
-----END PGP SIGNATURE-----
--pf9I7BMVVzbSWLtt--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091229080713.GA64341>