From: Adrian Perez de Castro <aperez@igalia.com>
To: buildroot@buildroot.org
Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Subject: [Buildroot] [PATCH 1/1] package/meson: add upstream patch to fix vapigen support
Date: Thu, 13 Jan 2022 13:57:04 +0200 [thread overview]
Message-ID: <20220113115704.2354150-1-aperez@igalia.com> (raw)
Import an upstream patch which fixes a typo in the Meson source code
which caused a wrong command line option to be passed to the vapigen
program. This fixes the build for all packages which use Meson and
provide API bindings generated using said tool.
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
...x-typo-in-vapigen-option-metadatadir.patch | 31 +++++++++++++++++++
1 file changed, 31 insertions(+)
create 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
new file mode 100644
index 0000000000..f8cc30ec29
--- /dev/null
+++ b/package/meson/0003-gnome-fix-typo-in-vapigen-option-metadatadir.patch
@@ -0,0 +1,31 @@
+From 5385e4c0a4dd4f9cf1e15c9c321b22d19cc0011a 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.
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+Upstream-Status: https://github.com/mesonbuild/meson/pull/9806
+---
+ 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.34.1
+
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next reply other threads:[~2022-01-13 11:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-13 11:57 Adrian Perez de Castro [this message]
2022-01-13 17:41 ` [Buildroot] [PATCH 1/1] package/meson: add upstream patch to fix vapigen support Yann E. MORIN
2022-01-14 9:26 ` Adrian Perez de Castro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220113115704.2354150-1-aperez@igalia.com \
--to=aperez@igalia.com \
--cc=buildroot@buildroot.org \
--cc=eric.le.bihan.dev@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox