diff --git a/graphics/librsvg2-rust/Makefile b/graphics/librsvg2-rust/Makefile index e69a2b6de7cd..e729c314a3d7 100644 --- a/graphics/librsvg2-rust/Makefile +++ b/graphics/librsvg2-rust/Makefile @@ -1,56 +1,55 @@ # Created by: Ade Lovett PORTNAME= librsvg -PORTVERSION= 2.54.0 -PORTREVISION= 2 +PORTVERSION= 2.54.1 CATEGORIES= graphics gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 2-rust DIST_SUBDIR= gnome2 MAINTAINER= desktop@FreeBSD.org COMMENT= Library for parsing and rendering SVG vector-graphic files LICENSE= LGPL20 BUILD_DEPENDS= ${RUST_DEFAULT}>=1.39.0:lang/${RUST_DEFAULT} \ valac:lang/vala \ gi-docgen:textproc/py-gi-docgen \ rst2man:textproc/py-docutils LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libpng.so:graphics/png USES= compiler:c11 cpe gettext gmake gnome libtool pkgconfig tar:xz CPE_VENDOR= gnome USE_GNOME= cairo gdkpixbuf2 gnomeprefix libxml2 pango introspection:build USE_LDCONFIG= yes PORTSCOUT= limitw:1,even GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-Bsymbolic \ --disable-dependency-tracking \ --disable-static \ --enable-vala # Make sure it uses the Rust toolchain from ports. CONFIGURE_ENV= CARGO=${LOCALBASE}/bin/cargo \ RUSTC=${LOCALBASE}/bin/rustc \ RUSTFLAGS="${RUSTFLAGS} -C linker=${CC:Q} ${LDFLAGS:C/.+/-C link-arg=&/}" MAKE_ENV= CARGO_BUILD_JOBS=${MAKE_JOBS_NUMBER} \ RUSTC=${LOCALBASE}/bin/rustc \ RUSTFLAGS="${RUSTFLAGS} -C linker=${CC:Q} ${LDFLAGS:C/.+/-C link-arg=&/}" INSTALL_TARGET= install-strip TEST_TARGET= check CONFLICTS_INSTALL= librsvg2 post-patch: # Disable vendor checksums @${REINPLACE_CMD} -e 's/"files":{[^}]*}/"files":{}/' \ ${WRKSRC}/vendor/*/.cargo-checksum.json pre-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/cargo update .include diff --git a/graphics/librsvg2-rust/distinfo b/graphics/librsvg2-rust/distinfo index 2151510ca4f0..c7ef8eae7d7f 100644 --- a/graphics/librsvg2-rust/distinfo +++ b/graphics/librsvg2-rust/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647470339 -SHA256 (gnome2/librsvg-2.54.0.tar.xz) = baf8ebc147f146b4261bb3d0cd0fac944bf8dbb4b1f2347d23341f974dcc3085 -SIZE (gnome2/librsvg-2.54.0.tar.xz) = 23489972 +TIMESTAMP = 1650793463 +SHA256 (gnome2/librsvg-2.54.1.tar.xz) = d5557efbdcc415a4180e1116b7f736cb711b253d110d95fa86ec830f70026625 +SIZE (gnome2/librsvg-2.54.1.tar.xz) = 28181768 diff --git a/graphics/librsvg2-rust/files/patch-include_librsvg_rsvg.h b/graphics/librsvg2-rust/files/patch-include_librsvg_rsvg.h deleted file mode 100644 index 1d2fb0ae5c79..000000000000 --- a/graphics/librsvg2-rust/files/patch-include_librsvg_rsvg.h +++ /dev/null @@ -1,16 +0,0 @@ -https://gitlab.gnome.org/GNOME/librsvg/-/issues/856 - -C-style comments (`/* something */`) cannot be nested. Rephrase to -unbreak at least x11/fuzzel. - ---- include/librsvg/rsvg.h.orig 2022-03-16 22:38:59 UTC -+++ include/librsvg/rsvg.h -@@ -122,7 +122,7 @@ GType rsvg_error_get_type (void); - * if the base file is `/foo/bar/baz.svg`, then librsvg will - * only try to load referenced files (from SVG's - * `` element, for example, or from content -- * included through XML entities) if those files are in `/foo/bar/*` or in `/foo/bar/*\/.../*`. -+ * included through XML entities) if those files are under `/foo/bar/` or `/foo/bar/.../`. - * This is so that malicious SVG files cannot include files that are in a directory above. - * - * The full set of rules for deciding which URLs may be loaded is as follows;