[meld/flatpak-ci] Make appdata correctly template the application ID for desktop files

[Kai Willadsen <kaiw src gnome org>]

commit a4824bd351b961a7a9bdee49524435ee77591db9
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Dec 1 09:52:51 2019 +1000

    Make appdata correctly template the application ID for desktop files

 data/meson.build                                              | 11 +++++++++--
 ...e.meld.appdata.xml.in => org.gnome.meld.appdata.xml.in.in} |  2 +-
 meld/build_helpers.py                                         |  6 ++++++
 3 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index cae6c719..2a6aedc4 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -38,9 +38,16 @@ if desktop_file_validate.found()
   )
 endif
 
-# Install AppData file
+appdata_conf = configuration_data()
+appdata_conf.set('appid', application_id)
+
 appdata_file = i18n.merge_file(
-  input: '@0  appdata xml in'.format(resource_base_id),
+  'appdata',
+  input: configure_file(
+    input: files('org.gnome.meld.appdata.xml.in.in'),
+    output: 'org.gnome.meld.appdata.xml.in',
+    configuration: appdata_conf
+  ),
   output: '@0  appdata xml'.format(application_id),
   po_dir: podir,
   install: true,
diff --git a/data/org.gnome.meld.appdata.xml.in b/data/org.gnome.meld.appdata.xml.in.in
similarity index 98%
rename from data/org.gnome.meld.appdata.xml.in
rename to data/org.gnome.meld.appdata.xml.in.in
index 89a0e4af..f0bb31d1 100644
--- a/data/org.gnome.meld.appdata.xml.in
+++ b/data/org.gnome.meld.appdata.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013-2014 Kai Willadsen <kai willadsen gmail com> -->
 <component type="desktop">
-  <id>org.gnome.meld.desktop</id>
+  <id>@appid@.desktop</id>
   <translation type="gettext">meld</translation>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+ and CC-BY-SA-3.0</project_license>
diff --git a/meld/build_helpers.py b/meld/build_helpers.py
index badc52fa..c862942e 100644
--- a/meld/build_helpers.py
+++ b/meld/build_helpers.py
@@ -328,11 +328,17 @@ class build_i18n(distutils.cmd.Command):
             os.environ["XGETTEXT_ARGS"] = "--msgid-bugs-address=%s " % \
                                           self.bug_contact
 
+        # These copies are pure hacks to work around not having the
+        # Meson-based initial variable templating in distutils.
         import shutil
         shutil.copyfile(
             'data/org.gnome.meld.desktop.in.in',
             'data/org.gnome.meld.desktop.in',
         )
+        shutil.copyfile(
+            'data/org.gnome.meld.appdata.xml.in.in',
+            'data/org.gnome.meld.appdata.xml.in',
+        )
 
         self._rebuild_po()