From d1d6043d39953c76b8eb94ada3a89e22c2838dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
Date: Wed, 27 Dec 2023 06:37:54 +0300
Subject: [PATCH] appdata: Update appdata

- Use appstreamcli to validate appdata
- Fix some appdata issues
- Mark the developer_name tag as untranslatable also deprecated
- Remove useless custom Purism tags
- Add vcs-browser and translate URLs
- Add newly added developer > name tag
- Remove duplicated translation tag
---
 data/com.vixalien.sticky.appdata.xml.in.in | 25 +++++++++-------------
 data/meson.build                           |  6 +++---
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/data/com.vixalien.sticky.appdata.xml.in.in b/data/com.vixalien.sticky.appdata.xml.in.in
index 7976a17..d0e8adb 100644
--- a/data/com.vixalien.sticky.appdata.xml.in.in
+++ b/data/com.vixalien.sticky.appdata.xml.in.in
@@ -19,26 +19,26 @@
 		</ul>
 	</description>
 	<screenshots>
-		<screenshot>
-			<image>
-				https://raw.githubusercontent.com/vixalien/sticky/v0.1.1/data/resources/screenshots/note.png</image>
+		<screenshot type="default">
+			<image>https://raw.githubusercontent.com/vixalien/sticky/v0.1.1/data/resources/screenshots/note.png</image>
 		</screenshot>
 		<screenshot>
-			<image>
-				https://raw.githubusercontent.com/vixalien/sticky/v0.1.1/data/resources/screenshots/notes.png</image>
+			<image>https://raw.githubusercontent.com/vixalien/sticky/v0.1.1/data/resources/screenshots/notes.png</image>
 		</screenshot>
 	</screenshots>
 	<launchable type="desktop-id">@app-id@.desktop</launchable>
 	<url type="homepage">https://github.com/vixalien/sticky</url>
 	<url type="bugtracker">https://github.com/vixalien/sticky/issues</url>
+	<url type="vcs-browser">https://github.com/vixalien/sticky</url>
+	<url type="translate">https://github.com/vixalien/sticky/tree/main/po</url>
 	<url type="donation">https://www.buymeacoffee.com/vixalien</url>
-	<developer_name>Angelo Verlain</developer_name>
+	<!-- developer_name tag deprecated with Appstream 1.0 -->
+	<developer_name translatable="no">Angelo Verlain</developer_name>
+  <developer id="github.com">
+    <name>Angelo Verlain</name>
+  </developer>
 	<update_contact>hey_at_vixalien.com</update_contact>
 	<translation type="gettext">sticky</translation>
-	<custom>
-		<value key="Purism::form_factor">workstation</value>
-		<value key="Purism::form_factor">mobile</value>
-	</custom>
 	<requires>
 		<display_length compare="ge">360</display_length>
 	</requires>
@@ -194,9 +194,4 @@
 	</kudos>
 	<content_rating type="oars-1.1" />
 	<provides>@app-id@.desktop</provides>
-	<translation type="gettext">@gettext-package@</translation>
-	<custom>
-		<value key="Purism::form_factor">workstation</value>
-		<value key="Purism::form_factor">mobile</value>
-	</custom>
 </component>
diff --git a/data/meson.build b/data/meson.build
index e15fc9e..b4d949c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -36,9 +36,9 @@ appstream_file = i18n.merge_file(
   install_dir: join_paths(get_option('datadir'), 'appdata')
 )
 
-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
-  test('Validate appstream file', appstream_util, args: ['validate-relax', appstream_file])
+appstreamcli = find_program('appstreamcli', required: false)
+if appstreamcli.found()
+  test('Validate appstream file', appstreamcli, args: ['validate', '--no-net', '--explain', appstream_file])
 endif
 
 gsettings_conf = configuration_data()