Re: [PR PATCH] [Updated] gtk{+3,4}: move gtk-icon-browser to demo subpackage

[oreo639 <oreo639@users.noreply.github.com>]

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

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

https://github.com/oreo639/void-packages gtkdemo
https://github.com/void-linux/void-packages/pull/49862

gtk{+3,4}: move gtk-icon-browser to demo subpackage
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

cc: @sgn 

Upstream, both gtk3-icon-browser and gtk4-icon-browser are considered demos and are are disabled if `-Dbuild-demos=false` is passed. For reference, Arch puts it in gtk4-icon-browser gtk4-demos, Fedora puts it in gtk4-devel-tools, Debian puts it in gtk-4-examples. The same is the case for gtk+3 (although Fedora puts the gtk+3 demos in gtk3-devel).

If moving them is an issue though, please let me know.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->


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

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

From f10d02ce04599c02835d460e391848e1a1f6123f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 16 Apr 2024 02:33:10 -0700
Subject: [PATCH 1/2] gtk+3: move gtk3-icon-browser to gtk+3-demo

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

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 6775efc6d2136b..550a69c8cbfaf9 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+3'
 pkgname=gtk+3
 version=3.24.41
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="
@@ -87,12 +87,17 @@ gtk+3-demo_package() {
 	short_desc+=" - demonstration application"
 	pkg_install() {
 		vmove usr/bin/gtk3-demo
+		vmove usr/bin/gtk3-icon-browser
 		vmove usr/bin/gtk3-widget-factory
 		vmove usr/bin/gtk3-demo-application
+		vmove usr/share/man/man1/gtk3-demo.1
 		vmove usr/share/man/man1/gtk3-widget-factory.1
+		vmove usr/share/man/man1/gtk3-icon-browser.1
+		vmove usr/share/man/man1/gtk3-demo-application.1
 		vmove usr/share/gtk-3.0/gtkbuilder.rng
 		vmove usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
 		vmove usr/share/applications/gtk3-widget-factory.desktop
+		vmove usr/share/applications/gtk3-icon-browser.desktop
 		vmove usr/share/applications/gtk3-demo.desktop
 		vmove usr/share/icons
 	}

From 7ad7dcd169bb53dbc209e0c037498a1f0697f8ba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 16 Apr 2024 02:33:40 -0700
Subject: [PATCH 2/2] gtk4: move gtk4-icon-browser to gtk4-demo

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

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6774afa167ff34..10dcbbd0526e0d 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk4'
 pkgname=gtk4
 version=4.14.2
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
@@ -79,9 +79,6 @@ gtk4-devel_package() {
 gtk4-demo_package() {
 	short_desc+=" - demonstration application"
 	pkg_install() {
-		# gtk3-icon-browser is in main package,
-		# keep gtk4-icon-browser in main package too
-
 		vmove usr/bin/gtk4-demo
 		vmove usr/share/applications/org.gtk.Demo4.desktop
 		vmove usr/share/glib-2.0/schemas/org.gtk.Demo4.gschema.xml
@@ -117,6 +114,12 @@ gtk4-demo_package() {
 		vmove usr/share/man/man1/gtk4-node-editor.1
 		vmove usr/share/metainfo/org.gtk.gtk4.NodeEditor.appdata.xml
 
+		vmove usr/bin/gtk4-icon-browser
+		vmove usr/share/applications/org.gtk.IconBrowser4.desktop
+		vmove usr/share/icons/hicolor/scalable/apps/org.gtk.IconBrowser4.svg
+		vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.IconBrowser4-symbolic.svg
+		vmove usr/share/man/man1/gtk4-icon-browser.1
+		vmove usr/share/metainfo/org.gtk.IconBrowser4.appdata.xml
 	}
 }