From 80c8566535dd836141de7f20e2383c776277fb74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
Date: Sun, 31 Dec 2023 18:29:15 +0300
Subject: [PATCH] appdata: Improve appdata for AppStream 1.0 (#222)

* appdata: Improve appdata for AppStream 1.0

- Add the `<developer><name>` tag
- Mark the `<developer_name>` tag as deprecated
- Improve appstreamcli parameters
- Activate meson tests on Flatpak manifest

* Change developer ID to kramo.hu

---------

Co-authored-by: kramo <93832451+kra-mo@users.noreply.github.com>
---
 data/hu.kramo.Cartridges.metainfo.xml.in | 4 ++++
 data/meson.build                         | 6 +++++-
 flatpak/hu.kramo.Cartridges.Devel.json   | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/data/hu.kramo.Cartridges.metainfo.xml.in b/data/hu.kramo.Cartridges.metainfo.xml.in
index 40f7e19..4afa764 100644
--- a/data/hu.kramo.Cartridges.metainfo.xml.in
+++ b/data/hu.kramo.Cartridges.metainfo.xml.in
@@ -14,7 +14,11 @@
   <url type="contact">https://www.kramo.hu/about/</url>
   <url type="vcs-browser">https://github.com/kra-mo/cartridges</url>
   <url type="contribute">https://github.com/kra-mo/cartridges/blob/main/CONTRIBUTING.md</url>
+  <!-- developer_name tag deprecated with Appstream 1.0 -->
   <developer_name translatable="no">kramo</developer_name>
+  <developer id="kramo.hu">
+      <name translatable="no">kramo</name>
+  </developer>
   <project_group>GNOME</project_group>
   <launchable type="desktop-id">@APP_ID@.desktop</launchable>
   <translation type="gettext">cartridges</translation>
diff --git a/data/meson.build b/data/meson.build
index 137fa63..756c573 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -54,7 +54,11 @@ appstream_file = i18n.merge_file(
 
 appstreamcli = find_program('appstreamcli', required: false)
 if appstreamcli.found()
-  test('Validate appstream file', appstreamcli, args: ['validate', appstream_file])
+  test('Validate appstream file',
+    appstreamcli,
+    args: ['validate', '--no-net', '--explain', appstream_file],
+    workdir: meson.current_build_dir()
+  )
 endif
 
 install_data(
diff --git a/flatpak/hu.kramo.Cartridges.Devel.json b/flatpak/hu.kramo.Cartridges.Devel.json
index e9787f4..69850b9 100644
--- a/flatpak/hu.kramo.Cartridges.Devel.json
+++ b/flatpak/hu.kramo.Cartridges.Devel.json
@@ -123,6 +123,7 @@
             "name" : "cartridges",
             "builddir" : true,
             "buildsystem" : "meson",
+            "run-tests" : true,
             "config-opts": [
                 "-Dprofile=development"
             ],