From 87cd3edc398fcb20d0d946763a673af6db9dd051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 2 Oct 2021 16:53:03 -0300 Subject: [PATCH] librsvg: update to 2.52.2, adopt. Credit to biopsin for spotting the workaround with .cargo/config. Upstream issue: https://gitlab.gnome.org/GNOME/librsvg/-/issues/810 --- srcpkgs/librsvg/template | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index d6c9c2c89ddf..b7c13dbfa9a0 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -1,6 +1,6 @@ # Template file for 'librsvg' pkgname=librsvg -version=2.50.7 +version=2.52.2 revision=1 build_style=gnu-configure build_helper="gir" @@ -9,18 +9,27 @@ hostmakedepends="cargo pkg-config python glib-devel gdk-pixbuf-devel vala" makedepends="cairo-devel freetype-devel gdk-pixbuf-devel libcroco-devel libglib-devel libxml2-devel pango-devel rust vala" short_desc="SVG library for GNOME" -maintainer="Enno Boland " +maintainer="Érico Nogueira " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/LibRsvg" # update changelog when release series changes changelog="https://gitlab.gnome.org/GNOME/librsvg/-/raw/librsvg-2.50/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fffb61b08cd5282aaae147a02b305166a7426fad22a8b9427708f0f2fc426ebc +checksum=03d2887c18ffb906e1a60f97fe46a7169f69aa28d6db5d285748f3618b093427 -do_check() { - # reference files are for specific pango and harfbuzz versions - # the test suite isn't designed to be run by distros - : +# reference files are for specific pango and harfbuzz versions +# the test suite isn't designed to be run by distros +make_check=no + +pre_configure() { + # otherwise the final linking step uses "cc" instead of $CC + if [ "$CROSS_BUILD" ]; then + cat >> .cargo/config <<- EOF + + [target.${RUST_TARGET}] + linker = "${CC}" + EOF + fi } librsvg-devel_package() {