From cd197d14a271db17adc93b060c17b97b2c948ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
Date: Fri, 29 Dec 2023 23:45:24 +0300
Subject: [PATCH] appdata: Improve appdata for AppStream 1.0

- Add the `<developer><name>` tag
- Mark the `<developer_name>` tag as deprecated
- Add vcs-browser URL
- Add translation tag
- Use appstreamcli to validate appdata
- Remove one of Purism tag to pass validation test
- Update Runtime version
- Activate meson tests on flatpak manifest
---
 data/meson.build                                     | 10 ++++++----
 data/org.gustavoperedo.FontDownloader.appdata.xml.in |  9 +++++++--
 org.gustavoperedo.FontDownloader.json                |  3 ++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index 853bee1..7045432 100755
--- a/data/meson.build
+++ b/data/meson.build
@@ -28,10 +28,12 @@ appstream_file = i18n.merge_file(
   install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
 
-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
-  test('Validate appstream file', appstream_util,
-    args: ['validate', appstream_file]
+appstreamcli = find_program('appstreamcli', required: false)
+if appstreamcli.found()
+  test('Validate appstream file',
+    appstreamcli,
+    args: ['validate', '--no-net', '--explain', appstream_file],
+    workdir: meson.current_build_dir()
   )
 endif
 
diff --git a/data/org.gustavoperedo.FontDownloader.appdata.xml.in b/data/org.gustavoperedo.FontDownloader.appdata.xml.in
index 0d95426..f2ed4ef 100755
--- a/data/org.gustavoperedo.FontDownloader.appdata.xml.in
+++ b/data/org.gustavoperedo.FontDownloader.appdata.xml.in
@@ -227,12 +227,17 @@
   </releases>
   <url type="homepage">https://github.com/GustavoPeredo/font-downloader</url>
   <url type="bugtracker">https://github.com/GustavoPeredo/Font-Downloader/issues</url>
+  <url type="vcs-browser">https://github.com/GustavoPeredo/font-downloader</url>
   <url type="translate">https://poeditor.com/join/project?hash=hfnXv8Iw4o</url>
-  <developer_name>Gustavo Peredo</developer_name>
+  <!-- developer_name tag deprecated with Appstream 1.0 -->
+  <developer_name translatable="no">Gustavo Peredo</developer_name>
+  <developer id="github.com">
+      <name translatable="no">Gustavo Peredo</name>
+  </developer>
   <launchable type="desktop-id">org.gustavoperedo.FontDownloader.desktop</launchable>
+  <translation type="gettext">fontdownloader</translation>
   <content_rating type="oars-1.1"/>
   <custom>
-    <value key="Purism::form_factor">workstation</value>
     <value key="Purism::form_factor">mobile</value>
   </custom>
 </component>
diff --git a/org.gustavoperedo.FontDownloader.json b/org.gustavoperedo.FontDownloader.json
index 214b54a..6257089 100755
--- a/org.gustavoperedo.FontDownloader.json
+++ b/org.gustavoperedo.FontDownloader.json
@@ -1,7 +1,7 @@
 {
     "app-id" : "org.gustavoperedo.FontDownloader",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "44",
+    "runtime-version" : "45",
     "sdk" : "org.gnome.Sdk",
     "command" : "fontdownloader",
     "finish-args" : [
@@ -50,6 +50,7 @@
             "name" : "fontdownloader",
             "builddir" : true,
             "buildsystem" : "meson",
+            "run-tests" : true,
             "sources" : [
                 {
                     "type" : "dir",