install items in Flatpak Name for flatpak Packages

sithlord48 · Mar 1, 2023 · e98df64 · e98df64
1 parent 38d8d65
commit e98df64
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -167,7 +167,7 @@ jobs:
         cp ${{matrix.config.ff7tkPrefix}}/share/ff7tk/translations/*.qm ./appdir/usr/share/ff7tk/translations
         ./linuxdeploy-x86_64.AppImage --appdir=appdir  --output appimage \
           -e src/blackchocobo \
-          -d deploy/org.sithlord48.blackchocobo.desktop \
+          -d deploy/io.github.sithlord48.blackchocobo.desktop \
           -i deploy/blackchocobo.png \
           --plugin=qt
 

diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt
@@ -1,8 +1,8 @@
 if(UNIX AND NOT APPLE)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/blackchocobo.png DESTINATION share/pixmaps/)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.sithlord48.blackchocobo.desktop DESTINATION share/applications/)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/blackchocobo.xml DESTINATION share/mime/packages/)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/blackchocobo.appdata.xml DESTINATION share/metainfo/)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/blackchocobo.png DESTINATION share/icons/hicolor/512x512/apps/ RENAME io.github.sithlord48.blackchocobo.png)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/io.github.sithlord48.blackchocobo.desktop DESTINATION share/applications/)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/io.github.sithlord48.blackchocobo.xml DESTINATION share/mime/packages/)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/io.github.sithlord48.blackchocobo.metadata.xml DESTINATION share/metainfo/)
 elseif(WIN32)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blackchocobo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/blackchocobo.rc @ONLY)
 endif()

diff --git a/deploy/org.sithlord48.blackchocobo.desktop → ...io.github.sithlord48.blackchocobo.desktop b/deploy/org.sithlord48.blackchocobo.desktop → ...io.github.sithlord48.blackchocobo.desktop
@@ -9,7 +9,7 @@ GenericName[fr]=Éditeur de sauvegardes FF7
 GenericName[it]=FF7 Salva l'editor di gioco
 GenericName[ja]=FF7 ゲームエディタを保存
 GenericName[pl]=FF7 Edytor zapisu gry
-Icon=blackchocobo
+Icon=io.github.sithlord48.blackchocobo
 MimeType=application/x-ff7PCSave;application/x-ff7SwitchSave;
 Name=Black Chocobo
 Name[de]=Schwarzer Chocobo

diff --git a/deploy/blackchocobo.appdata.xml → ...thub.sithlord48.blackchocobo.metadata.xml b/deploy/blackchocobo.appdata.xml → ...thub.sithlord48.blackchocobo.metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-	<id>org.sithlord48.blackchocobo</id>
+	<id>io.github.sithlord48.blackchocobo</id>
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>GPL-3.0+</project_license>
 	<name>Black Chocobo</name>
@@ -14,7 +14,7 @@
 			Supports PC (98 + Steam), Emulators, PS3, PSP/ PsVita and Switch versions.
 		</p>
 	</description>
-	<launchable type="desktop-id">blackchocobo.desktop</launchable>
+	<launchable type="desktop-id">io.github.sithlord48.blackchocobo.desktop</launchable>
 	<url type="homepage">https://github.com/sithlord48/blackchocobo</url>
 	<url type="bugtracker">https://github.com/sithlord48/blackchocobo/issues</url>
 	<url type="donation">http://sourceforge.net/p/blackchocobo/donate/</url>
@@ -24,6 +24,6 @@
 		</screenshot>
 	</screenshots>
 	<provides>
-		<id>org.sithlord48.blackchocobo.desktop</id>
+		<id>io.github.sithlord48.blackchocobo.desktop</id>
 	</provides>
 </component>
diff --git a/deploy/blackchocobo.xml → deploy/io.github.sithlord48.blackchocobo.xml b/deploy/blackchocobo.xml → deploy/io.github.sithlord48.blackchocobo.xml
@@ -2,12 +2,12 @@
   <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
     <mime-type type="application/x-ff7PCSave">
       <comment>FF7 PC Save File</comment>
-      <icon name="/usr/share/pixmaps/blackchocobo.png"/>
+      <icon name="io.github.sithlord48.blackchocobo"/>
       <glob pattern="*.ff7"/>
     </mime-type>
     <mime-type type="application/x-ff7SwitchSave">
       <comment>FF7 Switch Save File</comment>
-      <icon name="/usr/share/pixmaps/blackchocobo.png"/>
+      <icon name="io.github.sithlord48.blackchocobo"/>
       <glob pattern="ff7slot*"/>
     </mime-type>
 </mime-info>