Another various changes required by Flatpak

This commit is contained in:
shenleban tongying 2023-07-24 06:01:32 -04:00
parent 6f0050f792
commit 53d82f97ca
No known key found for this signature in database
6 changed files with 16 additions and 6 deletions

View file

@ -109,7 +109,7 @@ jobs:
chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-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 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 - name: changelog
id: changelog id: changelog

View file

@ -93,7 +93,7 @@ jobs:
chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-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 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 - name: changelog
id: changelog id: changelog

View file

@ -191,7 +191,7 @@ if (APPLE)
endif () endif ()
if (LINUX OR BSD) 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/io.github.xiayifang.goldendict_ng.metainfo.xml DESTINATION share/metainfo)
install(FILES ${CMAKE_SOURCE_DIR}/redist/icons/goldendict.png DESTINATION share/pixmaps) install(FILES ${CMAKE_SOURCE_DIR}/redist/icons/goldendict.png DESTINATION share/pixmaps)

View file

@ -5,7 +5,12 @@
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license> <project_license>GPL-3.0-or-later</project_license>
<name>GoldenDict-NG</name> <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> <description>
<p> <p>
GoldenDict-ng is a feature-rich dictionary lookup program, supporting multiple GoldenDict-ng is a feature-rich dictionary lookup program, supporting multiple
@ -26,8 +31,12 @@
</screenshot> </screenshot>
</screenshots> </screenshots>
<url type="homepage">https://xiaoyifang.github.io/goldendict-ng/</url> <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> <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"/> <content_rating type="oars-1.0"/>
<provides> <provides>
<id>org.goldendict_ng.desktop</id> <id>org.goldendict_ng.desktop</id>

View file

@ -3088,7 +3088,8 @@ void MainWindow::setAutostart( bool autostart )
if ( autostart == QFile::exists( destinationPath ) ) if ( autostart == QFile::exists( destinationPath ) )
return; // Nothing to do. return; // Nothing to do.
if ( autostart ) { 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 ); QFile::copy( sourcePath, destinationPath );
} }
else else