[gnome-initial-setup/fix-build-with-meson-0.48.0-and-0.48.1] Fix build with Meson 0.48.[0|1]
- From: Will Thompson <wjt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/fix-build-with-meson-0.48.0-and-0.48.1] Fix build with Meson 0.48.[0|1]
- Date: Mon, 5 Nov 2018 10:35:21 +0000 (UTC)
commit d8dc909bd5a0b9eda74dc5ab489100edd0343b61
Author: Will Thompson <will willthompson co uk>
Date: Mon Nov 5 10:32:09 2018 +0000
Fix build with Meson 0.48.[0|1]
https://github.com/mesonbuild/meson/commit/176af2c8c33e79732680ebb1e2a25b5cd7a51bb9,
first included in Meson 0.48.0, breaks i18n.merge_file() when 'input' is
a list. It's fixed by this commit
https://github.com/mesonbuild/meson/commit/fe3efe0bc6f0bb0f282a2d1f7db4e72f16a3f51c
which will eventually appear in 0.48.2/0.49 (whatever is the next
release). In the meantime, we can work around this by specifying the
input file as a scalar, not a list. (There are actually no translated
strings in this .desktop file, anyway…)
Fixes #64.
data/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/data/meson.build b/data/meson.build
index ac14976..8fa6f29 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -25,7 +25,7 @@ endforeach
i18n.merge_file(
'desktop',
- input: files('setup-shell.desktop'),
+ input: 'setup-shell.desktop',
output: 'setup-shell.desktop',
install_dir: join_paths(data_dir, 'gdm', 'greeter', 'applications'),
po_dir: po_dir,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]