From 6c659d4e95502d105e8ecda7605a3cfd6591caee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
Date: Thu, 4 Jan 2024 23:31:15 +0300
Subject: [PATCH] appdata: Improve appdata for AppStream 1.0 (#838)

* appdata: Remove none OARS tags
* appdata: Improve appdata for AppStream 1.0
---
 com.github.geigi.cozy.json             |  1 +
 data/com.github.geigi.cozy.appdata.xml | 37 +++++---------------------
 data/meson.build                       |  3 ++-
 3 files changed, 9 insertions(+), 32 deletions(-)

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 889fd80a..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>
@@ -220,37 +224,8 @@
       </description>
     </release>
   </releases>
-  
-  <content_rating type="oars-1.1">
-    <content_attribute id="violence-cartoon">none</content_attribute>
-    <content_attribute id="violence-fantasy">none</content_attribute>
-    <content_attribute id="violence-realistic">none</content_attribute>
-    <content_attribute id="violence-bloodshed">none</content_attribute>
-    <content_attribute id="violence-sexual">none</content_attribute>
-    <content_attribute id="violence-desecration">none</content_attribute>
-    <content_attribute id="violence-slavery">none</content_attribute>
-    <content_attribute id="violence-worship">none</content_attribute>
-    <content_attribute id="drugs-alcohol">none</content_attribute>
-    <content_attribute id="drugs-narcotics">none</content_attribute>
-    <content_attribute id="drugs-tobacco">none</content_attribute>
-    <content_attribute id="sex-nudity">none</content_attribute>
-    <content_attribute id="sex-themes">none</content_attribute>
-    <content_attribute id="sex-homosexuality">none</content_attribute>
-    <content_attribute id="sex-prostitution">none</content_attribute>
-    <content_attribute id="sex-adultery">none</content_attribute>
-    <content_attribute id="sex-appearance">none</content_attribute>
-    <content_attribute id="language-profanity">none</content_attribute>
-    <content_attribute id="language-humor">none</content_attribute>
-    <content_attribute id="language-discrimination">none</content_attribute>
-    <content_attribute id="social-chat">none</content_attribute>
-    <content_attribute id="social-info">none</content_attribute>
-    <content_attribute id="social-audio">none</content_attribute>
-    <content_attribute id="social-location">none</content_attribute>
-    <content_attribute id="social-contacts">none</content_attribute>
-    <content_attribute id="money-purchasing">none</content_attribute>
-    <content_attribute id="money-gambling">none</content_attribute>
-  </content_rating>
-  
+
+  <content_rating type="oars-1.1" />
   <custom>
     <value key="x-appcenter-color-primary">#FB6542</value>
     <value key="x-appcenter-color-primary-text">#FFFFFF</value>
diff --git a/data/meson.build b/data/meson.build
index adcc7595..6a03c242 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -50,6 +50,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