package/gvfs: fix build with meson >= 0.61
PATCH 1/1 package/gvfs: fix build with meson >= 0.61
Fix the following build failure raised since bump of meson to version 0.61.0 in commit a8dc871139f83c8b4a0cdcdaf2ded18ee463d65f:
../output-1/build/gvfs-1.48.1/daemon/meson.build:368:7: ERROR: Function does not take positional arguments.
Fixes:
- http://autobuild.buildroot.org/results/6231649fac82a70b215186c3396b879a28a96f60
Signed-off-by Fabrice Fontaine <[email protected]>
--- ...e-incorrect-i18n.merge_file-argument.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch
package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy <[email protected]> +Date: Fri, 21 Jan 2022 08:32:31 +0100 +Subject: [PATCH] build: Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 where +it fails with "ERROR: Function does not take positional arguments". + +Related: https://github.com/mesonbuild/meson/issues/9441 +Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 + +[Retrieved (and backported) from: +https://gitlab.gnome.org/GNOME/gvfs/-/commit/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + daemon/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/daemon/meson.build b/daemon/meson.build +index 5f9559aa..e20ada29 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -360,7 +360,6 @@ if enable_admin + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: '@BASENAME@', + po_dir: po_dir, +-- +GitLab +
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni
AppliedQuoted 5 lines · On Sun, 23 Jan 2022 22:26:07 +0100 Fabrice Fontaine…
Fix the following build failure raised since bump of meson to version 0.61.0 in commit
a8dc871139f83c8b4a0cdcdaf2ded18ee463d65f:../output-1/build/gvfs-1.48.1/daemon/meson.build:368:7: ERROR: Function does not take positional arguments.
Quoted 8 lines
Fixes:
- http://autobuild.buildroot.org/results/6231649fac82a70b215186c3396b879a28a96f60Signed-off-by Fabrice Fontaine <[email protected]>--- ...e-incorrect-i18n.merge_file-argument.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/gvfs/0001-build-Remove-incorrect-i18n.merge_file-argument.patch
Applied to master, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot