From 79614562b948024f95a50c16d8fc207418cd30de Mon Sep 17 00:00:00 2001
From: kd-11 <karokidii@gmail.com>
Date: Tue, 1 Oct 2024 13:20:17 +0300
Subject: [PATCH] Move x64 appimage builder to its own legacy script

---
 .ci/build-linux.sh         |  2 +-
 .ci/deploy-linux-legacy.sh | 48 ++++++++++++++++++++++++++++++++++++++
 .ci/deploy-linux.sh        |  7 +-----
 3 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100755 .ci/deploy-linux-legacy.sh

diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh
index ff81b76a79..4bba46e776 100755
--- a/.ci/build-linux.sh
+++ b/.ci/build-linux.sh
@@ -61,5 +61,5 @@ shellcheck .ci/*.sh
 } && SHOULD_DEPLOY="true" || SHOULD_DEPLOY="false"
 
 if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then
-    .ci/deploy-linux.sh "x86_64"
+    .ci/deploy-linux-legacy.sh "x86_64"
 fi
diff --git a/.ci/deploy-linux-legacy.sh b/.ci/deploy-linux-legacy.sh
new file mode 100755
index 0000000000..1e22c5ffc9
--- /dev/null
+++ b/.ci/deploy-linux-legacy.sh
@@ -0,0 +1,48 @@
+#!/bin/sh -ex
+
+cd build || exit 1
+
+if [ "$DEPLOY_APPIMAGE" = "true" ]; then
+    DESTDIR=AppDir ninja install
+
+    curl -fsSLo /usr/bin/linuxdeploy https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+    chmod +x /usr/bin/linuxdeploy
+    curl -fsSLo /usr/bin/linuxdeploy-plugin-qt https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+    chmod +x /usr/bin/linuxdeploy-plugin-qt
+    curl -fsSLo linuxdeploy-plugin-checkrt.sh https://github.com/linuxdeploy/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt-x86_64.sh
+    chmod +x ./linuxdeploy-plugin-checkrt.sh
+
+    export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so"
+    export EXTRA_QT_PLUGINS="svg;wayland-decoration-client;wayland-graphics-integration-client;wayland-shell-integration"
+    APPIMAGE_EXTRACT_AND_RUN=1 linuxdeploy --appdir AppDir --plugin qt
+
+    # Remove libwayland-client because it has platform-dependent exports and breaks other OSes
+    rm -f ./AppDir/usr/lib/libwayland-client.so*
+
+    # Remove libvulkan because it causes issues with gamescope
+    rm -f ./AppDir/usr/lib/libvulkan.so*
+
+    # Remove git directory containing local commit history file
+    rm -rf ./AppDir/usr/share/rpcs3/git
+
+    ./linuxdeploy-plugin-checkrt.sh --appdir AppDir
+
+    linuxdeploy --appimage-extract
+    ./squashfs-root/plugins/linuxdeploy-plugin-appimage/usr/bin/appimagetool AppDir -g
+
+    COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ../rpcs3/rpcs3_version.cpp)
+    COMM_COUNT="$(git rev-list --count HEAD)"
+    COMM_HASH="$(git rev-parse --short=8 HEAD)"
+    RPCS3_APPIMAGE="rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_linux64.AppImage"
+
+    mv ./RPCS3*.AppImage "$RPCS3_APPIMAGE"
+
+    # If we're building using a CI, let's copy over the AppImage artifact
+    if [ -n "$BUILD_ARTIFACTSTAGINGDIRECTORY" ]; then
+        cp "$RPCS3_APPIMAGE" "$ARTDIR"
+    fi
+
+    FILESIZE=$(stat -c %s ./rpcs3*.AppImage)
+    SHA256SUM=$(sha256sum ./rpcs3*.AppImage | awk '{ print $1 }')
+    echo "${SHA256SUM};${FILESIZE}B" > "$RELEASE_MESSAGE"
+fi
diff --git a/.ci/deploy-linux.sh b/.ci/deploy-linux.sh
index a4b3dcc306..df5950061c 100755
--- a/.ci/deploy-linux.sh
+++ b/.ci/deploy-linux.sh
@@ -15,12 +15,7 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
     chmod +x ./linuxdeploy-plugin-checkrt.sh
 
     export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so"
-    export EXTRA_QT_PLUGINS="svg;wayland-decoration-client;wayland-graphics-integration-client;wayland-shell-integration"
-
-    if [ "$CPU_ARCH" = "aarch64" ]; then
-        # Ideally we should always ship the wayland integration libraries. Unfortunately glibc ABI issues on steam deck make this undesirable right now, so we only ship for arm64
-        export EXTRA_QT_PLUGINS="$EXTRA_QT_PLUGINS;waylandcompositor"
-    fi
+    export EXTRA_QT_PLUGINS="svg;wayland-decoration-client;wayland-graphics-integration-client;wayland-shell-integration;waylandcompositor"
 
     APPIMAGE_EXTRACT_AND_RUN=1 linuxdeploy --appdir AppDir --plugin qt