From ef5467fb643a04fd2f42a91d7ff626b162e86be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= Date: Fri, 30 Aug 2024 23:10:13 +0200 Subject: [PATCH] build: Actually translate metainfo Part-of: --- data/meson.build | 14 ++++++++++---- ...etainfo.xml => org.gnome.Calls.metainfo.xml.in} | 0 meson.build | 2 +- po/POTFILES.in | 2 +- src/meson.build | 1 + 5 files changed, 13 insertions(+), 6 deletions(-) rename data/{org.gnome.Calls.metainfo.xml => org.gnome.Calls.metainfo.xml.in} (100%) diff --git a/data/meson.build b/data/meson.build index 4fe62e2..67d0087 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,3 +1,6 @@ +gnome = import('gnome') +i18n = import('i18n') + datadir = get_option('datadir') sysconfdir = get_option('sysconfdir') @@ -67,8 +70,12 @@ endif # Metainfo file -install_data('org.gnome.Calls.metainfo.xml', - install_dir: join_paths(datadir, 'metainfo'), +metainfo_file = i18n.merge_file( + input: 'org.gnome.Calls.metainfo.xml.in', + output: 'org.gnome.Calls.metainfo.xml', + po_dir: '../po', + install: true, + install_dir: join_paths(datadir, 'metainfo') ) appstreamcli = find_program('appstreamcli', required: false) @@ -77,8 +84,7 @@ if appstreamcli.found() args: ['validate', '--pedantic', '--no-net', - join_paths(meson.current_source_dir(), - 'org.gnome.Calls.metainfo.xml') + metainfo_file ]) endif diff --git a/data/org.gnome.Calls.metainfo.xml b/data/org.gnome.Calls.metainfo.xml.in similarity index 100% rename from data/org.gnome.Calls.metainfo.xml rename to data/org.gnome.Calls.metainfo.xml.in diff --git a/meson.build b/meson.build index bef1b0b..b1b02f4 100644 --- a/meson.build +++ b/meson.build @@ -159,11 +159,11 @@ summary({ }) subdir('po') +subdir('data') subdir('src') subdir('plugins') subdir('tests') subdir('doc') -subdir('data') # gnome.post_install() is available since meson 0.59.0 # Distributions use their own tooling (e.g. postinst, triggers, etc) diff --git a/po/POTFILES.in b/po/POTFILES.in index 1e4c42d..e8e9d1f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ # List of source files containing translatable strings. data/org.gnome.Calls.desktop.in data/org.gnome.Calls-daemon.desktop.in -data/org.gnome.Calls.metainfo.xml +data/org.gnome.Calls.metainfo.xml.in data/org.gnome.Calls.gschema.xml src/calls-account.c src/calls-account-overview.c diff --git a/src/meson.build b/src/meson.build index 498eaf8..a9d0477 100644 --- a/src/meson.build +++ b/src/meson.build @@ -78,6 +78,7 @@ calls_resources = gnome.compile_resources( 'calls.gresources.xml', source_dir: ['ui', '../data'], c_name: 'call', + dependencies: metainfo_file, ) calls_generated_sources = [