Merge pull request #1180 from Zer0xFF/flatpak

prepare desktop for flatpak

.github/workflows/build-linux.yaml

@@ -47,6 +47,12 @@ jobs:
       id: short_hash
       env:
         LONG_HASH: ${{ github.sha }}
+    - name: Prepare states DB
+      run: |
+        pip3 install requests
+        python3 .github/CI_MISC/build_compatibility_db.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Generate CMake Project
       run: |
         mkdir build
@@ -63,14 +69,6 @@ jobs:
       run: |
         cd build
         ctest -C Release
-    - name: Prepare states DB
-      run: |
-        pip3 install requests
-        python3 .github/CI_MISC/build_compatibility_db.py
-        mkdir -p build/appdir/usr/share
-        cp states.db build/appdir/usr/share/
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Prepare AppImage Package
       run: |
         cd build

Source/ui_qt/CMakeLists.txt

@@ -313,17 +313,25 @@ elseif(TARGET_PLATFORM_UNIX)
 		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
 		RENAME Play
 	)
-	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../icons/icon_base.png
-		DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/1024x1024/apps
-		RENAME Play.png
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../icons/icon_base_512x512.png
+		DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps
+		RENAME org.purei.Play.png
 	)
 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../icons/icon.svg
 		DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps
-		RENAME Play.svg
+		RENAME org.purei.Play.svg
 	)
 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../installer_unix/Play.desktop
 		DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
+		RENAME org.purei.Play.desktop
 	)
+	if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../states.db")
+		install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../states.db
+			DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/
+		)
+	else()
+		message(WARNING "didn't find states.db")
+	endif()
 else()
 	add_executable(Play ${QT_SOURCES} ${QT_MOC_SRCS} ${QT_RES_SOURCES} ${QT_UI_HEADERS})
 endif()

deps/Framework

@@ -1 +1 @@
-Subproject commit a374ceea3694aeeef980a17a5e057f05dc5f9767
+Subproject commit 9bf3cc6c0b6617522e728a83ef455ebb9734d00c

installer_unix/Play.desktop

@@ -2,7 +2,7 @@
 Name=Play!
 TryExec=Play
 Exec=Play
-Icon=Play
+Icon=org.purei.Play
 Version=1.0
 Terminal=false
 Type=Application