0001-build-Remove-incorrect-i18n.merge_file-argument.patch 1010 B

123456789101112131415161718192021222324252627282930313233
  1. From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001
  2. From: Ondrej Holy <oholy@redhat.com>
  3. Date: Fri, 21 Jan 2022 08:32:31 +0100
  4. Subject: [PATCH] build: Remove incorrect i18n.merge_file argument
  5. The positional argument was being silently ignored until meson 0.60.0 where
  6. it fails with "ERROR: Function does not take positional arguments".
  7. Related: https://github.com/mesonbuild/meson/issues/9441
  8. Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599
  9. [Retrieved (and backported) from:
  10. https://gitlab.gnome.org/GNOME/gvfs/-/commit/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0]
  11. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  12. ---
  13. daemon/meson.build | 1 -
  14. 1 file changed, 1 deletion(-)
  15. diff --git a/daemon/meson.build b/daemon/meson.build
  16. index 5f9559aa..e20ada29 100644
  17. --- a/daemon/meson.build
  18. +++ b/daemon/meson.build
  19. @@ -360,7 +360,6 @@ if enable_admin
  20. )
  21. i18n.merge_file(
  22. - policy,
  23. input: policy_in,
  24. output: '@BASENAME@',
  25. po_dir: po_dir,
  26. --
  27. GitLab