redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-06-07 14:37:45 +00:00
Code Activity

Restore Flatpak support, add more scripts to help maintain it

Browse source
This commit is contained in:
Joshua Goins 2024-05-26 09:44:38 -04:00
parent e94483af2a
commit 3522b688bb
5 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/libphysis vendored

@ -1 +1 @@
Subproject commit 1b8a8dddcafe31799dfb5597ab41cc32ac3ec7a3
Subproject commit fa293af316573b5f2bf89c16c0307176d4783c09

15
launcher/CMakeLists.txt
View file

@ -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})
# 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()

6
launcher/src/launchercore.cpp
View file

@ -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()

4
scripts/build-flatpak-for-repo.sh Executable file
View file

@ -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

3
scripts/copy-repo-to-server.sh Executable file
View file

@ -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