Re: cairo

[Matthias Scheler <tron%zhadum.org.uk@localhost>]

On Thu, Sep 13, 2012 at 03:40:18PM +0000, David Holland wrote:
> Between PR 46926 and build failures on other platforms (both Solaris
> and OS X, iirc) I'm wondering if it might not be a good idea to revert
> the recent cairo update, at least until after 2012Q3.
> 
> anyone have thoughts on this?

The Mac OS x problem is a build problem that happens only under
Mac OS X Snow Leopard and older. It can be fixed by this change
to the "cairo" package:

Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/cairo/buildlink3.mk,v
retrieving revision 1.42
diff -u -r1.42 buildlink3.mk
--- buildlink3.mk       8 Sep 2012 08:53:03 -0000       1.42
+++ buildlink3.mk       1 Oct 2012 12:50:38 -0000
@@ -18,6 +18,7 @@
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.cairo:Mxcb)
+BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.6
 .include "../../x11/libxcb/buildlink3.mk"
 .endif
 
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/cairo/options.mk,v
retrieving revision 1.7
diff -u -r1.7 options.mk
--- options.mk  7 Sep 2012 15:24:03 -0000       1.7
+++ options.mk  1 Oct 2012 12:50:38 -0000
@@ -27,6 +27,7 @@
 .  if !empty(PKG_OPTIONS:Mxcb)
 CONFIGURE_ARGS+=       --enable-xcb
 PLIST.xcb=             yes
+BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.6
 .  include "../../x11/libxcb/buildlink3.mk"
 .  endif
 
I'm however worried about the side effect of this change. It might result
in some applications using the builtin "libxcb" and the one from "pkgsrc".
This could be fixed by bumping the minimum version followed by a recursive
bump of packages using "libxcb". But I'm reasonably sure that we don't
want to backport such a change.

        Kind regards

-- 
Matthias Scheler                                  http://zhadum.org.uk/