diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2021-04-22 15:11:59 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2022-02-13 12:25:41 +0000 |
| commit | bf5a915962ec2f9a87a8a56c1c5cf4fe7304aa7e (patch) | |
| tree | 0c4b895c392d78dfa640edea88f67641541658e0 | |
| parent | a6b61cf5eb8a9adda35871a02c3146f338b9e55d (diff) | |
build: Fix test dependencies with Meson 0.57
We need to explicitly depend on the generated files.
Origin: upstream, 40.1, commit:87c026cfe4acbcfc62d15950f88a71d8d9678c7e
Gbp-Pq: Name build-Fix-test-dependencies-with-Meson-0.57.patch
| -rw-r--r-- | data/appdata/meson.build | 3 | ||||
| -rw-r--r-- | data/meson.build | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/data/appdata/meson.build b/data/appdata/meson.build index 1dc4ed7..ef95c85 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) -i18n.merge_file('appdata', +appdata_file = i18n.merge_file('appdata', input: configure_file( input: 'org.gnome.Dictionary.appdata.xml.in.in', output: 'org.gnome.Dictionary.appdata.xml.in', @@ -18,6 +18,7 @@ if appstream_util.found() appstream_util, args: [ 'validate', '--nonet', application_id + '.appdata.xml' ], workdir: meson.current_build_dir(), + depends: appdata_file, ) endif diff --git a/data/meson.build b/data/meson.build index 660e6b8..1723c8f 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) -i18n.merge_file('desktop', +desktop_file = i18n.merge_file('desktop', input: configure_file( input: 'org.gnome.Dictionary.desktop.in.in', output: 'org.gnome.Dictionary.desktop.in', @@ -22,6 +22,7 @@ if desktop_file_validate.found() desktop_file_validate, args: application_id + '.desktop', workdir: meson.current_build_dir(), + depends: desktop_file, ) endif |