From 486301d525bef8078b20f4da70adec8f3490c467 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 13:49:39 +0200 Subject: [PATCH] meson: update to 0.62.1. --- ...me-fallback-to-gtk-update-icon-cache.patch | 26 ------------------- srcpkgs/meson/template | 6 ++--- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch diff --git a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch deleted file mode 100644 index 56a3f7cf3410..000000000000 --- a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Wed, 23 Mar 2022 22:15:11 +0100 -Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache - -Commit a0cade8f introduced a typo and wrongly check for -gtk4-update-icon-cache twice. -If gtk4-update-icon-cache (gtk4) is not found, look for -gtk-update-icon-cache (gtk3) instead. ---- - mesonbuild/modules/gnome.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 673a781a41d..501be9ae4da 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: ' - prog = state.find_program('gtk4-update-icon-cache', required=False) - found = isinstance(prog, build.Executable) or prog.found() - if not found: -- prog = state.find_program('gtk4-update-icon-cache') -+ prog = state.find_program('gtk-update-icon-cache') - icondir = os.path.join(datadir_abs, 'icons', 'hicolor') - script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir]) - script.skip_if_destdir = True diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 2a4453076e8f..6f9cd7e57c75 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,6 +1,6 @@ # Template file for 'meson' pkgname=meson -version=0.62.0 +version=0.62.1 revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" @@ -9,12 +9,12 @@ checkdepends="glib-devel gobject-introspection ninja gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel cross-arm-linux-gnueabihf" short_desc="Super fast build system" -maintainer="John " +maintainer="Michal Vasilek " license="Apache-2.0" homepage="https://mesonbuild.com" changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz" -checksum=06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb +checksum=a0f5caa1e70da12d5e63aa6a9504273759b891af36c8d87de381a4ed1380e845 # XXX: sanitizers aren't available on musl if [ "$XBPS_TARGET_LIBC" = glibc ]; then