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

[Koop Mast]

On Sat, 2009-12-12 at 12:50 -0600, Jeremy Messenger wrote:
> On Thu, 10 Dec 2009 01:30:45 -0600, Vasil Dimov <vd at 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: xaralx.diff
Type: text/x-patch
Size: 1287 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-gnome/attachments/20091213/e3f749cc/xaralx.bin