update to cairo 1.12.14

prodded by Brad

ok aja@ naddy@
This commit is contained in:
eric 2013-03-04 20:40:18 +00:00
parent 0f108e9169
commit d50f8fdde1
4 changed files with 21 additions and 19 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.45 2013/01/30 13:17:51 brad Exp $ # $OpenBSD: Makefile,v 1.46 2013/03/04 20:40:18 eric Exp $
COMMENT= vector graphics library COMMENT= vector graphics library
DISTNAME= cairo-1.12.8 DISTNAME= cairo-1.12.14
REVISION= 1 SHARED_LIBS+= cairo 12.2
SHARED_LIBS+= cairo 12.1
SHARED_LIBS+= cairo-gobject 1.0 SHARED_LIBS+= cairo-gobject 1.0
SHARED_LIBS+= cairo-script-interpreter 1.0 SHARED_LIBS+= cairo-script-interpreter 1.1
CATEGORIES= graphics CATEGORIES= graphics
DPB_PROPERTIES= parallel DPB_PROPERTIES= parallel
EXTRACT_SUFX= .tar.xz EXTRACT_SUFX= .tar.xz
@ -16,7 +15,7 @@ HOMEPAGE= http://cairographics.org/
MAINTAINER= Eric Faurot <eric@openbsd.org> MAINTAINER= Eric Faurot <eric@openbsd.org>
WANTLIB += X11 Xau Xdmcp Xext Xrender expat ffi fontconfig freetype 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 WANTLIB += pthread pthread-stubs xcb xcb-render xcb-shm z
# LGPLv2.1 / MPL 1.1 # LGPLv2.1 / MPL 1.1
@ -32,8 +31,9 @@ MODULES= devel/gettext
USE_LIBTOOL= Yes USE_LIBTOOL= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
LIB_DEPENDS= graphics/png \ LIB_DEPENDS= archivers/lzo2 \
devel/glib2 devel/glib2 \
graphics/png
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ 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, # If one of these tools is found at configure stage, it might be used,
# no matter whether we use --disable-gtk-doc or not. # 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_REBASE="" \
ac_cv_path_GTKDOC_MKPDF="" ac_cv_path_GTKDOC_MKPDF=""

View File

@ -1,2 +1,2 @@
SHA256 (cairo-1.12.8.tar.xz) = j7tvxmEXq0EAutgwy0R5SX5TxvP6y5i/BcjSmFVOvdk= SHA256 (cairo-1.12.14.tar.xz) = ltDR4/m3TSyjRp/xh8Xl8lZJsa01zwb086g4R9/0rBM=
SIZE (cairo-1.12.8.tar.xz) = 42113752 SIZE (cairo-1.12.14.tar.xz) = 42132464

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.2 2012/11/12 12:29:07 eric Exp $ $OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.3 2013/03/04 20:40:19 eric Exp $
--- util/cairo-fdr/Makefile.in.orig Mon Oct 22 06:08:40 2012 --- util/cairo-fdr/Makefile.in.orig Thu Jan 31 10:25:59 2013
+++ util/cairo-fdr/Makefile.in Wed Oct 24 03:52:52 2012 +++ util/cairo-fdr/Makefile.in Sat Feb 2 00:30:35 2013
@@ -379,7 +379,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ @@ -380,7 +380,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
cairo_fdr_la_SOURCES = fdr.c cairo_fdr_la_SOURCES = fdr.c
cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS) cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS) cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.4 2013/01/16 14:29:15 ajacoutot Exp $ $OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.5 2013/03/04 20:40:19 eric Exp $
--- util/cairo-trace/Makefile.in.orig Mon Oct 22 06:08:41 2012 --- util/cairo-trace/Makefile.in.orig Thu Jan 31 10:26:00 2013
+++ util/cairo-trace/Makefile.in Wed Oct 24 03:51:46 2012 +++ util/cairo-trace/Makefile.in Sat Feb 2 00:30:35 2013
@@ -399,7 +399,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$ @@ -400,7 +400,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$
$(AM_CPPFLAGS) $(AM_CPPFLAGS)
libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS) libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)