[PR PATCH] librsvg: update to 2.52.0.

[PR PATCH] librsvg: update to 2.52.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1800 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages rsvg
https://github.com/void-linux/void-packages/pull/33270

librsvg: update to 2.52.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@Gottox I'd like to adopt this, if it's ok with you.

I'm holding off on merging for a bit because they changed the default DPI but might revert it. I want to check at least if void-docs PDF build is still fine.

A patch file from https://github.com/void-linux/void-packages/pull/33270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rsvg-33270.patch --]
[-- Type: text/x-diff, Size: 1131 bytes --]

From 898684526f09a251eece64252fa0fae68097216b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 2 Oct 2021 16:53:03 -0300
Subject: [PATCH] librsvg: update to 2.52.0.

---
 srcpkgs/librsvg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index d6c9c2c89ddf..91659210f874 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.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -15,7 +15,7 @@ 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=bd821fb3e16494b61f5185addd23b726b064f203122b3ab4b3d5d7a44e6bf393
 
 do_check() {
 	# reference files are for specific pango and harfbuzz versions

Re: librsvg: update to 2.52.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33270#issuecomment-932831824

Comment:
And now cross is broken. Would greatly appreciate help. They seem to be using `cc` to link something that should be using the cross compiler instead.

Re: librsvg: update to 2.52.0.

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 765 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/33270#issuecomment-932858188

Comment:
From what I could gather and patching .cargo/config worked building locally for aarch64, but I really dont know this well.
```
--- a/.cargo/config	2021-10-03 05:24:36.000000000 +0200
+++ b/.cargo/config	2021-10-03 05:24:45.701091821 +0200
@@ -3,6 +3,12 @@
 # In the distributed tarball, this file should end up in
 # rust/.cargo/config
 
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+
+[target.armv7-unknown-linux-gnueabihf]
+linker = "arm-linux-gnueabihf-gcc"
+
 [source.crates-io]
 registry = 'https://github.com/rust-lang/crates.io-index'
 replace-with = 'vendored-sources'

```

Re: librsvg: update to 2.52.0.

[biopsin]

[-- Attachment #1: Type: text/plain, Size: 815 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/33270#issuecomment-932858188

Comment:
From what I could gather [[source](https://www.rohanjain.in/cargo-cross/)] and patching .cargo/config worked building locally for aarch64, but I really dont know this well.
```
--- a/.cargo/config	2021-10-03 05:24:36.000000000 +0200
+++ b/.cargo/config	2021-10-03 05:24:45.701091821 +0200
@@ -3,6 +3,12 @@
 # In the distributed tarball, this file should end up in
 # rust/.cargo/config
 
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+
+[target.armv7-unknown-linux-gnueabihf]
+linker = "arm-linux-gnueabihf-gcc"
+
 [source.crates-io]
 registry = 'https://github.com/rust-lang/crates.io-index'
 replace-with = 'vendored-sources'

```

Re: librsvg: update to 2.52.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33270#issuecomment-932862918

Comment:
Nice find, thanks! This helps in possibly opening an issue upstream.

Re: librsvg: update to 2.52.0.

[Gottox]

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/33270#issuecomment-932929737

Comment:
Feel free to take it over :+1: 

Re: [PR PATCH] [Updated] librsvg: update to 2.52.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1805 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages rsvg
https://github.com/void-linux/void-packages/pull/33270

librsvg: update to 2.52.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@Gottox I'd like to adopt this, if it's ok with you.

I'm holding off on merging for a bit because they changed the default DPI but might revert it. I want to check at least if void-docs PDF build is still fine.

A patch file from https://github.com/void-linux/void-packages/pull/33270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rsvg-33270.patch --]
[-- Type: text/x-diff, Size: 1852 bytes --]

From 020a0ebe430dbe944c26a4813ae95d6b0c4ba417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 2 Oct 2021 16:53:03 -0300
Subject: [PATCH] librsvg: update to 2.52.2, adopt.

---
 srcpkgs/librsvg/template | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index d6c9c2c89ddf..21997a0755f7 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,19 +9,17 @@ 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 <gottox@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 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
 
 librsvg-devel_package() {
 	depends="gdk-pixbuf-devel cairo-devel libcroco-devel ${sourcepkg}>=${version}_${revision}"

Re: [PR PATCH] [Updated] librsvg: update to 2.52.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1805 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages rsvg
https://github.com/void-linux/void-packages/pull/33270

librsvg: update to 2.52.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@Gottox I'd like to adopt this, if it's ok with you.

I'm holding off on merging for a bit because they changed the default DPI but might revert it. I want to check at least if void-docs PDF build is still fine.

A patch file from https://github.com/void-linux/void-packages/pull/33270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rsvg-33270.patch --]
[-- Type: text/x-diff, Size: 2019 bytes --]

From 6053a8d23e922f3d1312230931065c618c092b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 2 Oct 2021 16:53:03 -0300
Subject: [PATCH] librsvg: update to 2.52.2, adopt.

Thanks biopsin for spotting the workaround.
---
 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 <gottox@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 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() {

Re: librsvg: update to 2.52.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33270#issuecomment-950348152

Comment:
@biopsin thanks for the suggestion, I've implemented it in the template so we don't have to patch in all our target definitions. Have also opened upstream issues about the warnings and this regression.

Re: [PR PATCH] [Updated] librsvg: update to 2.52.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1805 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages rsvg
https://github.com/void-linux/void-packages/pull/33270

librsvg: update to 2.52.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@Gottox I'd like to adopt this, if it's ok with you.

I'm holding off on merging for a bit because they changed the default DPI but might revert it. I want to check at least if void-docs PDF build is still fine.

A patch file from https://github.com/void-linux/void-packages/pull/33270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rsvg-33270.patch --]
[-- Type: text/x-diff, Size: 2110 bytes --]

From 87cd3edc398fcb20d0d946763a673af6db9dd051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 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() {

Re: [PR PATCH] [Merged]: librsvg: update to 2.52.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1652 bytes --]

There's a merged pull request on the void-packages repository

librsvg: update to 2.52.0.
https://github.com/void-linux/void-packages/pull/33270

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

@Gottox I'd like to adopt this, if it's ok with you.

I'm holding off on merging for a bit because they changed the default DPI but might revert it. I want to check at least if void-docs PDF build is still fine.