| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From 9c5ce6836498fdb057a7f865f516ce28609f542a Mon Sep 17 00:00:00 2001 |
| 2 | From: r-value <i@rvalue.moe> |
| 3 | Date: Thu, 30 Dec 2021 17:14:47 +0800 |
| 4 | Subject: [PATCH] Fix meson build with meson 0.60.0+ |
| 5 | |
| 6 | `i18n.merge_file` has been ignoring positional arguments for a time |
| 7 | and explicitly rejects with error since meson 0.60.0 |
| 8 | |
| 9 | Upstrean-Status: Backport |
| 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 11 | --- |
| 12 | data/meson.build | 2 +- |
| 13 | src/meson.build | 2 +- |
| 14 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/data/meson.build b/data/meson.build |
| 17 | index bfc9caa..8e42134 100644 |
| 18 | --- a/data/meson.build |
| 19 | +++ b/data/meson.build |
| 20 | @@ -1,6 +1,6 @@ |
| 21 | appdatadir = join_paths(datadir, 'metainfo') |
| 22 | appdata_file = 'org.gnome.font-viewer.appdata.xml' |
| 23 | -merged_appdata = i18n.merge_file(appdata_file, |
| 24 | +merged_appdata = i18n.merge_file( |
| 25 | input: appdata_file + '.in', |
| 26 | output: appdata_file, |
| 27 | po_dir: '../po', |
| 28 | diff --git a/src/meson.build b/src/meson.build |
| 29 | index f863d45..826c59b 100644 |
| 30 | --- a/src/meson.build |
| 31 | +++ b/src/meson.build |
| 32 | @@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop' |
| 33 | desktop_conf = configuration_data() |
| 34 | desktop_conf.set('VERSION', meson.project_version()) |
| 35 | desktop_conf.set('APPLICATION_ID', application_id) |
| 36 | -i18n.merge_file(desktop_file, |
| 37 | +i18n.merge_file( |
| 38 | input: configure_file(input: desktop_file + '.in.in', |
| 39 | output: desktop_file + '.in', |
| 40 | configuration: desktop_conf), |