From 987585556a36416b4c42193ccafea9eb53c8f5f7 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@protonmail.com>
Date: Sun, 3 Mar 2024 10:07:48 +0100
Subject: [PATCH 1/4] appdata: Remove Purism::form_factor=workstation

This is a key=value dict, with two entries one gets an error:

    E: com.github.tchx84.Flatseal:39: custom-key-duplicated Purism::form_factor
       A key can only be used once.

Apps generally remove the workstation key so the app is still marked as
mobile capable.
---
 data/com.github.tchx84.Flatseal.appdata.xml.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/com.github.tchx84.Flatseal.appdata.xml.in b/data/com.github.tchx84.Flatseal.appdata.xml.in
index f4281f46..39d59e51 100644
--- a/data/com.github.tchx84.Flatseal.appdata.xml.in
+++ b/data/com.github.tchx84.Flatseal.appdata.xml.in
@@ -35,7 +35,6 @@
   <url type="homepage">https://github.com/tchx84/flatseal</url>
   <url type="bugtracker">https://github.com/tchx84/flatseal/issues</url>
   <custom>
-    <value key="Purism::form_factor">workstation</value>
     <value key="Purism::form_factor">mobile</value>
   </custom>
 </component>

From 68a0604ff163d746b7e18fd2ff3f924fe37b2850 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@protonmail.com>
Date: Sun, 3 Mar 2024 10:10:21 +0100
Subject: [PATCH 2/4] appdata: Add developer tag

developer_name was deprecated in AppStream 1.0, this is the replacement.
---
 data/com.github.tchx84.Flatseal.appdata.xml.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/com.github.tchx84.Flatseal.appdata.xml.in b/data/com.github.tchx84.Flatseal.appdata.xml.in
index 39d59e51..ea982cbb 100644
--- a/data/com.github.tchx84.Flatseal.appdata.xml.in
+++ b/data/com.github.tchx84.Flatseal.appdata.xml.in
@@ -32,6 +32,9 @@
   <update_contact>martin.abente.lahaye@gmail.com</update_contact>
   <!-- TRANSLATORS: Don't translate this text -->
   <developer_name>Martin Abente Lahaye</developer_name>
+  <developer id="dev.tchx84">
+    <name translatable="no">Martin Abente Lahaye</name>
+  </developer>
   <url type="homepage">https://github.com/tchx84/flatseal</url>
   <url type="bugtracker">https://github.com/tchx84/flatseal/issues</url>
   <custom>

From 245f341e3ec1fc1b8d6366493c47f64b4b10df5e Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@protonmail.com>
Date: Sun, 3 Mar 2024 10:12:04 +0100
Subject: [PATCH 3/4] appdata: Add launchable

Fixes the following error:

    com.github.tchx84.Flatseal:~: desktop-app-launchable-missing
    This `desktop-application` component is missing a `desktop-id` launchable tag. This means that
    this application can not be launched and has no association with its desktop-entry file. It also
    means no icon data or category information from the desktop-entry file will be available, which
    will result in this application being ignored entirely.
---
 data/com.github.tchx84.Flatseal.appdata.xml.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/com.github.tchx84.Flatseal.appdata.xml.in b/data/com.github.tchx84.Flatseal.appdata.xml.in
index ea982cbb..158198be 100644
--- a/data/com.github.tchx84.Flatseal.appdata.xml.in
+++ b/data/com.github.tchx84.Flatseal.appdata.xml.in
@@ -3,6 +3,7 @@
   <!-- TRANSLATORS: Don't translate this text -->
   <name>Flatseal</name>
   <id>com.github.tchx84.Flatseal</id>
+  <launchable type="desktop-id">com.github.tchx84.Flatseal.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
   <content_rating type="oars-1.1"/>

From ad2cec00ab3fc790caeb764cbd60176d5f7ad38a Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval <msandova@protonmail.com>
Date: Sun, 3 Mar 2024 10:07:33 +0100
Subject: [PATCH 4/4] meson: Switch tests to appstreamcli

---
 data/meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index 02a2162e..bb10f344 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -22,10 +22,10 @@ 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', appstream_file]
+appstreamcli = find_program('appstreamcli', required: false)
+if appstreamcli.found()
+  test('Validate appstream file', appstreamcli,
+    args: ['validate', '--no-net', '--explain', appstream_file]
   )
 endif