From 60d985424055595c2a7629d3652f1558b572836f Mon Sep 17 00:00:00 2001
From: shenleban tongying <shenlebantongying@gmail.com>
Date: Mon, 24 Jul 2023 04:05:46 -0400
Subject: [PATCH] Various changes required by Flatpak packaging

---
 CMakeLists.txt                                 |  2 +-
 ...ithub.xiayifang.goldendict_ng.metainfo.xml} | 18 +++++++++++-------
 redist/org.xiaoyifang.GoldenDict_NG.desktop    |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)
 rename redist/{org.xiaoyifang.GoldenDict_NG.metainfo.xml => io.github.xiayifang.goldendict_ng.metainfo.xml} (65%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50939bdb..ad6616ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ 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/org.xiaoyifang.GoldenDict_NG.metainfo.xml DESTINATION share/metainfo)
+    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.metainfo.xml b/redist/io.github.xiayifang.goldendict_ng.metainfo.xml
similarity index 65%
rename from redist/org.xiaoyifang.GoldenDict_NG.metainfo.xml
rename to redist/io.github.xiayifang.goldendict_ng.metainfo.xml
index 2179725f..ba2f0486 100644
--- a/redist/org.xiaoyifang.GoldenDict_NG.metainfo.xml
+++ b/redist/io.github.xiayifang.goldendict_ng.metainfo.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2019 Vitaly Zaitsev <vitaly@easycoding.org> -->
 <component type="desktop">
-  <id>org.xiaoyifang.GoldenDict_NG</id>
+  <id>io.github.xiayifang.goldendict_ng</id>
   <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>
   <description>
     <p>
-        GoldenDict-NG is a feature-rich dictionary lookup program, supporting multiple
-        dictionary formats, featuring perfect article rendering with the complete
-        markup, illustrations and other content retained, and allowing you to type
-        in words without any accents or correct case.
+      GoldenDict-ng is a feature-rich dictionary lookup program, supporting multiple
+      dictionary formats, featuring perfect article rendering with the complete
+      markup, illustrations and other content retained, and allowing you to type
+      in words without any accents or correct case.
     </p>
   </description>
   <screenshots>
@@ -25,11 +25,15 @@
       <image>https://user-images.githubusercontent.com/20123683/239691144-5145f844-ed88-4a24-ac86-4904ede13a32.png</image>
     </screenshot>
   </screenshots>
-  <url type="homepage">https://github.com/xiaoyifang/goldendict-ng</url>
+  <url type="homepage">https://xiaoyifang.github.io/goldendict-ng/</url>
   <update_contact>https://github.com/xiaoyifang/goldendict-ng</update_contact>
   <launchable type="desktop-id">org.xiaoyifang.GoldenDict_NG.desktop</launchable>
-  <content_rating type="oars-1.0" />
+  <content_rating type="oars-1.0"/>
   <provides>
     <id>org.goldendict_ng.desktop</id>
   </provides>
+  <releases>
+    <release version="23.07.23" date="2023-07-23"/>
+    <release version="23.06.01" date="2023-06-01"/>
+  </releases>
 </component>
diff --git a/redist/org.xiaoyifang.GoldenDict_NG.desktop b/redist/org.xiaoyifang.GoldenDict_NG.desktop
index 4f350e4c..126dcd8d 100755
--- a/redist/org.xiaoyifang.GoldenDict_NG.desktop
+++ b/redist/org.xiaoyifang.GoldenDict_NG.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Terminal=false
 Categories=Office;Dictionary;Education;Qt;
-Name=GoldenDict-NG
+Name=GoldenDict-ng
 GenericName=Multiformat Dictionary
 GenericName[zh_CN]=多格式字典
 Comment=A feature-rich dictionary lookup program