[PR PATCH] gtk+3: update to 3.24.21.

[PR PATCH] gtk+3: update to 3.24.21.

[ahesford]

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

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

https://github.com/ahesford/void-packages gtk3
https://github.com/void-linux/void-packages/pull/23530

gtk+3: update to 3.24.21.
Also add dependency on `adwaita-icon-theme` because GTK applications will not display properly without at least some icon theme; see [void-docs PR #396](https://github.com/void-linux/void-docs/pull/396). The appropriate response is to pull in the default theme, then let users `ignorepkg` if they wish to replace it with something custom.

cc: @Gottox (maintainer) @flexibeast @ericonr 

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

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

From 6fa5d1172d8eec334c1bf5014d1c1c2260835d03 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 11 Jul 2020 23:47:22 -0400
Subject: [PATCH] gtk+3: update to 3.24.21.

---
 srcpkgs/gtk+3/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index bd290f1d1f0..72b7c27a042 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk+3'
 pkgname=gtk+3
-version=3.24.20
+version=3.24.21
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -20,13 +20,14 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
  $(vopt_if cloudproviders 'libcloudproviders-devel')"
-depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
+depends="gtk-update-icon-cache adwaita-icon-theme
+ shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GTK+ toolkit (v3)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=2dac69f716e8d04ba7a95091589e2baaec95dcace932cb15839163db479b1df3
+checksum=aeea6ae7cd35e83dfc7699be716519faefca346c62e784dd1a37d9df94c08f52
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"

Re: [PR PATCH] [Updated] gtk+3: update to 3.24.21.

[ahesford]

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

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

https://github.com/ahesford/void-packages gtk3
https://github.com/void-linux/void-packages/pull/23530

gtk+3: update to 3.24.21.
Also add dependency on `adwaita-icon-theme` because GTK applications will not display properly without at least some icon theme; see [void-docs PR #396](https://github.com/void-linux/void-docs/pull/396). The appropriate response is to pull in the default theme, then let users `ignorepkg` if they wish to replace it with something custom.

cc: @Gottox (maintainer) @flexibeast @ericonr 

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

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

From 6d1736161116b357002e1f51800afa54987066c1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 12 Jul 2020 01:29:39 -0400
Subject: [PATCH 1/2] adwaita-icon-theme: drop deps and obsolete configure_args

---
 srcpkgs/adwaita-icon-theme/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index d4f070be6a8..47232d3a5ec 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,12 +1,10 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
 version=3.36.1
-revision=1
+revision=2
 archs=noarch
 build_style=gnu-configure
-configure_args="--enable-icon-mapping"
-hostmakedepends="pkg-config librsvg icon-naming-utils gtk-update-icon-cache"
-depends="librsvg"
+hostmakedepends="pkg-config"
 short_desc="Theme consisting of a set of icons for GTK+"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"

From 4357a1c3ed36d1cd20fa099a2a8c3796bfef5c02 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 11 Jul 2020 23:47:22 -0400
Subject: [PATCH 2/2] gtk+3: update to 3.24.21.

---
 srcpkgs/gtk+3/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index bd290f1d1f0..72b7c27a042 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk+3'
 pkgname=gtk+3
-version=3.24.20
+version=3.24.21
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -20,13 +20,14 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
  $(vopt_if cloudproviders 'libcloudproviders-devel')"
-depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
+depends="gtk-update-icon-cache adwaita-icon-theme
+ shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GTK+ toolkit (v3)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=2dac69f716e8d04ba7a95091589e2baaec95dcace932cb15839163db479b1df3
+checksum=aeea6ae7cd35e83dfc7699be716519faefca346c62e784dd1a37d9df94c08f52
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"

Re: gtk+3: update to 3.24.21.

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23530#issuecomment-657180842

Comment:
Update: adding a dependency on `adwaita-icon-theme` will create a build dependency cycle because that package depends on `librsvg`, which depends on `gtk+3-devel` to build.

I cleaned up the `adwaita-icon-theme` template here, noticing the the package builds *exactly* the same without any of the `hostmakedepends` I removed. Also, the flag in `configure_args` is no longer recognized by the configure script.

The last change is to remove `librsvg` from `depends` to break the build cycle. `adwaita-icon-theme` provides SVG versions of its theme and I understand that `librsvg` will be needed to support the scalable theme. However, I believe this support is optional and maybe shouldn't trump the availability of a default theme as a hard dependency on `gtk+3`. Also, I'd argue that the requirement to be able to read SVG files rests not with the theme that provides them, but with the package that reads the them.

If dropping the `librsvg` dep is unacceptable, we have no choice but to drop the `adwaita` dep from `gtk+3` and will always have the problem that `gtk+3` programs may not display properly by default. 

Re: gtk+3: update to 3.24.21.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23530#issuecomment-657238420

Comment:
Having tried this on my system, I got:

- `pavucontrol`, without `adwaita`, doesn't have icons
- `pavucontrol`, with `adwaita` but without `librsvg`, shows the proper icons, but prints a warning about being unable to load a pixbuf from an SVG file
- `nwgbar` (from `nwg-launchers`, not yet packaged), without adwaita, doesn't have icons
- `nwgbar`, with `adwaita` but without `librsvg`, crashses with `SIGABRT` due to being unable to load pixbufs from SVG. This is likely caused by not having a fallback

Therefore, I think what we need to do depends on the themes we currently ship. Are there themes that only ship PNGs? If not, we could make `gtk+3` depend on `librsvg`, because:

```
most gtk applications need adwaita theme to work properly -> some applications crash when SVG icons exist but they can't load them -> gtk should depend on a library to load svg icons OR those applications should depend on librsvg
```

I'm in favor of solving it for `gtk+3`, because otherwise all applications will still print warnings when using PNG icons, and tracking down applications that misbehave is time consuming and error prone. Furthermore, `librsvg` is a small package compared to `gtk+3`.

Re: gtk+3: update to 3.24.21.

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23530#issuecomment-657251223

Comment:
Having `gtk+3` depend on `librsvg` would be the best solution, but it isn't realizable because `librsvg` depends on `gtk+3-devel` and would create a build-time dependency cycle.

I may explore breaking this cycle. Maybe splitting Adwaita into separate PNG-only and SVG-only themes would allow GTK to depend on the PNG-only themes that would work everywhere, with users having the option to install the SVG theme if they were interested.

We could also just discard the SVG files to provide a basic functional PNG theme for GTK, then tell users we don't package SVG for the same reason we are refusing to package other themes. 

Re: [PR PATCH] [Updated] [NOMERGE] gtk+3: update to 3.24.21.

[ahesford]

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

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

https://github.com/ahesford/void-packages gtk3
https://github.com/void-linux/void-packages/pull/23530

[NOMERGE] gtk+3: update to 3.24.21.
Also add dependency on `adwaita-icon-theme` because GTK applications will not display properly without at least some icon theme; see [void-docs PR #396](https://github.com/void-linux/void-docs/pull/396). The appropriate response is to pull in the default theme, then let users `ignorepkg` if they wish to replace it with something custom.

cc: @Gottox (maintainer) @flexibeast @ericonr 

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

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

From f217bbca04c66bf87522e274be765833700dd46c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 12 Jul 2020 14:09:29 -0400
Subject: [PATCH 1/3] librsvg: update to 2.48.8.

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

diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index 3789d3e481e..f8398b9d5ef 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -1,7 +1,7 @@
 # Template file for 'librsvg'
 pkgname=librsvg
 # https://gitlab.gnome.org/GNOME/librsvg/-/issues/604
-version=2.48.6
+version=2.48.8
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -9,15 +9,14 @@ configure_args="--disable-static --host=${XBPS_TARGET_TRIPLET}
  $(vopt_enable gir introspection) $(vopt_enable vala)"
 hostmakedepends="cargo pkg-config python glib-devel
  gdk-pixbuf-devel $(vopt_if vala vala)"
-makedepends="cairo-devel freetype-devel gdk-pixbuf-devel gtk+3-devel
- libcroco-devel libglib-devel libxml2-devel pango-devel rust
- $(vopt_if vala vala)"
+makedepends="cairo-devel freetype-devel gdk-pixbuf-devel libcroco-devel
+ libglib-devel libxml2-devel pango-devel rust $(vopt_if vala vala)"
 short_desc="SVG library for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/LibRsvg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=84ddd9447d392a307956826b40961790b9340a8e346285542a361dfc1f2e64cf
+checksum=f480a325bbdf26d1874eb6fb330ebc5920ba64e3e08de61931bb4506dfef2692
 
 # Package build options
 build_options="gir vala"

From 978aaff917c9fb20911e2d1538f833f81320549c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 12 Jul 2020 01:29:39 -0400
Subject: [PATCH 2/3] adwaita-icon-theme: drop deps and obsolete configure_args

---
 srcpkgs/adwaita-icon-theme/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index d4f070be6a8..febd2915be6 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,11 +1,10 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
 version=3.36.1
-revision=1
+revision=2
 archs=noarch
 build_style=gnu-configure
-configure_args="--enable-icon-mapping"
-hostmakedepends="pkg-config librsvg icon-naming-utils gtk-update-icon-cache"
+hostmakedepends="pkg-config"
 depends="librsvg"
 short_desc="Theme consisting of a set of icons for GTK+"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 1242c1211cce815e0abef73af9a06ee45f0c31e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 11 Jul 2020 23:47:22 -0400
Subject: [PATCH 3/3] gtk+3: update to 3.24.21.

---
 srcpkgs/gtk+3/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index bd290f1d1f0..513a12f6e48 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk+3'
 pkgname=gtk+3
-version=3.24.20
+version=3.24.21
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -20,13 +20,14 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
  $(vopt_if cloudproviders 'libcloudproviders-devel')"
-depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
+depends="gtk-update-icon-cache adwaita-icon-theme
+ librsvg shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GTK+ toolkit (v3)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=2dac69f716e8d04ba7a95091589e2baaec95dcace932cb15839163db479b1df3
+checksum=aeea6ae7cd35e83dfc7699be716519faefca346c62e784dd1a37d9df94c08f52
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"

Re: [NOMERGE] gtk+3: update to 3.24.21.

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23530#issuecomment-657257285

Comment:
Okay, I think I found a workable solution. Apparently `librsvg` only depended on `gtk+3-devel` because older versions used to provide a simple SVG viewer, but this [was dropped[(https://people.gnome.org/~federico/blog/removing-rsvg-view.html) some time ago. I bumpbed `librsvg` and removed the `gtk+3-devel` dependency so there should be no cycle if `gtk+3` depends on `librsvg` for proper support for scalable themes.

`adwaita-icon-theme` now has its usual `librsvg` dependency, but most of the build-time dependencies in that template were removed because the build outputs don't change with or without them.

`gtk+3` now has a runtime dependency on `librsvg` (to support arbitrary themes that offer SVG) as well as `adwaita-icon-theme` to provide basic functionality out of the box.

@ericonr, if you wouldn't mind, build the packages in this PR when you get a chance and confirm correct behavior for `pavucontrol` and `nwgbar`.

Re: [NOMERGE] gtk+3: update to 3.24.21.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23530#issuecomment-657281247

Comment:
All is good in GTK-land with your PR, thanks! I hit a weird segfault with rustc, but it built fine the second time :D 

Re: [NOMERGE] gtk+3: update to 3.24.21.

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23530#issuecomment-657327775

Comment:
At the recommendation of @ericonr, I'll ping @pullmoll and @fosslinux to help me avoid any dependency cycles. I manually read through the dependency tree and don't believe I saw any cycles back to `gtk+3`, but want to be extra sure.

Re: [NOMERGE] gtk+3: update to 3.24.21.

[fosslinux]

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/23530#issuecomment-657398350

Comment:
I'll just need to check the new dependencies that have been added, gtk has been fine for a few months now.

Re: gtk+3: update to 3.24.21.

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23530#issuecomment-659074270

Comment:
@Chocimier @fosslinux thank you both

Re: [PR PATCH] [Merged]: gtk+3: update to 3.24.21.

[ahesford]

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

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

gtk+3: update to 3.24.21.
https://github.com/void-linux/void-packages/pull/23530

Description:
Also add dependency on `adwaita-icon-theme` because GTK applications will not display properly without at least some icon theme; see [void-docs PR #396](https://github.com/void-linux/void-docs/pull/396). The appropriate response is to pull in the default theme, then let users `ignorepkg` if they wish to replace it with something custom.

cc: @Gottox (maintainer) @flexibeast @ericonr