diff --git a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch deleted file mode 100644 index 3788ee0f11..0000000000 --- a/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9952446a2a28ea2b009f4b8b2a14ad50f0878bdd Mon Sep 17 00:00:00 2001 -From: Michal Vasilek -Date: Mon, 10 Jan 2022 21:27:30 +0100 -Subject: [PATCH] gnome: fix typo in vapigen option metadatadir - -This typo was introduced in 9ef36fa80bf4483bcd837ea3985a51ab533c7972 and -can cause a build failure, because --metadatdir is not a valid vapigen -option. - -[aperez@igalia.com: backport from upstream] -Signed-off-by: Adrian Perez de Castro -[yann.morin.1998@free.fr: make it an actual backport] -Signed-off-by: Yann E. MORIN ---- - 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 1125e56e7..dfc66c2e3 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -1934,7 +1934,7 @@ class GnomeModule(ExtensionModule): - cmd: T.List[T.Union[str, 'ExternalProgram']] - cmd = [state.find_program('vapigen'), '--quiet', f'--library={library}', f'--directory={build_dir}'] - cmd.extend([f'--vapidir={d}' for d in kwargs['vapi_dirs']]) -- cmd.extend([f'--metadatdir={d}' for d in kwargs['metadata_dirs']]) -+ cmd.extend([f'--metadatadir={d}' for d in kwargs['metadata_dirs']]) - cmd.extend([f'--girdir={d}' for d in kwargs['gir_dirs']]) - cmd += pkg_cmd - cmd += ['--metadatadir=' + source_dir] --- -2.25.1 - diff --git a/package/meson/meson.hash b/package/meson/meson.hash index c9be54be05..c2d53519d4 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.61.0/meson-0.61.0.tar.gz.asc -sha256 ea9f33246b1f23f02e90a50e75e0f41e526f6dabf0c24f3e00e27a3f5abdc35c meson-0.61.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc +sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 6c0d1ab08e..ad15e3f91e 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.0 +MESON_VERSION = 0.61.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING