Date: Sun, 13 Dec 2009 03:01:33 +0100 From: Koop Mast <kwm@FreeBSD.org> To: Jeremy Messenger <mezz7@cox.net> Cc: gnome@freebsd.org, vd@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: <1260669695.4303.841.camel@headache.rainbow-runner.nl> In-Reply-To: <op.u4t9btr99aq2h7@localhost> References: <1260402728.11917.18.camel@hood.oook.cz> <20091210073045.GA41397@hag.hw.v5d.org> <op.u4t9btr99aq2h7@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-HXPVeQb8awflvSfvBktv Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Sat, 2009-12-12 at 12:50 -0600, Jeremy Messenger wrote: > On Thu, 10 Dec 2009 01:30:45 -0600, Vasil Dimov <vd@freebsd.org> wrote: > > > On Thu, Dec 10, 2009 at 00:52:08 +0100, Pav Lucistnik wrote: > >> -------- P?eposlan? zpr?va -------- <snip> > >> > > >> > Stop in /a/ports/graphics/xaralx-devel. > > [...] > > > > Hi, > > > > the problem above is genuine and is because both devel/glib20 (via > > /usr/local/include/glib-2.0/gio/giotypes.h) and > > x11-toolkits/wxgtk28-common (via > > /usr/local/include/wx-2.8/wx/unix/gsockunx.h) declare the symbol > > GSocket. > > > > From /usr/local/include/glib-2.0/gio/giotypes.h: > > > > 113 /** > > 114 * GSocket: > > 115 * > > 116 * A lowlevel network socket object. > > 117 * > > 118 * Since: 2.22 > > 119 **/ > > 120 typedef struct _GSocket GSocket; > > > > devel/glib20 has been upgraded from 2.20 to 2.22 on Nov 28. > > > > Is this problem occuring with other than graphics/xaralx* ports? > > > > If yes, then I think it should be fixed somehow in devel/glib20 and > > x11-toolkits/wxgtk28-common. > > http://trac.wxwidgets.org/ticket/10883 > http://trac.wxwidgets.org/changeset/61009 > > If there is more conflict in our wxgtk* ports, you can search in its trac. > The trac has pretty good search engine. > > Cheers, > Mezz > > > If no, then it should be fixed in graphics/xaralx* and if this is the > > case I will "fix" it by marking graphics/xaralx* as broken and > > deprecated since the development ceased in Aug 2006 and it looks like > > the project is abandoned. > > > > Thanks! > The links mezz posted illustrate the problem at hand. Its fixed in the wxgtk* for ports that use that toolkit. Problem is that if a port includes glib.h or gtk.h itself, then we need to do the same trick for that header too. Vasil can you review this patch and or commit? It should fix the build. -Koop --=-HXPVeQb8awflvSfvBktv Content-Disposition: attachment; filename="xaralx.diff" Content-Type: text/x-patch; name="xaralx.diff"; charset="us-ascii" Content-Transfer-Encoding: 7bit ? 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" --=-HXPVeQb8awflvSfvBktv--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1260669695.4303.841.camel>