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

- Add the `<developer><name>` tag
- Mark the `<developer_name>` tag as deprecated
- Remove the second appstreamcli validation
- Improve appstreamcli arguments
---
 data/app.metainfo.xml | 4 ++++
 data/meson.build      | 9 +--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/data/app.metainfo.xml b/data/app.metainfo.xml
index a07012312..847f09a86 100644
--- a/data/app.metainfo.xml
+++ b/data/app.metainfo.xml
@@ -3,7 +3,11 @@
   <id>@app_id@</id>
   <launchable type="desktop-id">@app_id@.desktop</launchable>
   <name translatable="no">Workbench</name>
+  <!-- developer_name tag deprecated with Appstream 1.0 -->
   <developer_name translatable="no">Sonny Piers</developer_name>
+  <developer id="gitlab.com">
+    <name translatable="no">Sonny Piers</name>
+  </developer>
   <update_contact>sonnyp@gnome.org</update_contact>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
diff --git a/data/meson.build b/data/meson.build
index a1e660c43..cd5f293b3 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -29,14 +29,7 @@ appstream_file = configure_file(
 appstream_cli = find_program('appstreamcli', required: false)
 if appstream_cli.found()
   test('Validate metainfo file', appstream_cli,
-    args: ['validate', '--override=release-time-missing=info', '--no-net', appstream_file]
-  )
-endif
-
-appstreamcli = find_program('appstreamcli', required: false)
-if appstreamcli.found()
-  test('Validate appstream file', appstreamcli,
-    args: ['validate', appstream_file]
+    args: ['validate', '--override=release-time-missing=info', '--no-net', '--explain', appstream_file]
   )
 endif