From 98ee331a38ca84ede8c4a3dcc2521f8263f2cdc3 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

Vender name should be modified when this commit
is cherry-picked into other forks.
---
 .github/workflows/ci.yml                   | 2 +-
 packages/desktop/aegisub.appdata.xml.in.in | 9 ++++-----
 packages/meson.build                       | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 13174ee25e..6ee37ef6b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -227,7 +227,7 @@ jobs:
           curl -L "https://github.com/AppImage/appimagetool/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.arch1t3cht.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 86c39c0b3d..34f13bd800 100644
--- a/packages/desktop/aegisub.appdata.xml.in.in
+++ b/packages/desktop/aegisub.appdata.xml.in.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>aegisub.desktop</id>
+  <id>org.arch1t3cht.aegisub</id>
 
   <name>Aegisub</name>
   <summary>A free, cross-platform open source tool for creating and modifying subtitles</summary>
@@ -22,9 +22,8 @@
       <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.arch1t3cht.aegisub.desktop</launchable>
 
   <kudos>
     <kudo>HiDpiIcon</kudo>
@@ -47,7 +46,7 @@
     </screenshot>
   </screenshots>
 
-  <developer id="org.aegisub">
+  <developer id="org.arch1t3cht">
     <name>Aegisub Group</name>
   </developer>
 
diff --git a/packages/meson.build b/packages/meson.build
index 98d22d483d..107e03ebf7 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.arch1t3cht.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.arch1t3cht.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.arch1t3cht.aegisub.desktop', install_dir: '/', pointing_to: datadir.strip('/') / 'applications' / 'org.arch1t3cht.aegisub.desktop')
     endif
 endif