From f10d02ce04599c02835d460e391848e1a1f6123f Mon Sep 17 00:00:00 2001 From: oreo639 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 bb2c87509b8cb6978877d4f8286337422a139840 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 16 Apr 2024 02:33:40 -0700 Subject: [PATCH 2/2] gtk4: move gtk4-icon-browser to gtk4-demo --- srcpkgs/gtk4/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index 6774afa167ff34..d14b55afd50db6 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -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 } }