diff options
author | Chris Mayo <aklhfex@gmail.com> | 2023-02-03 19:24:18 +0000 |
---|---|---|
committer | Matt Turner <mattst88@gentoo.org> | 2023-02-05 21:40:42 -0500 |
commit | 0a4f8c714003e98e19d010f21a9c7505adc401e2 (patch) | |
tree | 4a414c212e038f9ccd87c59f25a90980439e76ef /x11-libs/gtk+/files | |
parent | dev-util/gnome-builder: Version bump to 43.6 (diff) | |
download | gentoo-0a4f8c714003e98e19d010f21a9c7505adc401e2.tar.gz gentoo-0a4f8c714003e98e19d010f21a9c7505adc401e2.tar.bz2 gentoo-0a4f8c714003e98e19d010f21a9c7505adc401e2.zip |
x11-libs/gtk+: add 3.24.36
Signed-off-by: Chris Mayo <aklhfex@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28876
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-libs/gtk+/files')
-rw-r--r-- | x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch | 25 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch | 29 |
2 files changed, 54 insertions, 0 deletions
diff --git a/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch b/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch new file mode 100644 index 000000000000..8b80205b8b17 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch @@ -0,0 +1,25 @@ +From 7e4a2a5724a184c418314f4fdbd7a065ba9e203d Mon Sep 17 00:00:00 2001 +From: Staudey <staudi.kaos@gmail.com> +Date: Tue, 27 Dec 2022 04:54:52 +0000 +Subject: [PATCH] Fix build_gir logic + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index aed48fc3f6..6c711e9e9a 100644 +--- a/meson.build ++++ b/meson.build +@@ -849,7 +849,7 @@ endif + + # Introspection + gir = find_program('g-ir-scanner', required : get_option('introspection')) +-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection')) ++build_gir = gir.found() and get_option('introspection') + + subdir('gdk') + subdir('gtk') +-- +GitLab + diff --git a/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch new file mode 100644 index 000000000000..19af75c398a5 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch @@ -0,0 +1,29 @@ +--- a/docs/reference/gtk/meson.build ++++ b/docs/reference/gtk/meson.build +@@ -500,7 +500,6 @@ + + man_files = [ + [ 'gtk-query-immodules-3.0', '1', ], +- [ 'gtk-update-icon-cache', '1', ], + [ 'gtk-encode-symbolic-svg', '1', ], + [ 'gtk-launch', '1', ], + [ 'gtk-builder-tool', '1', ], +--- a/gtk/meson.build ++++ b/gtk/meson.build +@@ -1109,16 +1109,6 @@ + extra_update_icon_cache_objs = import('windows').compile_resources(uac_rc) + endif + +-gtk_update_icon_cache = executable( +- 'gtk-update-icon-cache', +- 'updateiconcache.c', +- extra_update_icon_cache_objs, +- c_args: gtk_cargs, +- dependencies: libgtk_dep, +- install: true +-) +-gtk_tools += gtk_update_icon_cache +- + gtk_query_immodules = executable( + 'gtk-query-immodules-3.0', + 'queryimmodules.c', |