From owner-freebsd-gnome@FreeBSD.ORG Tue Dec 29 08:07:16 2009 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A32E6106566C; Tue, 29 Dec 2009 08:07:16 +0000 (UTC) (envelope-from vdmail@v5d.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6B7CE8FC14; Tue, 29 Dec 2009 08:07:16 +0000 (UTC) Received: from mail.v5d.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nBT87FWv074382; Tue, 29 Dec 2009 08:07:16 GMT (envelope-from vdmail@v5d.org) Received: by mail.v5d.org (Postfix, from userid 1007) id 6222A1CC98; Tue, 29 Dec 2009 10:07:14 +0200 (EET) Date: Tue, 29 Dec 2009 10:07:14 +0200 From: Vasil Dimov To: Koop Mast Message-ID: <20091229080713.GA64341@hag.hw.v5d.org> References: <1260402728.11917.18.camel@hood.oook.cz> <20091210073045.GA41397@hag.hw.v5d.org> <1260669695.4303.841.camel@headache.rainbow-runner.nl> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="pf9I7BMVVzbSWLtt" Content-Disposition: inline In-Reply-To: <1260669695.4303.841.camel@headache.rainbow-runner.nl> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: gnome@freebsd.org, Pav Lucistnik , 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]] X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: vd@freebsd.org List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2009 08:07:16 -0000 --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 > ++#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--