From e52e89d3cb58072e9bec2bc7ad6a59ba67bf2de1 Mon Sep 17 00:00:00 2001
From: 0tkl <118708188+0tkl@users.noreply.github.com>
Date: Wed, 22 May 2024 23:25:59 +0800
Subject: [PATCH] Project ID change to rDNS scheme to comply with AppStream

---
 .github/workflows/ci.yml                   |  8 ++---
 packages/desktop/aegisub.appdata.xml.in.in | 34 +++++++++++++++++-----
 packages/meson.build                       |  6 ++--
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27f9f98d71..a5b525ca3e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -222,12 +222,12 @@ jobs:
           meson install -C build --destdir=../appimage/appdir
 
           cd appimage
-          sudo apt-get install libfuse2
-          curl -L "https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20220822-1/linuxdeploy-x86_64.AppImage" -o linuxdeploy
-          curl -L "https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage" -o appimagetool
+          sudo apt-get install appstream libfuse2
+          curl -L "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" -o linuxdeploy
+          curl -L "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" -o appimagetool
           chmod +x linuxdeploy appimagetool
 
-          ./linuxdeploy --appdir appdir --desktop-file=appdir/aegisub.desktop
+          ./linuxdeploy --appdir appdir --desktop-file=appdir/org.aegisub.aegisub.desktop
           ./appimagetool appdir
 
       - name: Upload artifacts - Linux AppImage
diff --git a/packages/desktop/aegisub.appdata.xml.in.in b/packages/desktop/aegisub.appdata.xml.in.in
index b802bcfbb6..494d34e8dc 100644
--- a/packages/desktop/aegisub.appdata.xml.in.in
+++ b/packages/desktop/aegisub.appdata.xml.in.in
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>aegisub.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>BSD-3-Clause AND MIT AND MPL-1.1</project_license>
+<component type="desktop-application">
+  <id>org.aegisub.aegisub</id>
+  
   <name>Aegisub</name>
   <summary>A free, cross-platform open source tool for creating and modifying subtitles</summary>
+  
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>BSD-3-Clause AND MIT AND MPL-1.1</project_license>
+  
   <description>
     <p>Aegisub is a free, cross-platform open source tool for creating and modifying subtitles. Aegisub makes it quick and easy to time subtitles to audio, and features many powerful tools for styling them, including a built-in real-time video preview.</p>
     <p>Aegisub was originally created as a tool to make typesetting, particularly in anime fansubs, a less painful experience. At the time of the start of the project, many other programs that supported the Advanced Substation Alpha format lacked (and in many cases, still lack; development on several competing programs have since been dropped for various reasons completely unrelated to Aegisub) many vital functions, or were too buggy and/or unreliable to be really useful.</p>
@@ -19,14 +22,15 @@
       <li>Fully scriptable through the Automation module</li>
     </ul>
   </description>
-  <!-- XXX: appstreamcli validation warning: cid-desktopapp-is-not-rdns
-       If improving this, the <id> and filename should probably also be changed.  -->
-  <launchable type="desktop-id">aegisub.desktop</launchable>
+  
+  <launchable type="desktop-id">org.aegisub.aegisub.desktop</launchable>
+
   <kudos>
     <kudo>HiDpiIcon</kudo>
     <kudo>HighContrast</kudo>
     <kudo>UserDocs</kudo>
   </kudos>
+
   <screenshots>
     <screenshot type="default">
       <caption>Typesetting</caption>
@@ -41,19 +45,33 @@
       <image>https://aegisub.org/img/screenshots/unix/audio-timing.png</image>
     </screenshot>
   </screenshots>
-  <developer_name>Aegisub Group</developer_name>
+
+  <developer id="org.aegisub">
+    <name>Aegisub Group</name>
+  </developer>
+
   <url type="bugtracker">https://github.com/Aegisub/Aegisub/issues</url>
   <url type="faq">https://aegisub.org/docs/latest/faq</url>
   <url type="help">https://aegisub.org/docs/latest</url>
   <url type="homepage">https://aegisub.org</url>
   <url type="translate">https://github.com/Aegisub/Aegisub</url>
+
   <content_rating type="oars-1.0">
     <content_attribute id="social-info">mild</content_attribute>
   </content_rating>
+  
   <translation type="gettext">aegisub</translation>
+
+  <categories>
+    <category>AudioVideo</category>
+    <category>AudioVideoEditing</category>
+    <category>GTK</category>
+  </categories>
+
   <provides>
     <binary>aegisub</binary>
   </provides>
+
   <releases>
     <!-- TODO: automatic replace at config time -->
     <release version="3.2.2" date="2014-12-08"/>
diff --git a/packages/meson.build b/packages/meson.build
index 98d22d483d..3bfa06c7a8 100644
--- a/packages/meson.build
+++ b/packages/meson.build
@@ -24,7 +24,7 @@ else
 
     i18n = import('i18n')
     i18n.merge_file(input: desktop_template,
-                    output: 'aegisub.desktop',
+                    output: 'org.aegisub.aegisub.desktop',
                     type: 'desktop',
                     po_dir: '../po',
                     install: true,
@@ -34,7 +34,7 @@ else
                                       output: 'aegisub.desktop.appdata.xml.in',
                                       configuration: conf_pkg)
 	i18n.merge_file(input: appdata_template,
-                    output: 'aegisub.appdata.xml',
+                    output: 'org.aegisub.aegisub.appdata.xml',
                     type: 'xml',
                     po_dir: '../po',
                     install: true,
@@ -52,6 +52,6 @@ else
     if get_option('build_appimage')
       install_symlink('AppRun', install_dir: '/', pointing_to: bindir.strip('/') / 'aegisub')
       install_symlink('.DirIcon', install_dir: '/', pointing_to: datadir.strip('/') / 'icons' / 'hicolor' / 'scalable' / 'apps' / 'aegisub.svg')
-      install_symlink('aegisub.desktop', install_dir: '/', pointing_to: datadir.strip('/') / 'applications' / 'aegisub.desktop')
+      install_symlink('org.aegisub.aegisub.desktop', install_dir: '/', pointing_to: datadir.strip('/') / 'applications' / 'org.aegisub.aegisub.desktop')
     endif
 endif