[Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.1

* [Buildroot] [PATCH 1/1] package/meson: bump to version 0.61.1
@ 2022-01-27 16:21 James Hilliard
  2022-02-05 15:11 ` Peter Korsgaard
  0 siblings, 1 reply; 2+ messages in thread
From: James Hilliard @ 2022-01-27 16:21 UTC (permalink / raw)
  To: buildroot; +Cc: Eric Le Bihan, James Hilliard

Drop patch that is now upstream.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 ...x-typo-in-vapigen-option-metadatadir.patch | 33 -------------------
 package/meson/meson.hash                      |  4 +--
 package/meson/meson.mk                        |  2 +-
 3 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch

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 <michal.vasilek@nic.cz>
-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 <aperez@igalia.com>
-[yann.morin.1998@free.fr: make it an actual backport]
-Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
----
- 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 e63dc725bf..c40f9f220c 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
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread