From 6663034343efe88628dc4ef8031bf973f132753c Mon Sep 17 00:00:00 2001
From: AsciiWolf <mail@asciiwolf.com>
Date: Mon, 30 Sep 2024 22:06:50 +0200
Subject: [PATCH] Rename AppStream metadata file to a rDNS format (#5137)

Also:
- Set the component type to desktop-application instead of a deprecated desktop one
- Update data/po/update_desktop_file_appdata.py + add the previously added launchable type there
---
 CMakeLists.txt                                    |  2 +-
 ...=> net.supertuxkart.SuperTuxKart.metainfo.xml} |  4 ++--
 data/po/update_desktop_file_appdata.py            | 15 ++++++++-------
 3 files changed, 11 insertions(+), 10 deletions(-)
 rename data/{supertuxkart.appdata.xml => net.supertuxkart.SuperTuxKart.metainfo.xml} (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 470b0f4aeac..b878b4678d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -910,7 +910,7 @@ install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128/
 install(FILES data/supertuxkart_256.png DESTINATION share/icons/hicolor/256x256/apps RENAME supertuxkart.png)
 install(FILES data/supertuxkart_512.png DESTINATION share/icons/hicolor/512x512/apps RENAME supertuxkart.png)
 install(FILES data/supertuxkart_1024.png DESTINATION share/icons/hicolor/1024x1024/apps RENAME supertuxkart.png)
-install(FILES data/supertuxkart.appdata.xml DESTINATION share/metainfo)
+install(FILES data/net.supertuxkart.SuperTuxKart.metainfo.xml DESTINATION share/metainfo)
 
 if(MINGW)
     install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/ DESTINATION ${STK_INSTALL_BINARY_DIR}
diff --git a/data/supertuxkart.appdata.xml b/data/net.supertuxkart.SuperTuxKart.metainfo.xml
similarity index 99%
rename from data/supertuxkart.appdata.xml
rename to data/net.supertuxkart.SuperTuxKart.metainfo.xml
index c3393a97262..9cc0f298695 100644
--- a/data/supertuxkart.appdata.xml
+++ b/data/net.supertuxkart.SuperTuxKart.metainfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>supertuxkart.desktop</id>
+<component type="desktop-application">
+  <id>net.supertuxkart.SuperTuxKart</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <launchable type="desktop-id">supertuxkart.desktop</launchable>
diff --git a/data/po/update_desktop_file_appdata.py b/data/po/update_desktop_file_appdata.py
index eca514cc60b..d5619098bc9 100755
--- a/data/po/update_desktop_file_appdata.py
+++ b/data/po/update_desktop_file_appdata.py
@@ -66,10 +66,11 @@ def traslate_po(po, translation):
 STK_STABLE_URL = 'https://play.google.com/store/apps/details?id=org.supertuxkart.stk'
 
 STK_APPDATA_FILE_1 = """<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<component type=\"desktop\">
-  <id>supertuxkart.desktop</id>
+<component type=\"desktop-application\">
+  <id>net.supertuxkart.SuperTuxKart</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
+  <launchable type="desktop-id">supertuxkart.desktop</launchable>
 """
 # Split it to avoid SuperTuxKart being translated
 STK_APPDATA_FILE_2 = """  <name>SuperTuxKart</name>
@@ -156,14 +157,14 @@ def traslate_po(po, translation):
 </component>
 """
 
-appdata_file = open('supertuxkart.appdata.xml', 'w')
+appdata_file = open('net.supertuxkart.SuperTuxKart.metainfo.xml', 'w')
 appdata_file.write(STK_APPDATA_FILE_1 + STK_APPDATA_FILE_3 + STK_APPDATA_FILE_4 \
 + STK_APPDATA_FILE_5 + STK_APPDATA_FILE_6)
 appdata_file.close()
 
 os.system('xgettext -j -d supertuxkart --add-comments=\"I18N:\" \
                     -p ./data/po -o supertuxkart.pot \
-                    --package-name=supertuxkart supertuxkart.desktop supertuxkart.appdata.xml')
+                    --package-name=supertuxkart supertuxkart.desktop net.supertuxkart.SuperTuxKart.metainfo.xml')
 
 desktop_file = open('supertuxkart.desktop', 'w')
 desktop_file.write(STK_DESKTOP_FILE_P1 + STK_DESKTOP_FILE_P2 + STK_DESKTOP_FILE_P3)
@@ -234,13 +235,13 @@ def traslate_po(po, translation):
 
 lingas.close()
 appdata += STK_APPDATA_FILE_6
-appdata_file = open('supertuxkart.appdata.xml', 'w')
+appdata_file = open('net.supertuxkart.SuperTuxKart.metainfo.xml', 'w')
 appdata_file.write(appdata)
 appdata_file.close()
 
 os.system('msgfmt --desktop -d data/po --template supertuxkart.desktop -o data/supertuxkart.desktop')
-os.system('msgfmt --xml -d data/po --template supertuxkart.appdata.xml -o data/supertuxkart.appdata.xml')
+os.system('msgfmt --xml -d data/po --template net.supertuxkart.SuperTuxKart.metainfo.xml -o data/net.supertuxkart.SuperTuxKart.metainfo.xml')
 os.remove('./supertuxkart.desktop')
-os.remove('./supertuxkart.appdata.xml')
+os.remove('./net.supertuxkart.SuperTuxKart.metainfo.xml')
 os.remove('./data/po/LINGUAS')
 os.remove('./data/po/zh_HK.po')