diff options
author | Emmanuele Bassi <ebassi@gmail.com> | 2022-01-24 12:00:20 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gmail.com> | 2022-01-24 12:00:20 +0000 |
commit | 2c29c1b455e732a3fe2c9144a645c9c781401b58 (patch) | |
tree | 1f30d2ecb839a135479c84b44f7f6f73620ad9b2 | |
parent | b8b8332edcda5824a021dca565f802b64fd998b5 (diff) | |
parent | cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68 (diff) | |
download | gnome-dictionary-2c29c1b455e732a3fe2c9144a645c9c781401b58.tar.gz |
Merge branch 'meson-0.61' into 'master'
Unbreak build with Meson 0.61.0
See merge request GNOME/gnome-dictionary!18
-rw-r--r-- | data/appdata/meson.build | 2 | ||||
-rw-r--r-- | data/meson.build | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/appdata/meson.build b/data/appdata/meson.build index ef95c85..65a044f 100644 --- a/data/appdata/meson.build +++ b/data/appdata/meson.build @@ -1,6 +1,6 @@ appdata_conf = configuration_data() appdata_conf.set('application_id', application_id) -appdata_file = i18n.merge_file('appdata', +appdata_file = i18n.merge_file( input: configure_file( input: 'org.gnome.Dictionary.appdata.xml.in.in', output: 'org.gnome.Dictionary.appdata.xml.in', diff --git a/data/meson.build b/data/meson.build index 1723c8f..4db85ee 100644 --- a/data/meson.build +++ b/data/meson.build @@ -3,7 +3,7 @@ subdir('appdata') desktop_conf = configuration_data() desktop_conf.set('icon', application_id) desktop_conf.set('application_id', application_id) -desktop_file = i18n.merge_file('desktop', +desktop_file = i18n.merge_file( input: configure_file( input: 'org.gnome.Dictionary.desktop.in.in', output: 'org.gnome.Dictionary.desktop.in', @@ -46,7 +46,7 @@ sources = [ ] foreach s: sources - i18n.merge_file('sources', + i18n.merge_file( input: '@0@.in'.format(s), output: s, install: true, |