diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,12 +1,14 @@ # Created by: Michael Johnson PORTNAME= cairo -PORTVERSION= 1.16.0 # update to 1.17.2 causes problems, see bug#249290 +DISTVERSION= 1.17.4 PORTEPOCH= 3 -PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= http://cairographics.org/releases/ \ - http://cairographics.org/snapshots/ +MASTER_SITES= https://cairographics.org/releases/ \ + https://cairographics.org/snapshots/ + +PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/ +PATCHFILES= ebbaebdec12878836fc84d31c59ee324e67abc05.patch:-p1 # cairo-script-interpreter.pc MAINTAINER= desktop@FreeBSD.org COMMENT= Vector graphics library with cross-device output support @@ -22,7 +24,7 @@ PORTSCOUT= skipv:5c-1.1,5c-1.2,5c-1.5 -USES= cpe gnome libtool pathfix pkgconfig tar:xz xorg +USES= autoreconf cpe gnome libtool pathfix pkgconfig tar:xz xorg CPE_VENDOR= cairographics USE_XORG= pixman USE_LDCONFIG= yes @@ -71,7 +73,7 @@ MIPS_USES= localbase MIPS_CONFIGURE_ENV= cairo_cv_atomic_primitives="libatomic-ops" -PLIST_SUB+= LIBVER=2.11600.0 +PLIST_SUB+= LIBVER=2.11704.0 post-patch: @${REINPLACE_CMD} -e '/strings/s/ - / -a /' \ diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1542402739 -SHA256 (cairo-1.16.0.tar.xz) = 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 -SIZE (cairo-1.16.0.tar.xz) = 41997432 +TIMESTAMP = 1618524411 +SHA256 (cairo-1.17.4.tar.xz) = 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 +SIZE (cairo-1.17.4.tar.xz) = 41834076 +SHA256 (ebbaebdec12878836fc84d31c59ee324e67abc05.patch) = 8b8f19ed74def2d663942fe596206ae21e4186fddf5c51097cb31ab6941cc6c8 +SIZE (ebbaebdec12878836fc84d31c59ee324e67abc05.patch) = 4272 diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -1,4 +1,3 @@ -%%GLIB%%bin/cairo-sphinx bin/cairo-trace include/cairo/cairo-deprecated.h include/cairo/cairo-features.h @@ -18,8 +17,6 @@ include/cairo/cairo.h lib/cairo/cairo-fdr.a lib/cairo/cairo-fdr.so -%%GLIB%%lib/cairo/cairo-sphinx.a -%%GLIB%%lib/cairo/cairo-sphinx.so lib/cairo/libcairo-trace.a lib/cairo/libcairo-trace.so %%GLIB%%lib/libcairo-gobject.a @@ -45,6 +42,7 @@ libdata/pkgconfig/cairo-png.pc libdata/pkgconfig/cairo-ps.pc libdata/pkgconfig/cairo-script.pc +libdata/pkgconfig/cairo-script-interpreter.pc libdata/pkgconfig/cairo-svg.pc libdata/pkgconfig/cairo-tee.pc %%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc