From 9ca616e89c07be188d71b8138bf6ced299b84b6d Mon Sep 17 00:00:00 2001
From: arch1t3cht <arch1t3cht@gmail.com>
Date: Mon, 23 Dec 2024 22:04:27 +0100
Subject: [PATCH] Use rDNS name in metainfo and desktop file

---
 packages/desktop/aegisub.desktop.in.in      |  2 +-
 packages/desktop/aegisub.metainfo.xml.in.in | 10 +++++-----
 packages/meson.build                        |  9 +++++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/desktop/aegisub.desktop.in.in b/packages/desktop/aegisub.desktop.in.in
index 40b017635e..e9590e1098 100644
--- a/packages/desktop/aegisub.desktop.in.in
+++ b/packages/desktop/aegisub.desktop.in.in
@@ -6,7 +6,7 @@ GenericName=Subtitle Editor
 Comment=Create and edit subtitles for film and videos.
 Exec=@AEGISUB_COMMAND@ %f
 TryExec=@AEGISUB_COMMAND@
-Icon=aegisub
+Icon=@AEGISUB_RDNS_NAME@
 Terminal=false
 Categories=AudioVideo;AudioVideoEditing;GTK;
 Keywords=subtitles;subtitle;captions;captioning;video;audio;
diff --git a/packages/desktop/aegisub.metainfo.xml.in.in b/packages/desktop/aegisub.metainfo.xml.in.in
index fc7f87c70b..db80edb8be 100644
--- a/packages/desktop/aegisub.metainfo.xml.in.in
+++ b/packages/desktop/aegisub.metainfo.xml.in.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>aegisub.desktop</id>
+  <id>@AEGISUB_RDNS_NAME@</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>BSD-3-Clause AND MIT AND MPL-1.1</project_license>
   <name>Aegisub</name>
@@ -19,9 +19,7 @@
       <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">@AEGISUB_RDNS_NAME@.desktop</launchable>
   <kudos>
     <kudo>HiDpiIcon</kudo>
     <kudo>HighContrast</kudo>
@@ -41,7 +39,9 @@
       <image>https://aegisub.org/img/screenshots/unix/audio-timing.png</image>
     </screenshot>
   </screenshots>
-  <developer_name>Aegisub Group</developer_name>
+  <developer id="@AEGISUB_RDNS_DEVELOPER@">
+    <name>Aegisub Group</name>
+  </developer>
   <url type="bugtracker">https://github.com/TypesettingTools/Aegisub/issues</url>
   <url type="faq">https://aegisub.org/docs/latest/faq</url>
   <url type="help">https://aegisub.org/docs/latest/main_page</url>
diff --git a/packages/meson.build b/packages/meson.build
index f3e1f19009..49de536885 100644
--- a/packages/meson.build
+++ b/packages/meson.build
@@ -22,7 +22,11 @@ elif host_machine.system() == 'darwin'
     run_target('osx-build-dmg',
                command: [build_dmg_sh, meson.project_source_root(), meson.project_build_root(), meson.project_version()])
 else
+    aegisub_rdns_developer = 'org.aegisub'
+    aegisub_rdns_name = aegisub_rdns_developer + '.Aegisub'
     conf_pkg.set('AEGISUB_COMMAND', 'aegisub')
+    conf_pkg.set('AEGISUB_RDNS_DEVELOPER', aegisub_rdns_developer)
+    conf_pkg.set('AEGISUB_RDNS_NAME', aegisub_rdns_name)
 
     desktop_template = configure_file(input: 'desktop/aegisub.desktop.in.in',
                                       output: 'aegisub.desktop.in',
@@ -30,7 +34,7 @@ else
 
     i18n = import('i18n')
     i18n.merge_file(input: desktop_template,
-                    output: 'aegisub.desktop',
+                    output: aegisub_rdns_name + '.desktop',
                     type: 'desktop',
                     po_dir: '../po',
                     install: true,
@@ -40,7 +44,7 @@ else
                                       output: 'aegisub.metainfo.xml.in',
                                       configuration: conf_pkg)
 	i18n.merge_file(input: metainfo_template,
-                    output: 'aegisub.metainfo.xml',
+                    output: aegisub_rdns_name + '.metainfo.xml',
                     type: 'xml',
                     po_dir: '../po',
                     install: true,
@@ -52,6 +56,7 @@ else
         dir = s.split('.')[0]
         ext = s.split('.')[1]
         install_data('desktop' / dir / 'aegisub.' + ext,
+                     rename: aegisub_rdns_name + '.' + ext,
                      install_dir: datadir / 'icons' / 'hicolor' / dir / 'apps')
     endforeach
 endif