From 53d82f97cab68bf445193e87ca64e4238d9e109d Mon Sep 17 00:00:00 2001
From: shenleban tongying <shenlebantongying@gmail.com>
Date: Mon, 24 Jul 2023 06:01:32 -0400
Subject: [PATCH] Another various changes required by Flatpak

---
 .github/workflows/ubuntu-6.2.yml                    |  2 +-
 .github/workflows/ubuntu.yml                        |  2 +-
 CMakeLists.txt                                      |  2 +-
 ...op => io.github.xiayifang.goldendict_ng.desktop} |  0
 .../io.github.xiayifang.goldendict_ng.metainfo.xml  | 13 +++++++++++--
 src/ui/mainwindow.cc                                |  3 ++-
 6 files changed, 16 insertions(+), 6 deletions(-)
 rename redist/{org.xiaoyifang.GoldenDict_NG.desktop => io.github.xiayifang.goldendict_ng.desktop} (100%)

diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml
index 794f3537..71f881f8 100644
--- a/.github/workflows/ubuntu-6.2.yml
+++ b/.github/workflows/ubuntu-6.2.yml
@@ -109,7 +109,7 @@ jobs:
           chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
           wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
           chmod a+x linuxdeploy-x86_64.AppImage
-          ./linuxdeploy-x86_64.AppImage --appdir appdir --output appimage --plugin qt  -i redist/icons/goldendict.png -d redist/org.xiaoyifang.GoldenDict_NG.desktop
+          ./linuxdeploy-x86_64.AppImage --appdir appdir --output appimage --plugin qt  -i redist/icons/goldendict.png -d redist/io.github.xiayifang.goldendict_ng.desktop
 
       - name: changelog
         id: changelog
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index c41adae3..d7bfb13e 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -93,7 +93,7 @@ jobs:
           chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
           wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
           chmod a+x linuxdeploy-x86_64.AppImage
-          ./linuxdeploy-x86_64.AppImage --appdir appdir --output appimage --plugin qt  -i redist/icons/goldendict.png -d redist/org.xiaoyifang.GoldenDict_NG.desktop 
+          ./linuxdeploy-x86_64.AppImage --appdir appdir --output appimage --plugin qt  -i redist/icons/goldendict.png -d redist/io.github.xiayifang.goldendict_ng.desktop 
 
       - name: changelog
         id: changelog
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad6616ea..d49dd48e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,7 +191,7 @@ if (APPLE)
 endif ()
 
 if (LINUX OR BSD)
-    install(FILES ${CMAKE_SOURCE_DIR}/redist/org.xiaoyifang.GoldenDict_NG.desktop DESTINATION share/applications)
+    install(FILES ${CMAKE_SOURCE_DIR}/redist/io.github.xiayifang.goldendict_ng.desktop DESTINATION share/applications)
     install(FILES ${CMAKE_SOURCE_DIR}/redist/io.github.xiayifang.goldendict_ng.metainfo.xml DESTINATION share/metainfo)
 
     install(FILES ${CMAKE_SOURCE_DIR}/redist/icons/goldendict.png DESTINATION share/pixmaps)
diff --git a/redist/org.xiaoyifang.GoldenDict_NG.desktop b/redist/io.github.xiayifang.goldendict_ng.desktop
similarity index 100%
rename from redist/org.xiaoyifang.GoldenDict_NG.desktop
rename to redist/io.github.xiayifang.goldendict_ng.desktop
diff --git a/redist/io.github.xiayifang.goldendict_ng.metainfo.xml b/redist/io.github.xiayifang.goldendict_ng.metainfo.xml
index ba2f0486..487fef05 100644
--- a/redist/io.github.xiayifang.goldendict_ng.metainfo.xml
+++ b/redist/io.github.xiayifang.goldendict_ng.metainfo.xml
@@ -5,7 +5,12 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
   <name>GoldenDict-NG</name>
-  <summary>Dictionary lookup program</summary>
+  <summary>Advanced dictionary lookup program</summary>
+  <categories>
+    <category>Education</category>
+    <category>Dictionary</category>
+    <category>Languages</category>
+  </categories>
   <description>
     <p>
       GoldenDict-ng is a feature-rich dictionary lookup program, supporting multiple
@@ -26,8 +31,12 @@
     </screenshot>
   </screenshots>
   <url type="homepage">https://xiaoyifang.github.io/goldendict-ng/</url>
+  <url type="help">https://xiaoyifang.github.io/goldendict-ng/</url>
+  <url type="bugtracker">https://github.com/xiaoyifang/goldendict-ng/issues</url>
+  <url type="contact">https://github.com/xiaoyifang/goldendict-ng/discussions</url>
+  <url type="vcs-browser">https://github.com/xiaoyifang/goldendict-ng</url>
   <update_contact>https://github.com/xiaoyifang/goldendict-ng</update_contact>
-  <launchable type="desktop-id">org.xiaoyifang.GoldenDict_NG.desktop</launchable>
+  <launchable type="desktop-id">io.github.xiayifang.goldendict_ng.desktop</launchable>
   <content_rating type="oars-1.0"/>
   <provides>
     <id>org.goldendict_ng.desktop</id>
diff --git a/src/ui/mainwindow.cc b/src/ui/mainwindow.cc
index a6cbeed3..aa89e204 100644
--- a/src/ui/mainwindow.cc
+++ b/src/ui/mainwindow.cc
@@ -3088,7 +3088,8 @@ void MainWindow::setAutostart( bool autostart )
   if ( autostart == QFile::exists( destinationPath ) )
     return; // Nothing to do.
   if ( autostart ) {
-    const QString sourcePath = Config::getProgramDataDir() + "../applications/org.xiaoyifang.GoldenDict_NG.desktop";
+    const QString sourcePath =
+      Config::getProgramDataDir() + "../applications/io.github.xiayifang.goldendict_ng.desktop";
     QFile::copy( sourcePath, destinationPath );
   }
   else