From ddc7d2d53e8f0e785e447288e6cdf29e6b8abf25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
Date: Thu, 28 Dec 2023 22:58:50 +0300
Subject: [PATCH 1/2] appdata: Fix my mistake
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"Icons and categories

If there’s a type="desktop-id" launchable, they get pulled from it.
Most of the icon not found errors with the flathub builder can be
traced down to the launchable value not matching the desktop file name.

Don’t set them in the AppData unless you want to override them
(even though then it might be a better idea to patch the desktop file
itself)."

More information: https://docs.flathub.org/docs/for-app-authors/appdata-guidelines/#icons-and-categories
---
 data/com.github.maoschanz.drawing.appdata.xml.in | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/data/com.github.maoschanz.drawing.appdata.xml.in b/data/com.github.maoschanz.drawing.appdata.xml.in
index e4d8872f..9aff94f1 100644
--- a/data/com.github.maoschanz.drawing.appdata.xml.in
+++ b/data/com.github.maoschanz.drawing.appdata.xml.in
@@ -33,17 +33,6 @@
     <p>Supported file types include PNG, JPEG and BMP.</p>
   </description>
 
-  <categories>
-    <category>Graphics</category>
-  </categories>
-  
-  <keywords>
-    <keyword translate="no">drawing</keyword>
-    <keyword>Paint</keyword>
-    <keyword>Sketch</keyword>
-    <keyword>Pencil</keyword>
-  </keywords>
-  
   <releases>
     <release version="1.2.0" date="2023-04-29">
     <!-- TODO actual date -->

From 1dd02a5299340af10b6b4eaf20c2f8ef546f0c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
Date: Thu, 28 Dec 2023 23:03:47 +0300
Subject: [PATCH 2/2] appdata: Improve appdata for AppStream 1.0

- Add the `<developer><name>` tag
- Mark the `<developer_name>` tag as deprecated
- Improve appstreamcli arguments
---
 data/com.github.maoschanz.drawing.appdata.xml.in | 4 ++++
 data/meson.build                                 | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/data/com.github.maoschanz.drawing.appdata.xml.in b/data/com.github.maoschanz.drawing.appdata.xml.in
index 9aff94f1..e4b9e305 100644
--- a/data/com.github.maoschanz.drawing.appdata.xml.in
+++ b/data/com.github.maoschanz.drawing.appdata.xml.in
@@ -157,7 +157,11 @@
     </release>
   </releases>
 
+  <!-- developer_name tag deprecated with Appstream 1.0 -->
   <developer_name translatable="no">Romain F. T.</developer_name>
+  <developer id="github.com">
+    <name translatable="no">Romain F. T.</name>
+  </developer>
   <update_contact>rrroschan@gmail.com</update_contact>
   <url type="homepage">https://maoschanz.github.io/drawing</url>
   <url type="bugtracker">https://github.com/maoschanz/drawing/issues</url>
diff --git a/data/meson.build b/data/meson.build
index f97c4b7d..98d2966f 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -43,7 +43,8 @@ if get_option('enable-translations-and-appdata')
 		test(
 			'Validate appstream file',
 			appstreamcli,
-			args: ['validate', '--no-net', appstream_file]
+			args: ['validate', '--no-net', '--explain', appstream_file],
+			workdir: meson.current_build_dir()
 		)
 	endif
 endif