Update to cairo-1.15.12.

It's a snapshot release but 1.16.0 shouldn't be far ahead and we need this
for a librsvg update. Most Linux distros have moved to 1.15.X a while ago
as well.

survived a bulk
This commit is contained in:
ajacoutot 2018-07-09 08:46:39 +00:00
parent 7cc73bb96d
commit c2d3998e16
6 changed files with 11 additions and 48 deletions

View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.66 2017/12/08 09:56:26 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.67 2018/07/09 08:46:39 ajacoutot Exp $
COMMENT= vector graphics library
DISTNAME= cairo-1.14.12
DISTNAME= cairo-1.15.12
CATEGORIES= graphics
DPB_PROPERTIES= parallel
EXTRACT_SUFX= .tar.xz
SHARED_LIBS += cairo 12.3 # 11402.12
SHARED_LIBS += cairo-gobject 1.1 # 11402.12
SHARED_LIBS += cairo-script-interpreter 1.1 # 11402.12
SHARED_LIBS += cairo 13.0 # 11514.0
SHARED_LIBS += cairo-gobject 2.0 # 11514.0
SHARED_LIBS += cairo-script-interpreter 2.0 # 11514.0
HOMEPAGE= http://cairographics.org/
@ -23,7 +23,8 @@ WANTLIB += X11 Xau Xdmcp Xext Xrender c expat ffi fontconfig freetype
WANTLIB += glib-2.0 gobject-2.0 iconv intl lzo2 m pcre pixman-1
WANTLIB += png pthread xcb xcb-render xcb-shm z
MASTER_SITES= http://cairographics.org/releases/
MASTER_SITES= http://cairographics.org/releases/ \
http://cairographics.org/snapshots/
USE_GMAKE= Yes

View File

@ -1,2 +1,2 @@
SHA256 (cairo-1.14.12.tar.xz) = jJDwDFALIpnAoyPdm+6tKgA1N1KyCS6tVYE5vWf3vxY=
SIZE (cairo-1.14.12.tar.xz) = 36251896
SHA256 (cairo-1.15.12.tar.xz) = diMIG5RUikfuaDmnMSrzTpMimXgGlItu7EIajG0FlMk=
SIZE (cairo-1.15.12.tar.xz) = 41883440

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.7 2017/12/08 09:56:26 ajacoutot Exp $
Index: util/cairo-fdr/Makefile.in
--- util/cairo-fdr/Makefile.in.orig
+++ util/cairo-fdr/Makefile.in
@@ -447,7 +447,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)
-cairo_fdr_la_LDFLAGS = -module -no-undefined
+cairo_fdr_la_LDFLAGS = -module -no-undefined -avoid-version
@CAIRO_HAS_DL_TRUE@cairo_fdr_la_LIBADD = -ldl
all: all-am

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-util_cairo-sphinx_Makefile_in,v 1.5 2017/12/08 09:56:26 ajacoutot Exp $
Index: util/cairo-sphinx/Makefile.in
--- util/cairo-sphinx/Makefile.in.orig
+++ util/cairo-sphinx/Makefile.in
@@ -457,7 +457,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
cairo_sphinx_la_SOURCES = fdr.c
cairo_sphinx_la_CPPFLAGS = $(AM_CPPFLAGS)
cairo_sphinx_la_CFLAGS = $(CAIRO_CFLAGS)
-cairo_sphinx_la_LDFLAGS = -module -no-undefined
+cairo_sphinx_la_LDFLAGS = -module -no-undefined -avoid-version
@CAIRO_HAS_DL_TRUE@cairo_sphinx_la_LIBADD = -ldl
cairo_sphinx_SOURCES = sphinx.c
cairo_sphinx_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR="\"$(cairolibdir)\""

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.9 2017/12/08 09:56:26 ajacoutot Exp $
Index: util/cairo-trace/Makefile.in
--- util/cairo-trace/Makefile.in.orig
+++ util/cairo-trace/Makefile.in
@@ -467,7 +467,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$
$(AM_CPPFLAGS)
libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
-libcairo_trace_la_LDFLAGS = -no-undefined
+libcairo_trace_la_LDFLAGS = -no-undefined -module -avoid-version
libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz $(am__append_1) \
$(am__append_3)
EXTRA_DIST = \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2017/06/27 13:14:24 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.22 2018/07/09 08:46:39 ajacoutot Exp $
@bin bin/cairo-sphinx
bin/cairo-trace
include/cairo/
@ -68,6 +68,7 @@ share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html
share/gtk-doc/html/cairo/cairo-Regions.html
share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
share/gtk-doc/html/cairo/cairo-Script-Surfaces.html
share/gtk-doc/html/cairo/cairo-Tags-and-Links.html
share/gtk-doc/html/cairo/cairo-Transformations.html
share/gtk-doc/html/cairo/cairo-Types.html
share/gtk-doc/html/cairo/cairo-User-Fonts.html