From 04fe80e67b3c21d2f42683e5c973321134078cd0 Mon Sep 17 00:00:00 2001
From: AsciiWolf <mail@asciiwolf.com>
Date: Sun, 4 Aug 2024 22:54:44 +0200
Subject: [PATCH] Modernize the AppStream metadata

- Add missing name and summary tags
- Switch to a rDNS app id format that is now required
- Various fixes to make the file adhere to modern standards
---
 src/Makefile                                  |  1 +
 ...net.redeclipse.RedEclipse.metainfo.xml.am} | 42 ++++++-------------
 src/system-install.mk                         | 11 +++--
 3 files changed, 20 insertions(+), 34 deletions(-)
 rename src/install/nix/{redeclipse.appdata.xml.am => net.redeclipse.RedEclipse.metainfo.xml.am} (52%)

diff --git a/src/Makefile b/src/Makefile
index 8015ef96e..5987165bf 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,5 @@
 APPNAME = redeclipse
+APPIDNAME = net.redeclipse.RedEclipse
 APPCLIENT = $(APPNAME)
 APPSERVER = $(APPNAME)_server
 
diff --git a/src/install/nix/redeclipse.appdata.xml.am b/src/install/nix/net.redeclipse.RedEclipse.metainfo.xml.am
similarity index 52%
rename from src/install/nix/redeclipse.appdata.xml.am
rename to src/install/nix/net.redeclipse.RedEclipse.metainfo.xml.am
index 135a91282..d58991ad6 100644
--- a/src/install/nix/redeclipse.appdata.xml.am
+++ b/src/install/nix/net.redeclipse.RedEclipse.metainfo.xml.am
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>@APPNAME@.desktop</id>
+<component type="desktop-application">
+  <id>@APPIDNAME@</id>
+  <launchable type="desktop-id">@APPNAME@.desktop</launchable>
+  <provides>
+    <binary>@APPNAME@</binary>
+  </provides>
   <metadata_license>CC-BY-SA-3.0+</metadata_license>
   <project_license>Zlib and CC-BY-SA-3.0+</project_license>
+  <name>Red Eclipse</name>
+  <developer_name>Red Eclipse Team</developer_name>
+  <summary>First-person shooter with agile gameplay and built-in editor</summary>
   <description>
     <p>
       Red Eclipse is a fun-filled new take on the first person arena shooter,
@@ -18,6 +25,9 @@
     </ul>
   </description>
   <url type="homepage">https://redeclipse.net/</url>
+  <url type="bugtracker">https://github.com/redeclipse/base/issues</url>
+  <url type="donation">https://redeclipse.net/donate</url>
+  <url type="help">https://redeclipse.net/faq</url>
   <screenshots>
     <screenshot type="default">
       <image>https://redeclipse.net/bits/images/053.jpg</image>
@@ -34,36 +44,8 @@
   </screenshots>
   <update_contact>https://redeclipse.net/forum/</update_contact>
   <content_rating type="oars-1.1">
-    <content_attribute id="violence-cartoon">none</content_attribute>
     <content_attribute id="violence-fantasy">moderate</content_attribute>
-    <content_attribute id="violence-realistic">none</content_attribute>
     <content_attribute id="violence-bloodshed">mild</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">intense</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>
-  <developer_name>Red Eclipse Team</developer_name>
-  <url type="bugtracker">https://github.com/redeclipse/base/issues</url>
-  <url type="donation">https://redeclipse.net/donate</url>
-  <url type="help">https://redeclipse.net/faq</url>
 </component>
diff --git a/src/system-install.mk b/src/system-install.mk
index ad2546de8..7248bfee0 100644
--- a/src/system-install.mk
+++ b/src/system-install.mk
@@ -1,6 +1,8 @@
 appname=$(APPNAME)
+appidname=$(APPIDNAME)
 appnamefull=$(shell sed -n 's/.define VERSION_NAME *"\([^"]*\)"/\1/p' version.h)
 appsrcname=$(APPNAME)
+appidsrcname=$(APPIDNAME)
 cappname=$(shell echo $(appname) | tr '[:lower:]' '[:upper:]')# Captial appname
 appclient=$(APPCLIENT)$(APPMODIFIER)$(BIN_SUFFIX)
 appserver=$(APPSERVER)$(APPMODIFIER)$(BIN_SUFFIX)
@@ -17,7 +19,7 @@ mandir=$(DESTDIR)$(prefix)/share/man
 menudir=$(DESTDIR)$(prefix)/share/applications
 icondir=$(DESTDIR)$(prefix)/share/icons/hicolor
 pixmapdir=$(DESTDIR)$(prefix)/share/pixmaps
-appdatadir=$(DESTDIR)$(prefix)/share/appdata
+appdatadir=$(DESTDIR)$(prefix)/share/metainfo
 
 ICONS= \
 	install/nix/$(appsrcname)_x16.png \
@@ -149,8 +151,9 @@ system-install-menus: icons
 		-e 's,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
 		-e 's,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
 		-e 's,@APPNAME@,$(appname),g' \
-		install/nix/$(appsrcname).appdata.xml.am > \
-		$(appdatadir)/$(appname).appdata.xml
+		-e 's,@APPIDNAME@,$(appidname),g' \
+		install/nix/$(appidsrcname).metainfo.xml.am > \
+		$(appdatadir)/$(appidname).metainfo.xml
 	install -m644 install/nix/$(appsrcname)_x16.png \
 		$(icondir)/16x16/apps/$(appname).png
 	install -m644 install/nix/$(appsrcname)_x32.png \
@@ -201,7 +204,7 @@ system-uninstall-docs:
 
 system-uninstall-menus:
 	@rm -fv $(menudir)/$(appname).desktop
-	@rm -fv $(appdatadir)/$(appname).appdata.xml
+	@rm -fv $(appdatadir)/$(appidname).metainfo.xml
 	@rm -fv $(icondir)/16x16/apps/$(appname).png
 	@rm -fv $(icondir)/32x32/apps/$(appname).png
 	@rm -fv $(icondir)/48x48/apps/$(appname).png