From 7b6a3a6e9104b561395c7daa02b33a84b4c52091 Mon Sep 17 00:00:00 2001 From: Peter Eisenmann Date: Thu, 14 Nov 2024 04:46:01 +0000 Subject: [PATCH] appdata: Make sure translations are in resources This is strongly inspired by [1] and was pointed out by Matthijs Velsink (@velsinki) on chat. [1] https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/0799aa7880ca15435d959c182bc77be5d35ab88b --- meson.build | 6 ++++++ src/meson.build | 13 +++++++++---- ...ilus.gresource.xml => nautilus.gresource.xml.in} | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) rename src/resources/{nautilus.gresource.xml => nautilus.gresource.xml.in} (98%) diff --git a/meson.build b/meson.build index 6809231bab..ca5b4c8ad6 100644 --- a/meson.build +++ b/meson.build @@ -180,6 +180,12 @@ if gtk_wayland.found() conf.set('HAVE_GTK_WAYLAND', 1) endif +###################################### +# File Configuration (for xml files) # +###################################### +file_conf = configuration_data() +file_conf.set('appid', application_id) + ############################################################# # config.h dependency, add to target dependencies if needed # ############################################################# diff --git a/src/meson.build b/src/meson.build index 8a240fecee..f5e227294e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,9 +1,14 @@ + +gresource_file = configure_file( + input: join_paths('resources', 'nautilus.gresource.xml.in'), + output: 'nautilus.gresource.xml', + configuration: file_conf +) + resources = gnome.compile_resources( 'nautilus-resources', - join_paths( - 'resources', 'nautilus.gresource.xml' - ), - dependencies: [appdata], + gresource_file, + dependencies: [appdata, gresource_file], source_dir: 'resources', c_name: 'nautilus', extra_args: '--manual-register' diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml.in similarity index 98% rename from src/resources/nautilus.gresource.xml rename to src/resources/nautilus.gresource.xml.in index 643f4b550a..f55fadd6c9 100644 --- a/src/resources/nautilus.gresource.xml +++ b/src/resources/nautilus.gresource.xml.in @@ -2,7 +2,7 @@ ui/nautilus-preferences-dialog.ui - ./../data/org.gnome.Nautilus.metainfo.xml.in + ./../data/@appid@.metainfo.xml ui/nautilus-search-popover.ui ui/nautilus-search-types-dialog.ui ui/nautilus-app-chooser.ui -- GitLab