Re: CVS commit: pkgsrc/x11/renderproto

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Wed, Dec 15, 2010 at 09:33:13AM +0000, David Brownlee wrote:
> Module Name:  pkgsrc
> Committed By: abs
> Date:         Wed Dec 15 09:33:13 UTC 2010
> 
> Modified Files:
>       pkgsrc/x11/renderproto: buildlink3.mk
> 
> Log Message:
> Use renderproto9 for X11_TYPE native and! BUILTIN_X11_VERSION.xorg

I'm not sure this particular commit is at fault, but I'm guessing one
of your recent commits broke building cairo for me on
NetBSD-5.99.41/amd64 with builtin xorg.

That's from a pbulk (i.e. sandbox with only necessary dependencies installed) 
build:

...
=> Build dependency renderproto>=0.9.3nb1: found renderproto-0.9.3nb2
...
--- cairo-xlib-surface.lo ---
In file included from cairo-xlib-private.h:41,
                 from cairo-xlib-surface.c:50:
cairo-xlib-xrender-private.h:105: error: redefinition of 'struct _XCircle'
cairo-xlib-xrender-private.h:109: error: redefinition of typedef 'XCircle'
/scratch/graphics/cairo/work/.x11-buildlink/include/X11/extensions/Xrender.h:150:
 error: previous declaration of 'XCircle' was here
cairo-xlib-xrender-private.h:110: error: redefinition of 'struct 
_XLinearGradient'
cairo-xlib-xrender-private.h:113: error: redefinition of typedef 
'XLinearGradient'
/scratch/graphics/cairo/work/.x11-buildlink/include/X11/extensions/Xrender.h:189:
 error: previous declaration of 'XLinearGradient' was here
cairo-xlib-xrender-private.h:115: error: redefinition of 'struct 
_XRadialGradient'
cairo-xlib-xrender-private.h:118: error: redefinition of typedef 
'XRadialGradient'
/scratch/graphics/cairo/work/.x11-buildlink/include/X11/extensions/Xrender.h:194:
 error: previous declaration of 'XRadialGradient' was here
cairo-xlib-xrender-private.h:120: error: redefinition of 'struct 
_XConicalGradient'
cairo-xlib-xrender-private.h:123: error: redefinition of typedef 
'XConicalGradient'
/scratch/graphics/cairo/work/.x11-buildlink/include/X11/extensions/Xrender.h:199:
 error: previous declaration of 'XConicalGradient' was here

Can you please fix it?

Thanks,
 Thomas