[ghex/gtk4-port] ci/meson: more fixes.

[Logan Rathbone <larathbone src gnome org>]

commit 0770aa188dae32ae1efa2090f3c933b2e0d01704
Author: Logan Rathbone <poprocks gmail com>
Date:   Sun Dec 5 22:29:26 2021 -0500

    ci/meson: more fixes.

 data/meson.build                                        | 16 ++++++++++++----
 ....appdata.xml.in => org.gnome.GHex.appdata.xml.in.in} | 17 +++++------------
 2 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 106fa80..c5f76ed 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -63,9 +63,17 @@ configure_file(
   install: true
 )
 
-ghex_appdata = i18n.merge_file(
-  input: 'org.gnome.GHex.appdata.xml.in',
-  output: 'org.gnome.GHex.appdata.xml',
+appdata_in_conf = configuration_data()
+appdata_in_conf.set('app_id', app_id)
+appdata_in = configure_file(
+  input: 'org.gnome.GHex.appdata.xml.in.in',
+  output: '@0  appdata xml in'.format(app_id),
+  configuration: appdata_in_conf,
+)
+
+appdata = i18n.merge_file(
+  input: appdata_in,
+  output: '@0  appdata xml'.format(app_id),
   po_dir: ghex_po_dir,
   install_dir: ghex_appdatadir,
   install: true
@@ -80,6 +88,6 @@ if appstream_util_prg.found()
   test(
     'Validate appstream file',
     appstream_util_prg,
-    args: ['validate-relax', '--nonet', ghex_appdata]
+    args: ['validate-relax', '--nonet', appdata]
   )
 endif
diff --git a/data/org.gnome.GHex.appdata.xml.in b/data/org.gnome.GHex.appdata.xml.in.in
similarity index 87%
rename from data/org.gnome.GHex.appdata.xml.in
rename to data/org.gnome.GHex.appdata.xml.in.in
index ade902d..446eb01 100644
--- a/data/org.gnome.GHex.appdata.xml.in
+++ b/data/org.gnome.GHex.appdata.xml.in.in
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gnome.GHex</id>
+  <id>@app_id@</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
-  <name>GNOME Hex Editor</name>
+  <name>GHex</name>
   <summary>Inspect and edit binary files</summary>
   <description>
     <p>
@@ -26,25 +26,18 @@
     <kudo>ModernToolkit</kudo>
     <kudo>UserDocs</kudo>
   </kudos>
-  <provides>
-    <binary>ghex</binary>
-    <id>ghex.desktop</id>
-    <id>org.gnome.ghex</id>
-  </provides>
   <releases>
     <release version="3.18.4" date="2019-07-13"/>
     <release version="3.18.3" date="2016-10-12"/>
     <release version="3.18.2" date="2016-06-13"/>
   </releases>
-  <url type="homepage">https://wiki.gnome.org/Apps/Ghex</url>
+  <url type="homepage">https://gitlab.gnome.org/GNOME/ghex</url>
   <url type="bugtracker">https://gitlab.gnome.org/GNOME/ghex/issues</url>
   <url type="donation">http://www.gnome.org/friends/</url>
   <url type="help">https://help.gnome.org/users/ghex/stable/</url>
-  <launchable type="desktop-id">org.gnome.GHex.desktop</launchable>
-  <developer_name>The GNOME Project</developer_name>
-  <update_contact>kalevlember_at_gmail.com</update_contact>
+  <launchable type="desktop-id">@app_id@.desktop</launchable>
+  <developer_name>Logan Rathbone</developer_name>
   <project_group>GNOME</project_group>
-  <translation type="gettext">ghex-3.0</translation>
   <content_rating type="oars-1.1">
     <content_attribute id="violence-cartoon">none</content_attribute>
     <content_attribute id="violence-fantasy">none</content_attribute>