From d8e12f7b1b3b5811041d7ec14dc23327a6750243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
Date: Sat, 30 Dec 2023 09:04:42 +0300
Subject: [PATCH] appdata: Improve appdata for AppStream 1.0

- Add the `<developer><name>` tag
- Mark the `<developer_name>` tag as deprecated
- Improve appstreamcli parameters
---
 com.github.geigi.cozy.json             | 1 +
 data/com.github.geigi.cozy.appdata.xml | 4 ++++
 data/meson.build                       | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/com.github.geigi.cozy.json b/com.github.geigi.cozy.json
index f8521006..191855b5 100644
--- a/com.github.geigi.cozy.json
+++ b/com.github.geigi.cozy.json
@@ -133,6 +133,7 @@
     {
       "name": "cozy",
       "buildsystem": "meson",
+      "run-tests": true,
       "sources": [
         {
           "type": "dir",
diff --git a/data/com.github.geigi.cozy.appdata.xml b/data/com.github.geigi.cozy.appdata.xml
index 3f51585b..6e8f6e18 100644
--- a/data/com.github.geigi.cozy.appdata.xml
+++ b/data/com.github.geigi.cozy.appdata.xml
@@ -44,7 +44,11 @@
       <image>https://raw.githubusercontent.com/geigi/cozy/img/img/screenshot4.png</image>
     </screenshot>
   </screenshots>
+  <!-- developer_name tag deprecated with Appstream 1.0 -->
   <developer_name translatable="no">Julian Geywitz</developer_name>
+  <developer id="github.com">
+      <name translatable="no">Julian Geywitz</name>
+  </developer>
   <url type="homepage">https://cozy.sh</url>
   <url type="bugtracker">https://github.com/geigi/cozy/issues</url>
   <url type="help">https://matrix.to/#/#cozy:gnome.org?via=matrix.org&amp;via=gnome.org</url>
diff --git a/data/meson.build b/data/meson.build
index 7eb59a61..990155f0 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -41,6 +41,7 @@ appstream_file = i18n.merge_file(
 appstreamcli = find_program('appstreamcli', required: false)
 if appstreamcli.found()
   test('Validate appstream file', appstreamcli,
-    args: ['validate', '--no-net', appstream_file]
+    args: ['validate', '--no-net', '--explain', appstream_file],
+    workdir: meson.current_build_dir()
   )
 endif