On Sun, Feb 03, 2013 at 09:26:48AM +0000, Stuart Henderson wrote: > Cairo uses lzo2 now, check the changelog..also fixes a hardcoded > path to x11. > > Diff looks good but I am a little twitchy about updating a widely used > library at this point, bearing in mind that if it causes problems there > might not be time to fix them, this at least needs some wide testing. > It's working ok for what I use on amd64 but could do with tests on > more arches.. >
So here is the diff I intend to commit. Ok? Any strong objection? Should we wait post-5.3? Eric. Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/cairo/Makefile,v retrieving revision 1.45 diff -u -p -r1.45 Makefile --- Makefile 30 Jan 2013 13:17:51 -0000 1.45 +++ Makefile 7 Feb 2013 11:02:56 -0000 @@ -2,11 +2,10 @@ COMMENT= vector graphics library -DISTNAME= cairo-1.12.8 -REVISION= 1 -SHARED_LIBS+= cairo 12.1 +DISTNAME= cairo-1.12.12 +SHARED_LIBS+= cairo 12.2 SHARED_LIBS+= cairo-gobject 1.0 -SHARED_LIBS+= cairo-script-interpreter 1.0 +SHARED_LIBS+= cairo-script-interpreter 1.1 CATEGORIES= graphics DPB_PROPERTIES= parallel EXTRACT_SUFX= .tar.xz @@ -16,7 +15,7 @@ HOMEPAGE= http://cairographics.org/ MAINTAINER= Eric Faurot <e...@openbsd.org> WANTLIB += X11 Xau Xdmcp Xext Xrender expat ffi fontconfig freetype -WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 m pcre pixman-1 png +WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 lzo2 m pcre pixman-1 png WANTLIB += pthread pthread-stubs xcb xcb-render xcb-shm z # LGPLv2.1 / MPL 1.1 @@ -32,8 +31,9 @@ MODULES= devel/gettext USE_LIBTOOL= Yes USE_GMAKE= Yes -LIB_DEPENDS= graphics/png \ - devel/glib2 +LIB_DEPENDS= archivers/lzo2 \ + devel/glib2 \ + graphics/png CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ @@ -44,7 +44,9 @@ CONFIGURE_ARGS += --enable-tee # If one of these tools is found at configure stage, it might be used, # no matter whether we use --disable-gtk-doc or not. -CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \ +CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ + ac_cv_path_GTKDOC_CHECK="" \ ac_cv_path_GTKDOC_REBASE="" \ ac_cv_path_GTKDOC_MKPDF="" Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/cairo/distinfo,v retrieving revision 1.20 diff -u -p -r1.20 distinfo --- distinfo 12 Nov 2012 12:29:07 -0000 1.20 +++ distinfo 7 Feb 2013 11:02:56 -0000 @@ -1,2 +1,2 @@ -SHA256 (cairo-1.12.8.tar.xz) = j7tvxmEXq0EAutgwy0R5SX5TxvP6y5i/BcjSmFVOvdk= -SIZE (cairo-1.12.8.tar.xz) = 42113752 +SHA256 (cairo-1.12.12.tar.xz) = FPaTdZ7Mh0cjVa6PDDRzGoV4tAi2B8/QtdNDMf8F2Bo= +SIZE (cairo-1.12.12.tar.xz) = 42139096 Index: patches/patch-util_cairo-fdr_Makefile_in =================================================================== RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-fdr_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-util_cairo-fdr_Makefile_in --- patches/patch-util_cairo-fdr_Makefile_in 12 Nov 2012 12:29:07 -0000 1.2 +++ patches/patch-util_cairo-fdr_Makefile_in 7 Feb 2013 11:02:56 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.2 2012/11/12 12:29:07 eric Exp $ ---- util/cairo-fdr/Makefile.in.orig Mon Oct 22 06:08:40 2012 -+++ util/cairo-fdr/Makefile.in Wed Oct 24 03:52:52 2012 -@@ -379,7 +379,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ +--- util/cairo-fdr/Makefile.in.orig Thu Jan 31 10:25:59 2013 ++++ util/cairo-fdr/Makefile.in Sat Feb 2 00:30:35 2013 +@@ -380,7 +380,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ cairo_fdr_la_SOURCES = fdr.c cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS) cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS) Index: patches/patch-util_cairo-trace_Makefile_in =================================================================== RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-trace_Makefile_in,v retrieving revision 1.4 diff -u -p -r1.4 patch-util_cairo-trace_Makefile_in --- patches/patch-util_cairo-trace_Makefile_in 16 Jan 2013 14:29:15 -0000 1.4 +++ patches/patch-util_cairo-trace_Makefile_in 7 Feb 2013 11:02:56 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.4 2013/01/16 14:29:15 ajacoutot Exp $ ---- util/cairo-trace/Makefile.in.orig Mon Oct 22 06:08:41 2012 -+++ util/cairo-trace/Makefile.in Wed Oct 24 03:51:46 2012 -@@ -399,7 +399,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$ +--- util/cairo-trace/Makefile.in.orig Thu Jan 31 10:26:00 2013 ++++ util/cairo-trace/Makefile.in Sat Feb 2 00:30:35 2013 +@@ -400,7 +400,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$ $(AM_CPPFLAGS) libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
