diff --git a/external/libphysis b/external/libphysis index 1b8a8dd..fa293af 160000 --- a/external/libphysis +++ b/external/libphysis @@ -1 +1 @@ -Subproject commit 1b8a8dddcafe31799dfb5597ab41cc32ac3ec7a3 +Subproject commit fa293af316573b5f2bf89c16c0307176d4783c09 diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index a49f226..f76cb3b 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -195,9 +195,12 @@ ecm_add_app_icon(astra qt_finalize_target(astra) -qt_generate_deploy_qml_app_script( - TARGET astra - OUTPUT_SCRIPT deploy_script - NO_UNSUPPORTED_PLATFORM_ERROR -) -install(SCRIPT ${deploy_script}) \ No newline at end of file +# the current tooling completely breaks in Flatpak, and is unnecessary there anyway +if (NOT BUILD_FLATPAK) + qt_generate_deploy_qml_app_script( + TARGET astra + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR + ) + install(SCRIPT ${deploy_script}) +endif() \ No newline at end of file diff --git a/launcher/src/launchercore.cpp b/launcher/src/launchercore.cpp index 6c4f274..1029f14 100755 --- a/launcher/src/launchercore.cpp +++ b/launcher/src/launchercore.cpp @@ -295,11 +295,7 @@ bool LauncherCore::isSteam() const bool LauncherCore::isSteamDeck() const { - if (m_steamApi != nullptr) { - return m_steamApi->isDeck() || qEnvironmentVariable("SteamDeck") == QStringLiteral("1"); - } else { - return false; - } + return qEnvironmentVariable("SteamDeck") == QStringLiteral("1"); } bool LauncherCore::isWindows() diff --git a/scripts/build-flatpak-for-repo.sh b/scripts/build-flatpak-for-repo.sh new file mode 100755 index 0000000..afade39 --- /dev/null +++ b/scripts/build-flatpak-for-repo.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo && +flatpak-builder build --user --force-clean --install-deps-from=flathub zone.xiv.astra.yml --gpg-sign=0xD28B9141A3B3A73A --repo=/home/josh/sources/flatpak-distrib diff --git a/scripts/copy-repo-to-server.sh b/scripts/copy-repo-to-server.sh new file mode 100755 index 0000000..abbdaca --- /dev/null +++ b/scripts/copy-repo-to-server.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +rsync -e "ssh -p 38901 -o StrictHostKeyChecking=no" --recursive /home/josh/sources/flatpak-distrib/ ryne.moe:/srv/http/astra-distrib/flatpak