diff --git a/data/meson.build b/data/meson.build index 69bd1e87f..7efaac370 100644 --- a/data/meson.build +++ b/data/meson.build @@ -71,10 +71,16 @@ foreach man_page: man_pages endforeach # Metainfo file -metainfo = ev_namespace + '.metainfo.xml' -i18n.merge_file( - input: metainfo + '.in', - output: metainfo, +metainfo_config = configuration_data() +metainfo_config.set('app_id', ev_app_id) +metainfo_file_in = configure_file( + input: 'org.gnome.Evince.metainfo.xml.in.in', + output: 'org.gnome.Evince.metainfo.xml.in', + configuration: metainfo_config, +) +metainfo_file = i18n.merge_file( + input: metainfo_file_in, + output: '@0@.metainfo.xml'.format(ev_app_id), po_dir: po_dir, install: true, install_dir: ev_appstreamdir, @@ -85,7 +91,7 @@ appstreamcli = find_program('appstreamcli', required: false) if (appstreamcli.found()) test('validate-appdata', appstreamcli, - args: ['validate', '--no-net', '--explain', metainfo], + args: ['validate', '--no-net', '--explain', metainfo_file], workdir: meson.current_build_dir() ) endif diff --git a/data/org.gnome.Evince.metainfo.xml.in b/data/org.gnome.Evince.metainfo.xml.in.in similarity index 99% rename from data/org.gnome.Evince.metainfo.xml.in rename to data/org.gnome.Evince.metainfo.xml.in.in index 197f96ad3..18ba74e07 100644 --- a/data/org.gnome.Evince.metainfo.xml.in +++ b/data/org.gnome.Evince.metainfo.xml.in.in @@ -16,8 +16,8 @@ along with this program. If not, see . --> - org.gnome.Evince - org.gnome.Evince.desktop + @app_id@ + @app_id@.desktop GPL-2.0+ or GFDL-1.3-only GPL-2.0-or-later Document Viewer diff --git a/po/POTFILES.in b/po/POTFILES.in index b18fc8c18..5ed5c066a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -22,7 +22,7 @@ backend/xps/evince-xpsdocument.metainfo.xml.in.in backend/xps/xpsdocument.evince-backend.desktop.in.in data/org.gnome.Evince.desktop.in.in data/org.gnome.Evince.gschema.xml -data/org.gnome.Evince.metainfo.xml.in +data/org.gnome.Evince.metainfo.xml.in.in data/org.gnome.Evince-previewer.desktop.in.in libdocument/ev-attachment.c libdocument/ev-document-factory.c