diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 684e1521d529..413bb029bf5e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -219,6 +219,7 @@ jobs: libpng-dev \ qt6-base-private-dev \ libqt6svg6-dev \ + qt6-xdgdesktopportal-platformtheme \ libxxf86vm-dev \ x11proto-xinerama-dev \ libfuse2 diff --git a/Data/linux-env.sh b/Data/linux-env.sh index b5aff092a2ab..5a1c3c3cbf43 100644 --- a/Data/linux-env.sh +++ b/Data/linux-env.sh @@ -4,6 +4,12 @@ # Add /usr/lib/ to LD_LIBRARY_PATH cause Ubuntu is dumb export LD_LIBRARY_PATH="/usr/lib/:$LD_LIBRARY_PATH" +if dbus-send --session --print-reply --dest=org.freedesktop.portal.Desktop /org/freedesktop/portal/Desktop org.freedesktop.DBus.Peer.Ping > /dev/null 2>&1; then + # If we have a portal avilable, use the xdgdesktopportal + # platform theme to get native dialogs + export QT_QPA_PLATFORMTHEME=xdgdesktopportal +fi + if [[ $(env | grep -i wayland) ]]; then # wxWidgets 3.14 is GTK3, which seemingly has an issue or two when # running under Wayland. Explicitly setting this for Slippi avoids diff --git a/Tools/appimageupdatetool b/Tools/appimageupdatetool new file mode 100755 index 000000000000..7122b1918406 Binary files /dev/null and b/Tools/appimageupdatetool differ diff --git a/Tools/linuxdeploy b/Tools/linuxdeploy new file mode 100755 index 000000000000..082a948243fb Binary files /dev/null and b/Tools/linuxdeploy differ diff --git a/Tools/linuxdeploy-plugin-qt-x86_64.AppImage b/Tools/linuxdeploy-plugin-qt-x86_64.AppImage new file mode 100755 index 000000000000..7aa71107acce Binary files /dev/null and b/Tools/linuxdeploy-plugin-qt-x86_64.AppImage differ diff --git a/Tools/linuxdeploy-update-plugin b/Tools/linuxdeploy-update-plugin new file mode 100755 index 000000000000..8d3af6da9f16 Binary files /dev/null and b/Tools/linuxdeploy-update-plugin differ diff --git a/build-appimage.sh b/build-appimage.sh index decf046982bb..5c8562906ee7 100755 --- a/build-appimage.sh +++ b/build-appimage.sh @@ -8,7 +8,7 @@ LINUXDEPLOY_PATH="https://github.com/linuxdeploy/linuxdeploy/releases/download/c LINUXDEPLOY_FILE="linuxdeploy-x86_64.AppImage" LINUXDEPLOY_URL="${LINUXDEPLOY_PATH}/${LINUXDEPLOY_FILE}" -LINUXDEPLOY_QT_PLUGIN_PATH="https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/1-alpha-20240109-1" +LINUXDEPLOY_QT_PLUGIN_PATH="https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous" LINUXDEPLOY_QT_PLUGIN_FILE="linuxdeploy-plugin-qt-x86_64.AppImage" LINUXDEPLOY_QT_PLUGIN_URL="${LINUXDEPLOY_QT_PLUGIN_PATH}/${LINUXDEPLOY_QT_PLUGIN_FILE}"