mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/meson: bump to version 0.61.1

Browse Source 
Drop patch that is now upstream.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
James Hilliard
2022-01-27 09:21:00 -07:00
committed by Peter Korsgaard
parent 7ddbcb76aa
commit c2151a3f22
3 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch
View File

@@ -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

4
package/meson/meson.hash
View File

@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature # Locally calculated after checking pgp signature
# https://github.com/mesonbuild/meson/releases/download/0.61.0/meson-0.61.0.tar.gz.asc # https://github.com/mesonbuild/meson/releases/download/0.61.1/meson-0.61.1.tar.gz.asc
sha256 ea9f33246b1f23f02e90a50e75e0f41e526f6dabf0c24f3e00e27a3f5abdc35c meson-0.61.0.tar.gz sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING

2
package/meson/meson.mk
View File

@@ -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_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
MESON_LICENSE = Apache-2.0 MESON_LICENSE = Apache-2.0
MESON_LICENSE_FILES = COPYING MESON_LICENSE_FILES = COPYING