From 00f2cc51c90f16b75d72f37fe2e4a1238d943b47 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sat, 30 Sep 2023 11:02:35 +0200
Subject: [PATCH 01/18] Fixing artifact names evaluating the branches

---
 automation_tools/flatpak_build_bundle.sh        |  6 +++++-
 automation_tools/flatpak_build_download_only.sh | 14 ++++++++++++--
 automation_tools/flatpak_build_only.sh          | 16 +++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/automation_tools/flatpak_build_bundle.sh b/automation_tools/flatpak_build_bundle.sh
index 8c155810..cef69eff 100755
--- a/automation_tools/flatpak_build_bundle.sh
+++ b/automation_tools/flatpak_build_bundle.sh
@@ -2,4 +2,8 @@
 
 # This is building the bundle RetroDECK.flatpak after the download and build steps are done
 
-flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK-cooker.flatpak net.retrodeck.retrodeck
\ No newline at end of file
+if [ "${GITHUB_REF##*/}" = "main" ]; then
+    flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
+else
+    flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK-cooker.flatpak net.retrodeck.retrodeck
+fi
\ No newline at end of file
diff --git a/automation_tools/flatpak_build_download_only.sh b/automation_tools/flatpak_build_download_only.sh
index 55352780..009db9de 100755
--- a/automation_tools/flatpak_build_download_only.sh
+++ b/automation_tools/flatpak_build_download_only.sh
@@ -3,12 +3,22 @@
 # This script is downloading the needed files to prepare the manifest build
 
 git config --global protocol.file.allow always
+
+if [ "${GITHUB_REF##*/}" = "main" ]; then
+    BUNDLE_NAME="RetroDECK.flatpak"
+    FOLDER=retrodeck-flatpak-cooker
+else
+    BUNDLE_NAME="RetroDECK-cooker.flatpak"
+    FOLDER=retrodeck-flatpak-cooker
+fi
+
 mkdir -vp ${GITHUB_WORKSPACE}/local
 mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
+
 flatpak-builder --user --force-clean \
     --install-deps-from=flathub \
     --install-deps-from=flathub-beta \
     --repo=${GITHUB_WORKSPACE}/local \
     --download-only \
-    ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \
-    net.retrodeck.retrodeck.yml
\ No newline at end of file
+    ${GITHUB_WORKSPACE}/"$FOLDER" \
+    net.retrodeck.retrodeck.yml
diff --git a/automation_tools/flatpak_build_only.sh b/automation_tools/flatpak_build_only.sh
index d2ed3fe5..abcb5306 100755
--- a/automation_tools/flatpak_build_only.sh
+++ b/automation_tools/flatpak_build_only.sh
@@ -1,14 +1,24 @@
 #!/bin/bash
 
-# This script is building the flatpak is the needed files are already downloaded
+# This script is downloading the needed files to prepare the manifest build
 
 git config --global protocol.file.allow always
+
+if [ "${GITHUB_REF##*/}" = "main" ]; then
+    BUNDLE_NAME="RetroDECK.flatpak"
+    FOLDER=retrodeck-flatpak-cooker
+else
+    BUNDLE_NAME="RetroDECK-cooker.flatpak"
+    FOLDER=retrodeck-flatpak-cooker
+fi
+
 mkdir -vp ${GITHUB_WORKSPACE}/local
 mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
+
 flatpak-builder --user --force-clean \
     --install-deps-from=flathub \
     --install-deps-from=flathub-beta \
     --repo=${GITHUB_WORKSPACE}/local \
     --disable-download \
-    ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \
-    net.retrodeck.retrodeck.yml
\ No newline at end of file
+    ${GITHUB_WORKSPACE}/"$FOLDER" \
+    net.retrodeck.retrodeck.yml

From 95707e1b192bc35fd6de06c40a39206da04cdbda Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sat, 30 Sep 2023 11:03:09 +0200
Subject: [PATCH 02/18] The bar is blue!!

---
 net.retrodeck.retrodeck.appdata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index 13806397..058aa862 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -76,7 +76,6 @@
             <ul>
                <li>Added helper .txt files to the mod and texture pack folders.</li>
                <li>The builtin changelog is now scrollable.</li>
-               <li>The loading bar color is after much debate once again red.</li>
                <li>Gameboy Advanced and Game Gear integer scaling changes based on feedback.</li>
                <li>Optimized and retooled the patching process for ES-DE.</li>
                <li>Various fixes and optimizations to the RetroDECK build process.</li>

From 5f2e0ca1e1e03b4ab5cfe87cd53baafc87407b08 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sat, 30 Sep 2023 11:17:54 +0200
Subject: [PATCH 03/18] RA: another cores ninja-update, fixed

---
 net.retrodeck.retrodeck.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 75c5a63f..64a079ed 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -490,7 +490,7 @@ modules:
     sources:
       - type: archive
         url: https://buildbot.libretro.com/stable/1.16.0/linux/x86_64/RetroArch_cores.7z
-        sha256: e4f7c9843ba827812088b3d1c7d745e802d7691180eb789ba5a37732461f2a06
+        sha256: 156dede0c04cac1fee4bdb36128c19c396307f2369e5c1fc99fda29453bca184
     
   - name: retroarch-sameduck-core
     buildsystem: simple

From c5abfe431c7beb92e0bdc3b17dfa40721475d70b Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sat, 30 Sep 2023 14:09:01 +0200
Subject: [PATCH 04/18] Min pipeline fixes

---
 .github/workflows/main-selfhosted.yml  | 1 -
 automation_tools/flatpak_build_only.sh | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index b71961c6..4e533c2d 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -76,7 +76,6 @@ jobs:
           hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz))
           echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact.sha
           mv -f RetroDECK-Artifact.* ${{ secrets.ARTIFACT_REPO }}
-        continue-on-error: true
 
       - name: Create Bundle
         run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_bundle.sh"
diff --git a/automation_tools/flatpak_build_only.sh b/automation_tools/flatpak_build_only.sh
index abcb5306..6ec4597f 100755
--- a/automation_tools/flatpak_build_only.sh
+++ b/automation_tools/flatpak_build_only.sh
@@ -6,14 +6,14 @@ git config --global protocol.file.allow always
 
 if [ "${GITHUB_REF##*/}" = "main" ]; then
     BUNDLE_NAME="RetroDECK.flatpak"
-    FOLDER=retrodeck-flatpak-cooker
+    FOLDER=retrodeck-flatpak-main
 else
     BUNDLE_NAME="RetroDECK-cooker.flatpak"
     FOLDER=retrodeck-flatpak-cooker
 fi
 
 mkdir -vp ${GITHUB_WORKSPACE}/local
-mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
+mkdir -vp ${GITHUB_WORKSPACE}/"$FOLDER"
 
 flatpak-builder --user --force-clean \
     --install-deps-from=flathub \

From eaf9685eaba57ad770663d9537bd4b4f2cdbe7e5 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 09:39:31 +0200
Subject: [PATCH 05/18] Merged main

---
 net.retrodeck.retrodeck.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 64a079ed..72bf86e7 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -76,8 +76,8 @@ modules:
   # The version number is hardcoded in /app/retrodeck/version
   #
   # UPDATE STEPS FOR MAIN:
-  # [X] Update the VERSION variable on line containing "VERSION=THISBRANCH"
-  # [X] Update the appdata.xml with the version number and notes
+  # [ ] Update the VERSION variable on line containing "VERSION=THISBRANCH"
+  # [ ] Update the appdata.xml with the version number and notes
   #
   - name: version-initialization
     buildsystem: simple
@@ -85,7 +85,9 @@ modules:
       - |
 
         # on main please update this with the version variable, eg: VERSION='0.7.0b'
-        VERSION=0.7.2b
+        # on cooker will be THISBRANCH
+        VERSION=THISBRANCH
+
 
         git checkout ${GITHUB_REF_NAME}
         mkdir -p ${FLATPAK_DEST}/retrodeck/

From a911b9c6f5a8a88404114bb065edd228bfa206e2 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 09:50:01 +0200
Subject: [PATCH 06/18] CITRA: updated for QT6

---
 net.retrodeck.retrodeck.yml                   | 44 +++++++++------
 rd-submodules/citra/citra-launcher.sh         | 25 +++++++++
 rd-submodules/citra/org.citra_emu.citra.svg   |  1 +
 .../citra/unified-source-compat.patch         | 56 -------------------
 4 files changed, 52 insertions(+), 74 deletions(-)
 create mode 100644 rd-submodules/citra/citra-launcher.sh
 create mode 100644 rd-submodules/citra/org.citra_emu.citra.svg
 delete mode 100644 rd-submodules/citra/unified-source-compat.patch

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 72bf86e7..961713bf 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1,11 +1,11 @@
 app-id: net.retrodeck.retrodeck
 runtime: org.kde.Platform
-runtime-version: 5.15-22.08
+runtime-version: "6.5"
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.llvm14    # Needed for rpcs3
 base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu
-base-version: 5.15-22.08                    # Needed for Yuzu
+base-version: "6.5"                         # Needed for Yuzu
 command: retrodeck.sh
 
 add-extensions:
@@ -67,7 +67,7 @@ cleanup-commands:
 
 modules:
 
-  # dependency of: CEMU
+  # dependency of: CEMU, CITRA
   - rd-submodules/shared-modules/libusb/libusb.json
 
   # This module is used to define the RetroDECK version
@@ -221,7 +221,7 @@ modules:
         url: https://github.com/mikefarah/yq/releases/download/v4.33.3/yq_linux_amd64
         sha256: 4ee662847c588c3ef2fec8bfb304e8739e3dbaba87ccb9a608d691c88f5b64dc
 
-  # dependency of: CEMU (13.0.0)
+  # dependency of: CEMU, CITRA <-(13.0.0)
   - name: glslang
     buildsystem: cmake-ninja
     config-opts:
@@ -610,37 +610,42 @@ modules:
   # Yuzu - END
 
   # CITRA - START
-  # DO NOT UPDATE! WENT ON QT6
   # https://github.com/flathub/org.citra_emu.citra
 
-  - rd-submodules/shared-modules/SDL2/SDL2-with-libdecor.json
+  - rd-submodules/shared-modules/SDL2/SDL2-2.26.1-with-libdecor.json
 
   - name: citra
     buildsystem: cmake-ninja
     builddir: true
     config-opts:
       - '-DCMAKE_BUILD_TYPE=Release'
-      - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON'
-      - '-DENABLE_LTO=ON'
       - '-DENABLE_QT_TRANSLATION=ON'
       - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON'
+      - '-DUSE_DISCORD_PRESENCE=ON'
       - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF'
-      # - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON'
-      # FFMPEG VIDEO DUMPER was disabled because of this: https://github.com/citra-emu/citra/issues/5949
       - '-DUSE_SYSTEM_SDL2=ON'
-      - '-DCMAKE_POLICY_DEFAULT_CMP0069=NEW'
-      - '-DENABLE_FDK=ON'
     cleanup:
       - /share/man
       - /share/pixmaps
     post-install:
-      - install -Dm644 ../dist/citra.svg /app/share/icons/hicolor/scalable/apps/citra.svg
-      - install -Dm644 ../dist/icon.png /app/share/icons/hicolor/512x512/apps/citra.png
+      - install -Dm755 ../citra-launcher.sh /app/bin/citra-launcher
+      - >-
+        install -Dm644 ../org.citra_emu.citra.svg
+        /app/share/icons/hicolor/scalable/apps/citra.svg
+      - >-
+        install -Dm644 ../dist/icon.png
+        /app/share/icons/hicolor/512x512/apps/citra.png
+      - >-
+        mv /app/share/mime/packages/citra.xml
+        /app/share/mime/packages/org.citra_emu.citra.xml
+      - >-
+        sed 's/citra/org.citra_emu.citra/g' -i
+        /app/share/mime/packages/org.citra_emu.citra.xml
     sources:
       - type: archive
         url: >-
-          https://github.com/citra-emu/citra-nightly/releases/download/nightly-1898/citra-unified-source-20230504-70335a7.tar.xz
-        sha256: b320585bd8c4c075f63d3d9c74b830718e58fcf04d987a5dcead402a72abf753
+          https://github.com/citra-emu/citra-nightly/releases/download/nightly-2009/citra-unified-source-20231012-40ba522.tar.xz
+        sha256: 927739892fff5d1b325b07182ab29a7355f58866debe60da1d6620680773ac97
         x-checker-data:
           type: json
           url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest
@@ -649,8 +654,11 @@ modules:
             .assets[] | .browser_download_url |
             match("https://.+citra-unified-source-.+.xz$") | .string
           is-main-source: true
-      - type: patch
-        path: rd-submodules/citra/unified-source-compat.patch
+      - type: file
+        path: rd-submodules/citra/org.citra_emu.citra.svg
+      - type: file
+        path: rd-submodules/citra/citra-launcher.sh
+
 
 
   # CITRA - END
diff --git a/rd-submodules/citra/citra-launcher.sh b/rd-submodules/citra/citra-launcher.sh
new file mode 100644
index 00000000..33b95cfb
--- /dev/null
+++ b/rd-submodules/citra/citra-launcher.sh
@@ -0,0 +1,25 @@
+#!/bin/bash -e
+
+report_error() {
+    read -r -d '|' MESSAGE <<EOF
+Unfortunately, Citra seems to have crashed.
+We kindly ask you to submit a bug report to <a href="https://github.com/flathub/org.citra_emu.citra/issues">https://github.com/flathub/org.citra_emu.citra/issues</a>.
+
+When submitting a bug report, please attach your <b>system information</b> and the <b>Citra log file</b>.
+You seem to be using ${XDG_SESSION_DESKTOP} ${DESKTOP_SESSION} (${XDG_SESSION_TYPE}):
+To obtain Citra log files, please see <a href="https://community.citra-emu.org/t/how-to-upload-the-log-file/296">this guide</a>.
+To obtain your system information, please install <tt>inxi</tt> and run <tt>inxi -v3</tt>. |
+EOF
+    zenity --warning --no-wrap --title "That's awkward ..." --text "$MESSAGE"
+}
+
+unset VK_ICD_FILENAMES VK_DRIVER_FILES
+# Discord RPC
+for i in {0..9}; do
+    test -S "$XDG_RUNTIME_DIR"/"discord-ipc-$i" || ln -sf {app/com.discordapp.Discord,"$XDG_RUNTIME_DIR"}/"discord-ipc-$i";
+done
+
+
+if ! prlimit --nofile=8192 citra-qt "$@"; then
+    report_error
+fi
\ No newline at end of file
diff --git a/rd-submodules/citra/org.citra_emu.citra.svg b/rd-submodules/citra/org.citra_emu.citra.svg
new file mode 100644
index 00000000..8fa09944
--- /dev/null
+++ b/rd-submodules/citra/org.citra_emu.citra.svg
@@ -0,0 +1 @@
+<svg width="433.93" height="433.93" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><defs><radialGradient id="j" cx="0" cy="0" r="1" fx=".339" fy="-.553" gradientTransform="matrix(135.72 53.102 32.823 -83.888 479.47 287.23)" gradientUnits="userSpaceOnUse"><stop stop-color="#ffff87" offset="0"/><stop stop-color="#ffff87" offset=".126"/><stop stop-color="#ffc503" offset=".144"/><stop stop-color="#ffc503" offset=".216"/><stop stop-color="#ffc503" offset=".395"/><stop stop-color="#ffc503" offset=".441"/><stop stop-color="#ffc003" offset=".5"/><stop stop-color="#ffc003" offset=".628"/><stop stop-color="#ffc003" offset=".729"/><stop stop-color="#ff8904" stop-opacity=".869" offset=".849"/><stop stop-color="#ff8904" offset=".987"/><stop stop-color="#ff8904" offset="1"/></radialGradient><radialGradient id="b" cx="-.042" cy=".043" r="1" gradientTransform="scale(126.604 -126.604) rotate(39.987 6.737 3.895)" gradientUnits="userSpaceOnUse"><stop stop-color="#ff0" offset="0"/><stop stop-color="#ffba05" offset=".666"/><stop stop-color="#ffba05" offset="1"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientTransform="scale(-92.677 92.677) rotate(-82.34 -.07 5.315)" gradientUnits="userSpaceOnUse"><stop stop-color="#ff0" offset="0"/><stop stop-color="#ffba05" offset="1"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" fx="-.892" fy="-.452" gradientTransform="matrix(58.797 44.174 44.174 -58.797 591.5 452.83)" gradientUnits="userSpaceOnUse"><stop stop-color="#ff0" offset="0"/><stop stop-color="#ffba05" offset="1"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientTransform="scale(-82.392 82.392) rotate(-39.105 4.252 10.756)" gradientUnits="userSpaceOnUse"><stop stop-color="#ff0" offset="0"/><stop stop-color="#ffba05" offset="1"/></radialGradient><radialGradient id="f" cx="-.277" cy="-.013" r="1" gradientTransform="matrix(166.21 117.68 75.941 -107.26 545.45 466.23)" gradientUnits="userSpaceOnUse"><stop stop-color="#ff0" offset="0"/><stop stop-color="#ffee05" offset=".497"/><stop stop-color="#ffba05" offset="1"/></radialGradient><radialGradient id="g" cx=".069" cy=".001" r="1" gradientTransform="matrix(92.166 1.56 1.3981 -82.601 484.17 431.17)" gradientUnits="userSpaceOnUse"><stop stop-color="#ff0" offset="0"/><stop stop-color="#ffba05" offset="1"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientTransform="matrix(112.47 78.731 51.056 -72.937 527.5 460.5)" gradientUnits="userSpaceOnUse"><stop stop-color="#ff0" offset="0"/><stop stop-color="#ffba05" offset="1"/></radialGradient><radialGradient id="i" cx=".132" cy="-.001" r="1" fx="-.08" fy=".039" gradientTransform="matrix(64.042 -58.572 -66.76 -72.994 505.91 439.83)" gradientUnits="userSpaceOnUse"><stop stop-color="#ff0" offset="0"/><stop stop-color="#ffcf05" offset=".63"/><stop stop-color="#ffcf05" offset="1"/></radialGradient><radialGradient id="p" cx="698.21" cy="478.94" r="186.38" gradientTransform="matrix(1.2034 -.41433 .38181 1.1089 -338.27 245.75)" gradientUnits="userSpaceOnUse"><stop stop-color="#f15a24" stop-opacity="0" offset="0"/><stop stop-color="#f15a24" stop-opacity="0" offset=".685"/><stop stop-color="#f14a24" offset="1"/></radialGradient><linearGradient id="a"><stop stop-color="#f15a24" offset="0"/><stop stop-color="#f15a24" stop-opacity="0" offset="1"/></linearGradient><linearGradient id="k" x1="382.8" x2="662.93" y1="393.32" y2="393.32" gradientUnits="userSpaceOnUse" xlink:href="#a"/><linearGradient xlink:href="#a" id="o" gradientUnits="userSpaceOnUse" x1="382.8" y1="393.32" x2="662.93" y2="393.32"/><linearGradient xlink:href="#a" id="n" gradientUnits="userSpaceOnUse" x1="382.8" y1="393.32" x2="662.93" y2="393.32"/><linearGradient xlink:href="#a" id="m" gradientUnits="userSpaceOnUse" x1="382.8" y1="393.32" x2="662.93" y2="393.32"/><clipPath id="l"><path d="M640.25 512.56c.366-.686 1.015-1.901 1.507-3.229.237-.588.284-.774.375-1.057.174-.52.277-.819.368-1.099.09-.28.019-.115.107-.392.087-.277.181-.577.264-.852.082-.276.15-.659.224-.934.076-.276.167-.604.233-.881.066-.276.257-1.337.312-1.615.316-1.599.241-2.12.401-3.701.16-1.58.244-3.151.26-4.712a54.705 54.705 0 00-.154-4.66 59.33 59.33 0 00-.533-4.61 65.494 65.494 0 00-.877-4.562 74.494 74.494 0 00-1.184-4.518c-.442-1.5-.93-2.992-1.457-4.478a104.304 104.304 0 00-1.694-4.438 140.583 140.583 0 00-3.805-8.51 147.745 147.745 0 00-4.302-8.169 160.267 160.267 0 00-4.755-7.858 178.142 178.142 0 00-5.165-7.574 201.52 201.52 0 00-5.53-7.318c-1.9-2.4-3.853-4.762-5.852-7.09a268.79 268.79 0 00-6.129-6.89 324.398 324.398 0 00-6.362-6.72 277.805 277.805 0 00-6.76-6.714 290.808 290.808 0 00-6.961-6.47 306.226 306.226 0 00-7.152-6.237 324.926 324.926 0 00-7.334-6.016 343.895 343.895 0 00-7.504-5.806 365.084 365.084 0 00-7.664-5.609 393.526 393.526 0 00-7.816-5.423 413.737 413.737 0 00-7.957-5.247 325.225 325.225 0 00-10.058-6.225 305.995 305.995 0 00-10.232-5.813 285.632 285.632 0 00-10.416-5.38 268.036 268.036 0 00-10.611-4.924 252.218 252.218 0 00-16.384-6.51 239.711 239.711 0 00-16.731-5.3 234.18 234.18 0 00-11.502-2.872 139.08 139.08 0 00-9.762-1.823 129.283 129.283 0 00-4.896-.638 122.452 122.452 0 00-9.822-.69c-1.639-.046-3.28-.058-4.923-.034a109.843 109.843 0 00-9.866.591 72.33 72.33 0 00-3.979.531 63.98 63.98 0 00-3.906.759 57.117 57.117 0 00-3.819 1.007c-1.256.38-2.496.805-3.717 1.278-1.22.475-2.422.997-3.602 1.571a44.693 44.693 0 00-3.471 1.884 42.734 42.734 0 00-3.326 2.22c-1.084.798-2.656 1.973-3.685 2.893l-3.143-7.259c-3.143-7.26 1.5-6 3.143-8.5 1.644-2.5.357-9 .217-15-.14-6 6.64-11.5 9.64-14.5 3-3.001 10-10.5 14.5-11.82 4.5-1.319 23.5-16.18 30-18.181 6.5-1.999 13.5-6.999 22-8.499 8.5-1.5 19-3 27.5-3s26.5-.5 38.5 0 27 3 33 4 20 2.5 27.5 4.5 23.5 8 27 11.5 28 13.999 33.5 20c5.5 6 24 39.5 25 45.5s14 47.499 17 53c3 5.5 0 39.499 0 45.5 0 6-10 45-10 45l-13.5 28.5-14 14.5z"/></clipPath></defs><path d="M180.02 415.68c-17.986-2.258-43.941-8.138-59.303-13.436-45.416-15.66-91.627-51.387-112.29-86.813-7.392-12.675-9.855-29.065-7.64-50.846 1.57-15.448 4.238-24.955 10.938-38.978 20.81-43.561 55.61-85.05 100.64-119.99 33.898-26.298 69.589-47.881 101.64-61.46 27.534-11.666 61.915-21.532 84.068-24.123 27.343-3.198 56.096 1.164 74.647 11.325 18.752 10.271 30.61 25.375 43.922 55.939 12.492 28.684 17.312 55.294 17.29 95.461-.015 34.075-4.172 58.552-14.29 84.174-8.401 21.279-21.717 44.014-36.541 62.391-6.601 8.182-26.727 28.053-35.45 35-19.832 15.793-45.654 30.387-66.248 37.441-17.156 5.877-39.99 11.132-59.144 13.612-9.676 1.253-33.307 1.42-42.243.298z" fill="#fff"/><path d="M508.37 418.38c-1.948-9.873-2.175-19.875-2.148-30.734.105-4.803-.008-10.436.607-16.082 1.248-11.467 5.143-14.109 15.617-9.51 17.862 7.84 33.696 18.829 47.854 32.241 3.988 3.779 8.185 7.422 11.089 12.202 2.673 4.397 2.097 6.88-2.266 9.608-1.396.873-2.949 1.54-4.502 2.103-5.181 1.881-10.542 3.121-15.918 4.281-12.621 2.721-25.222 5.644-38.216 5.823l-.239.001c-6.452 0-10.63-3.605-11.878-9.933" fill="url(#b)" transform="matrix(1.3333 0 0 -1.3333 -471.81 755.15)"/><path d="M492.04 416.52c-3.243-1.617-5.823-4.156-8.361-6.684-16.977-16.905-32.998-34.704-48.672-52.819-4.26-4.924-8.651-9.823-11.376-15.886-1.919-4.27-.934-6.454 3.654-7.668 4.725-1.249 9.544-1.787 14.436-1.358 11.696 1.026 22.799 4.32 33.655 8.677 10.044 4.032 16.339 11.18 18.544 21.838 2.891 13.979 3.907 28.175 4.618 42.392 0 2.182.021 4.364-.013 6.545-.01.636-.15 1.274-.276 1.902-.545 2.722-1.447 4.01-3.104 4.01-.83 0-1.848-.323-3.105-.949" fill="url(#c)" transform="matrix(1.3333 0 0 -1.3333 -471.81 755.15)"/><path d="M623.43 485.96c-2.879-.515-5.736-1.318-8.503-2.282-15.719-5.482-30.649-12.847-45.782-19.703-12.92-5.855-25.833-11.785-38.083-19.013-2.413-1.425-5.354-3.1-4.765-6.319.504-2.751 3.758-2.789 6.016-3.319 17.339-4.073 35.01-5.712 51.316-7.058 10.474.119 18.926 1.786 25.516 8.829 6.88 7.354 12.632 15.489 16.919 24.601 2.691 5.72 4.477 11.786 4.479 18.169.002 4.153-1.835 6.272-5.267 6.272-.571 0-1.188-.059-1.846-.177" fill="url(#d)" transform="matrix(1.3333 0 0 -1.3333 -471.81 755.15)"/><path d="M475.92 419.25c-.367-.104-.71-.292-1.065-.437-22.555-9.166-44.21-20.249-65.865-31.321-5.464-2.792-10.748-5.939-15.684-9.652-5.297-3.984-8.316-8.98-7.651-15.694 0-.89-.035-1.662.005-2.431.397-7.627 4.249-12.981 10.812-16.559 6.098-3.323 11.35-1.172 16.365 2.52 1.236.911 2.498 1.799 3.649 2.811 22.843 20.104 43.28 42.565 63.347 65.381 1.264 1.437 3.447 3.141 2.012 5.299-.613.922-1.333 1.232-2.102 1.231-1.232 0-2.589-.797-3.823-1.148" fill="url(#e)" transform="matrix(1.3333 0 0 -1.3333 -471.81 755.15)"/><path d="M589.81 520.12c-2.155-1.598-4.18-3.381-6.195-5.159-14.338-12.647-27.085-26.892-40.259-40.697-5.472-5.734-10.87-11.588-15.617-17.981-.828-1.116-1.856-2.369-.83-3.824.972-1.379 2.519-1.147 3.87-.737 1.831.556 3.62 1.272 5.386 2.018 23.705 10.024 46.647 21.655 69.496 33.464 6.568 3.394 13.185 6.854 18.588 12.131 2.02 1.974 3.277 4.24 3.342 7.436-.072 2.307-.943 4.698-2.221 6.96-4.063 7.191-12.308 11.156-20.705 11.156-5.215 0-10.489-1.53-14.855-4.767" fill="url(#f)" transform="matrix(1.3333 0 0 -1.3333 -471.81 755.15)"/><path d="M413.44 432.07c-5.861-6.67-11.407-13.524-15.914-21.172-2.874-4.876-5.175-10.064-6.355-15.632-.819-3.866.412-5.458 3.711-5.517 2.078.023 4.038.607 5.971 1.3 18.942 6.786 36.964 15.693 55.17 24.173 7.774 3.62 15.486 7.375 22.781 11.914 2.187 1.361 4.634 2.997 4.191 5.914-.396 2.604-3.356 2.319-5.257 3.169-.692.308-1.469.436-2.215.612-11.727 2.765-23.679 4.039-35.625 5.305a38.338 38.338 0 01-4.058.221c-8.707 0-16.182-3.211-22.4-10.287" fill="url(#g)" transform="matrix(1.3333 0 0 -1.3333 -471.81 755.15)"/><path d="M567.31 526.82c-14.169-1.46-27.39-6.06-40.199-12.109-7.73-3.652-12.567-9.493-14.146-17.954-1.793-9.597-3.042-19.253-2.904-29.045 0-2.697-.068-5.395.022-8.089.067-1.997-.399-4.391 1.83-5.503 2.219-1.108 4.351.084 6.055 1.392 2.834 2.177 5.567 4.529 8.099 7.054 14.061 14.024 27.283 28.841 40.42 43.726 4.051 4.589 8.321 9.1 10.964 14.772 1.594 3.423.812 4.978-2.88 5.7-1.112.218-2.231.3-3.353.3-1.302 0-2.607-.11-3.908-.244" fill="url(#h)" transform="matrix(1.3333 0 0 -1.3333 -471.81 755.15)"/><path d="M493.43 497.7c-3.943-1.236-7.454-3.334-11.002-5.368-14.602-8.364-28.162-18.128-39.782-30.405-5.392-5.696-4.536-9.429 2.935-11.564 13.892-3.97 27.998-7.036 42.519-7.395 7.646-.189 11.495 3.378 12.86 10.836 1.395 7.615 1.69 15.275 1.485 25.395-.22 3.072.784 8.645-.687 14.051-.943 3.472-2.527 5.026-5.134 5.025-.929 0-1.988-.197-3.194-.575" fill="url(#i)" transform="matrix(1.3333 0 0 -1.3333 -471.81 755.15)"/><path d="M641.75 509.34c.237-.588.284-.774.375-1.057.174-.52.277-.819.368-1.099.09-.28.019-.115.107-.392.087-.277.181-.577.264-.852.082-.276.15-.659.224-.934.076-.276.167-.604.233-.881.066-.276.257-1.337.312-1.615.316-1.599.241-2.12.401-3.701.16-1.58.244-3.151.26-4.712a54.705 54.705 0 00-.154-4.66 59.33 59.33 0 00-.533-4.61 65.494 65.494 0 00-.877-4.562 74.494 74.494 0 00-1.184-4.518c-.442-1.5-.93-2.992-1.457-4.478a104.304 104.304 0 00-1.694-4.438 140.583 140.583 0 00-3.805-8.51 147.745 147.745 0 00-4.302-8.169 160.267 160.267 0 00-4.755-7.858 178.142 178.142 0 00-5.165-7.574 201.52 201.52 0 00-5.53-7.318c-1.9-2.4-3.853-4.762-5.852-7.09a268.79 268.79 0 00-6.129-6.89 324.398 324.398 0 00-6.362-6.72 277.805 277.805 0 00-6.76-6.714 290.808 290.808 0 00-6.961-6.47 306.226 306.226 0 00-7.152-6.237 324.926 324.926 0 00-7.334-6.016 343.895 343.895 0 00-7.504-5.806 365.084 365.084 0 00-7.664-5.609 393.526 393.526 0 00-7.816-5.423 413.737 413.737 0 00-7.957-5.247 325.225 325.225 0 00-10.058-6.225 305.995 305.995 0 00-10.232-5.813 285.632 285.632 0 00-10.416-5.38 268.036 268.036 0 00-10.611-4.924 252.218 252.218 0 00-16.384-6.51 239.711 239.711 0 00-16.731-5.3 234.18 234.18 0 00-11.502-2.872 139.08 139.08 0 00-9.762-1.823 129.283 129.283 0 00-4.896-.638 122.452 122.452 0 00-9.822-.69c-1.639-.046-3.28-.058-4.923-.034a109.843 109.843 0 00-9.866.591 72.33 72.33 0 00-3.979.531 63.98 63.98 0 00-3.906.759 57.117 57.117 0 00-3.819 1.007c-1.256.38-2.496.805-3.717 1.278-1.22.475-2.422.997-3.602 1.571-.749.365-1.489.751-2.22 1.159a43.217 43.217 0 00-4.877 3.11 43.23 43.23 0 00-2.194 1.731c-.282.225-.554.448-.806.662 5.18-5.701 10.508-11.008 15.987-15.904 5.538-4.95 11.227-9.48 17.07-13.573a161.243 161.243 0 0117.987-10.956 146.757 146.757 0 0118.901-8.236 140.527 140.527 0 0119.816-5.415 142.482 142.482 0 0120.731-2.495c7.063-.333 14.278-.163 21.645.528 7.368.692 14.887 1.904 22.56 3.654 8.186 1.866 15.978 4.164 23.376 6.884 7.397 2.719 14.401 5.861 21.012 9.414a147.457 147.457 0 0118.655 11.891 140.839 140.839 0 0116.304 14.311 143.678 143.678 0 0113.962 16.675c4.264 5.947 8.14 12.278 11.626 18.985 3.487 6.707 6.586 13.789 9.296 21.238 2.712 7.449 5.037 15.264 6.975 23.436.548 2.31 1.025 4.624 1.432 6.944.408 2.318.747 4.641 1.023 6.968.275 2.327.486 4.658.637 6.991.15 2.333.241 4.671.276 7.01a152.36 152.36 0 01-.061 7.024c-.074 2.345-.2 4.69-.374 7.037a178.597 178.597 0 01-.664 7.046 200.27 200.27 0 01-.928 7.049c-.39 2.617-.912 5.345-1.535 8.125a159.46 159.46 0 01-2.142 8.427 189.92 189.92 0 01-2.569 8.359 194.51 194.51 0 01-2.816 7.915 163.996 163.996 0 01-2.883 7.098 106.178 106.178 0 01-2.773 5.909c-.886 1.73-1.723 3.199-2.481 4.346a75.308 75.308 0 01-1.946 2.775c.215-.462.433-.967.627-1.49" fill="url(#j)" transform="matrix(1.3333 0 0 -1.3333 -471.81 755.15)"/><g clip-path="url(#l)" fill="url(#m)" transform="matrix(1.3333 0 0 -1.3333 -471.81 755.15)"><path d="M0 0c6.615-7.221 13.678-14.033 21.222-20.267 7.539-6.237 15.577-11.868 24.046-16.747 8.468-4.879 17.397-8.961 26.656-12.07a139.849 139.849 0 0128.533-6.374c9.697-1.126 19.503-1.24 29.23-.453 9.731.785 19.379 2.465 28.846 4.853 18.922 4.75 37.215 12.333 53.364 23.285a140.677 140.677 0 0122.33 18.787c6.768 7.012 12.789 14.739 18.015 22.967 10.462 16.478 17.733 34.859 22.474 53.789l.439 1.778.209.872.186.899.747 3.597.373 1.798.093.45.024.112c-.007-.038.007.055.01.076l.034.227.134.908.539 3.634.269 1.817c.077.534.118 1.199.18 1.791l.338 3.658.164 1.796.075 1.835.15 3.671c.264 9.752-.472 19.521-1.882 29.184-1.502 9.646-4.173 19.05-7.353 28.281l-1.228 3.463-.307.865-.144.409-.173.426-.689 1.702-1.379 3.405-.685 1.671-.778 1.664-1.557 3.327-.371.788-.455.798-.909 1.596-1.804 3.187C246.083 207.78 79.466-59.085-.104-.105zm-.008.008c92.186-40.479 231.35 107.76 257.54 180.96.828-.982 1.523-1.975 2.238-2.986.351-.52.707-.981 1.036-1.569l.913-1.594.912-1.594.457-.797c.183-.358.275-.576.417-.871l2.346-4.986c.271-.617.473-1.148.713-1.726l1.387-3.402.693-1.701.173-.425.164-.457.309-.865 1.235-3.459c3.22-9.271 5.937-18.782 7.475-28.508 1.444-9.716 2.213-19.555 1.972-29.393l-.14-3.671-.069-1.836-.164-1.863-.329-3.659c-.063-.625-.09-1.185-.183-1.864l-.264-1.818-.528-3.635-.132-.909-.033-.227-.024-.152-.023-.112-.092-.45-.369-1.8-.736-3.599-.185-.9-.216-.915-.436-1.79c-2.367-9.534-5.355-18.932-9.077-28.033-3.717-9.105-8.196-17.911-13.474-26.221-5.276-8.31-11.358-16.118-18.197-23.206a142.253 142.253 0 00-22.563-18.989c-8.15-5.528-16.852-10.229-25.9-14.096-9.054-3.857-18.44-6.901-27.983-9.247-9.54-2.354-19.27-3.997-29.075-4.737-9.804-.741-19.683-.576-29.444.61a140.857 140.857 0 00-28.694 6.565c-9.3 3.177-18.256 7.329-26.737 12.275-8.488 4.941-16.474 10.71-23.972 17.028C13.436-14.291 6.433-7.396-.111-.104z" fill="url(#o)" transform="translate(382.92 331.6)"/></g><path d="M512.59 583.25c24.074 19.047 61.695 18.896 102.99 7.79 41.299-11.105 86.278-33.164 124.63-62.438 43.462-33.178 74.436-61.06 97.049-98.852 10.211-17.065 16.881-32.679 20.405-47.4 3.524-14.72 2.135-27.046-3.417-40.626 0 0 22.052 31.822 28.025 81.607 2.986 24.893 1.448 59.407-11.26 93.337-11.843 31.622-27.743 61.223-54.874 85.55-1.03.924-12.207 12.478-32.938 24.374-25.596 14.688-46.884 22.5-75.534 27.634-34.926 6.259-59.47 4.452-85.833-1.81-36.815-8.747-71.794-28.543-110.24-69.042" fill="url(#p)" transform="translate(-471.81 -268.85)"/></svg>
\ No newline at end of file
diff --git a/rd-submodules/citra/unified-source-compat.patch b/rd-submodules/citra/unified-source-compat.patch
deleted file mode 100644
index 6a1ca47c..00000000
--- a/rd-submodules/citra/unified-source-compat.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 710f3fcfb..e5f4f4687 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -94,7 +94,11 @@ function(check_submodules_present)
-         endif()
-     endforeach()
- endfunction()
--check_submodules_present()
-+
-+if (EXISTS "${PROJECT_SOURCE_DIR}/.git/objects")
-+    # only check submodules when source is obtained via Git
-+    check_submodules_present()
-+endif()
- 
- configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc
-                ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
-diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake
-index a011c6cbf..87e9eef35 100644
---- a/CMakeModules/GenerateSCMRev.cmake
-+++ b/CMakeModules/GenerateSCMRev.cmake
-@@ -6,15 +6,27 @@ endfunction()
- 
- list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/externals/cmake-modules")
- 
--# Find the package here with the known path so that the GetGit commands can find it as well
--find_package(Git QUIET PATHS "${GIT_EXECUTABLE}")
--
- # generate git/build information
--include(GetGitRevisionDescription)
--get_git_head_revision(GIT_REF_SPEC GIT_REV)
--git_describe(GIT_DESC --always --long --dirty)
--git_branch_name(GIT_BRANCH)
- get_timestamp(BUILD_DATE)
-+if (EXISTS "${SRC_DIR}/.git/objects")
-+    # Find the package here with the known path so that the GetGit commands can find it as well
-+    find_package(Git QUIET PATHS "${GIT_EXECUTABLE}")
-+    # only use Git to check revision info when source is obtained via Git
-+    include(GetGitRevisionDescription)
-+    get_git_head_revision(GIT_REF_SPEC GIT_REV)
-+    git_describe(GIT_DESC --always --long --dirty)
-+    git_branch_name(GIT_BRANCH)
-+elseif(EXISTS "${SRC_DIR}/GIT-COMMIT" AND EXISTS "${SRC_DIR}/GIT-TAG")
-+    # unified source archive
-+    file(READ "${SRC_DIR}/GIT-COMMIT" GIT_REV_RAW LIMIT 64)
-+    string(STRIP "${GIT_REV_RAW}" GIT_REV)
-+    string(SUBSTRING "${GIT_REV_RAW}" 0 9 GIT_DESC)
-+    set(GIT_BRANCH "HEAD")
-+else()
-+    # self-packed archive?
-+    set(GIT_DESC "UNKNOWN")
-+    set(GIT_BRANCH "UNKNOWN")
-+endif()
- 
- # Generate cpp with Git revision from template
- # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well
\ No newline at end of file

From d6e6c599862daf1e7a85d37ff51cef01d4900303 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 09:54:14 +0200
Subject: [PATCH 07/18] DOLPHIN: updated for QT6

---
 net.retrodeck.retrodeck.yml                | 39 +++-------------------
 rd-submodules/dolphin/nodirtyversion.patch | 10 +++---
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 961713bf..6b2993c4 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -67,7 +67,7 @@ cleanup-commands:
 
 modules:
 
-  # dependency of: CEMU, CITRA
+  # dependency of: CEMU, CITRA, DOLPHIN
   - rd-submodules/shared-modules/libusb/libusb.json
 
   # This module is used to define the RetroDECK version
@@ -688,37 +688,8 @@ modules:
   # https://github.com/flathub/org.DolphinEmu.dolphin-emu
   # WHEN UPADTING: remember to update rd-submodules/dolphin contents
 
-  # needed for the emulate bluetooth adapter feature to work
-  - name: bluez
-    config-opts:
-      - --enable-library
-      - --disable-manpages
-      - --disable-udev
-      - --disable-tools
-      - --disable-cups
-      - --disable-monitor
-      - --disable-client
-      - --disable-systemd
-      - --disable-a2dp
-      - --disable-avrcp
-      - --disable-network
-      - --disable-obex
-      - --disable-bap
-      - --disable-mcp
-      - --with-dbusconfdir=/app/etc
-      - --with-dbussessionbusdir=/app/usr/lib/system-services
-    sources:
-      - type: archive
-        url: https://www.kernel.org/pub/linux/bluetooth/bluez-5.66.tar.xz
-        sha256: 39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574
-        x-checker-data:
-          type: anitya
-          project-id: 10029
-          stable-only: true
-          url-template: https://www.kernel.org/pub/linux/bluetooth/bluez-$version.tar.xz
-
   # enables motion controls on non-wii controllers (switch, ps4, etc)
-  # requires a udev rule enabling Motion Sensors access
+  # TODO: requires a udev rule enabling Motion Sensors access
   - name: libevdev
     buildsystem: meson
     config-opts:
@@ -726,8 +697,8 @@ modules:
       - -Ddocumentation=disabled
     sources:
       - type: archive
-        url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.0.tar.xz
-        sha256: 9edf2006cc86a5055279647c38ec923d11a821ee4dc2c3033e8d20e8ee237cd9
+        url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.1.tar.xz
+        sha256: 06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36
         x-checker-data:
           type: anitya
           project-id: 20540
@@ -761,7 +732,7 @@ modules:
         # fatal: remote transport reported error
         # url: ssh://git@github.com/dolphin-emu/dolphin.git
         url: https://github.com/dolphin-emu/dolphin.git
-        commit: 46b99671d9158e0ca840c1d8ef249db0f321ced7
+        commit: 032c77b462a220016f23c5079e71bb23e0ad2adf
         x-checker-data:
           type: json
           url: https://dolphin-emu.org/update/latest/beta
diff --git a/rd-submodules/dolphin/nodirtyversion.patch b/rd-submodules/dolphin/nodirtyversion.patch
index f20ae789..2dacc209 100644
--- a/rd-submodules/dolphin/nodirtyversion.patch
+++ b/rd-submodules/dolphin/nodirtyversion.patch
@@ -1,8 +1,8 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9af66009a1..2acd3bed9a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -149,7 +149,7 @@ if(GIT_FOUND)
+diff --git a/CMake/ScmRevGen.cmake b/CMake/ScmRevGen.cmake
+index aacf7491ce..503791cda8 100644
+--- a/CMake/ScmRevGen.cmake
++++ b/CMake/ScmRevGen.cmake
+@@ -7,7 +7,7 @@ if(GIT_FOUND)
        OUTPUT_VARIABLE DOLPHIN_WC_REVISION
        OUTPUT_STRIP_TRAILING_WHITESPACE)
    # defines DOLPHIN_WC_DESCRIBE

From 47524a0cda5904bfe618a0c3457594280b36f94a Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 10:01:54 +0200
Subject: [PATCH 08/18] RPCS3: updated for QT6

---
 net.retrodeck.retrodeck.yml | 62 +++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 6b2993c4..00b1278f 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -3,9 +3,9 @@ runtime: org.kde.Platform
 runtime-version: "6.5"
 sdk: org.kde.Sdk
 sdk-extensions:
-  - org.freedesktop.Sdk.Extension.llvm14    # Needed for rpcs3
-base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu
-base-version: "6.5"                         # Needed for Yuzu
+  - org.freedesktop.Sdk.Extension.llvm14      # Needed for rpcs3
+# base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu - Disabled as we're using AppImage for Yuzu
+# base-version: "6.5"                         # Needed for Yuzu - Disabled as we're using AppImage for Yuzu
 command: retrodeck.sh
 
 add-extensions:
@@ -122,7 +122,7 @@ modules:
   # mesa repo got a double certificate issue and gnutils cannot handle that so GLU download fails,
   # this affects even the shared-modules's glu so I have to replace it temporarly
   # more info there: https://gitlab.com/gnutls/gnutls/-/issues/1335
-  # dependency of: CEMU
+  # dependency of: RETROARCH, CEMU, RPCS3
   - name: glu
     buildsystem: meson
     cleanup:
@@ -240,6 +240,27 @@ modules:
           project-id: 205796
           url-template: https://github.com/KhronosGroup/glslang/archive/$version.tar.gz
 
+  # enables motion controls on non-wii controllers (switch, ps4, etc)
+  # deèendency of: DOLPHIN, RPCS3
+  # TODO: requires a udev rule enabling Motion Sensors access
+  - name: libevdev
+    buildsystem: meson
+    config-opts:
+      - -Dtests=disabled
+      - -Ddocumentation=disabled
+    sources:
+      - type: archive
+        url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.1.tar.xz
+        sha256: 06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36
+        x-checker-data:
+          type: anitya
+          project-id: 20540
+          stable-only: true
+          url-template: https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz
+          
+  # dependency of: CEMU, RPCS3
+  - rd-submodules/shared-modules/glew/glew.json
+
   # ES-DE - START
   # https://gitlab.com/es-de/emulationstation-de
 
@@ -684,27 +705,9 @@ modules:
   # PCSX2 - END
 
   # Dolphin - START
-  # DO NOT UPDATE! WENT ON QT6
   # https://github.com/flathub/org.DolphinEmu.dolphin-emu
   # WHEN UPADTING: remember to update rd-submodules/dolphin contents
 
-  # enables motion controls on non-wii controllers (switch, ps4, etc)
-  # TODO: requires a udev rule enabling Motion Sensors access
-  - name: libevdev
-    buildsystem: meson
-    config-opts:
-      - -Dtests=disabled
-      - -Ddocumentation=disabled
-    sources:
-      - type: archive
-        url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.1.tar.xz
-        sha256: 06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36
-        x-checker-data:
-          type: anitya
-          project-id: 20540
-          stable-only: true
-          url-template: https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz
-
   # needed for screensaver inhibition
   - name: xdg-screensaver-shim
     buildsystem: meson
@@ -876,15 +879,8 @@ modules:
   # MELONDS - END
 
   # RPCS3 - START
-  # DO NOT UPDATE! WENT ON QT6
   # https://github.com/flathub/net.rpcs3.RPCS3
 
-  # glu issue, check glu module for more info
-  #- rd-submodules/shared-modules/glu/glu-9.json
-
-  # dependency of: CEMU
-  - rd-submodules/shared-modules/glew/glew.json
-
   - name: rpcs3
     buildsystem: cmake-ninja
     builddir: true
@@ -905,14 +901,12 @@ modules:
       ldflags: -fuse-ld=lld
     config-opts:
       - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-      #- -DBUILD_LLVM_SUBMODULE=ON this was replaced by the fllowing:
       - -DBUILD_LLVM=OFF
       - -DUSE_NATIVE_INSTRUCTIONS=OFF
       - -DUSE_PRECOMPILED_HEADERS=OFF
       - -DUSE_SDL=ON
       - -DUSE_SYSTEM_CURL=ON
-      # Disabled this to force RPCS3 to use our built FFMPEG
-      - -DUSE_SYSTEM_FFMPEG=OFF
+      - -DUSE_SYSTEM_FFMPEG=OFF # Disabled this to force RPCS3 to use our built FFMPEG
       - -DUSE_SYSTEM_LIBPNG=ON
       - -DUSE_SYSTEM_SDL=ON
       - -DUSE_SYSTEM_ZLIB=ON
@@ -921,14 +915,14 @@ modules:
       - cp /usr/lib/sdk/llvm16/lib/libLLVM-16.so /app/lib/
       - |-
         set -eux
-
         COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"
         COMM_COUNT="$(git rev-list --count HEAD)";
         COMM_HASH="$(git rev-parse --short=8 HEAD)";
     sources:
       - type: git
         url: https://github.com/RPCS3/rpcs3.git
-        commit: a828c214b5c0b87b81fcd13ff3c1e952c9a5d6dd
+        branch: master
+        commit: 75d239356a773b8211354049477d79006597505e
 
   # RPCS3 - END
 

From cdbd4b4683113ba9acb60804f15f82cb537f9f7a Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 10:06:50 +0200
Subject: [PATCH 09/18] QT6: fixed libdecor path

---
 net.retrodeck.retrodeck.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 00b1278f..3905da0a 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -633,7 +633,7 @@ modules:
   # CITRA - START
   # https://github.com/flathub/org.citra_emu.citra
 
-  - rd-submodules/shared-modules/SDL2/SDL2-2.26.1-with-libdecor.json
+  - rd-submodules/shared-modules/SDL2/SDL2-with-libdecor.json
 
   - name: citra
     buildsystem: cmake-ninja

From 2cd7fc317e3ecfd505b532f1371113c0d80ae248 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 10:12:45 +0200
Subject: [PATCH 10/18] QT6: updated RA cores

---
 net.retrodeck.retrodeck.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 3905da0a..e9d6c941 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -513,7 +513,7 @@ modules:
     sources:
       - type: archive
         url: https://buildbot.libretro.com/stable/1.16.0/linux/x86_64/RetroArch_cores.7z
-        sha256: 156dede0c04cac1fee4bdb36128c19c396307f2369e5c1fc99fda29453bca184
+        sha256: a149d34662516d791e8f90507d1107949cb158196d6bbf75105c649fb26504b6
     
   - name: retroarch-sameduck-core
     buildsystem: simple

From bf1b46cfe7abbbecfb65cc950375265a03f2fdb4 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 11:46:44 +0200
Subject: [PATCH 11/18] CITRA: moved rapidjson out of CEMU as its a common
 dependency

---
 net.retrodeck.retrodeck.yml | 49 ++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index e9d6c941..cabe5219 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -241,7 +241,7 @@ modules:
           url-template: https://github.com/KhronosGroup/glslang/archive/$version.tar.gz
 
   # enables motion controls on non-wii controllers (switch, ps4, etc)
-  # deèendency of: DOLPHIN, RPCS3
+  # dependency of: DOLPHIN, RPCS3
   # TODO: requires a udev rule enabling Motion Sensors access
   - name: libevdev
     buildsystem: meson
@@ -257,6 +257,29 @@ modules:
           project-id: 20540
           stable-only: true
           url-template: https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz
+
+  # dependency of: CITRA, CEMU
+  - name: rapidjson
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DRAPIDJSON_BUILD_DOC=OFF
+      - -DRAPIDJSON_BUILD_EXAMPLES=OFF
+      - -DRAPIDJSON_BUILD_TESTS=OFF
+      - -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
+    cleanup:
+      - /include
+      - /lib/cmake
+      - /lib/pkgconfig
+      - /share/doc
+    sources:
+      - type: archive
+        url: https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
+        sha256: bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
+        x-checker-data:
+          type: anitya
+          project-id: 7422
+          stable-only: true
+          url-template: https://github.com/Tencent/rapidjson/archive/refs/tags/v$version.tar.gz
           
   # dependency of: CEMU, RPCS3
   - rd-submodules/shared-modules/glew/glew.json
@@ -680,8 +703,6 @@ modules:
       - type: file
         path: rd-submodules/citra/citra-launcher.sh
 
-
-
   # CITRA - END
 
   # PCSX2 - START
@@ -1042,28 +1063,6 @@ modules:
           project-id: 10649
           url-template: https://libzip.org/download/libzip-$version.tar.xz
 
-  - name: rapidjson
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DRAPIDJSON_BUILD_DOC=OFF
-      - -DRAPIDJSON_BUILD_EXAMPLES=OFF
-      - -DRAPIDJSON_BUILD_TESTS=OFF
-      - -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
-    cleanup:
-      - /include
-      - /lib/cmake
-      - /lib/pkgconfig
-      - /share/doc
-    sources:
-      - type: archive
-        url: https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
-        sha256: bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
-        x-checker-data:
-          type: anitya
-          project-id: 7422
-          stable-only: true
-          url-template: https://github.com/Tencent/rapidjson/archive/refs/tags/v$version.tar.gz
-
   - name: glm
     buildsystem: cmake-ninja
     cleanup: ['*']

From e8c3dabc164f33c72751696be62c972d35b9be58 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 13:51:17 +0200
Subject: [PATCH 12/18] MELONDS: use QT6

---
 net.retrodeck.retrodeck.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index cabe5219..4e97022f 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -882,6 +882,7 @@ modules:
       - type: git
         url: https://gitlab.freedesktop.org/slirp/libslirp.git
         tag: v4.7.0
+        
   - name: melonds
     buildsystem: cmake-ninja
     builddir: true
@@ -890,6 +891,7 @@ modules:
         aarch64:
           config-opts:
             - -DENABLE_LTO_RELEASE=OFF
+            - -DUSE_QT6=ON
     sources:
       - type: git
         url: https://github.com/melonDS-emu/melonDS.git

From 52fb7b43fb96d2f39b3640e481016113cffc5b43 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 14:00:40 +0200
Subject: [PATCH 13/18] Comments [skip ci]

---
 net.retrodeck.retrodeck.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 4e97022f..df295e0c 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -882,7 +882,7 @@ modules:
       - type: git
         url: https://gitlab.freedesktop.org/slirp/libslirp.git
         tag: v4.7.0
-        
+
   - name: melonds
     buildsystem: cmake-ninja
     builddir: true
@@ -1007,7 +1007,6 @@ modules:
   # Duckstation-AppImage - END
 
   # Cemu - START
-  # LATEST BUILD BEFORE RUNTIME 23.08
   # https://github.com/cemu-project/Cemu/releases
   # https://github.com/flathub/info.cemu.Cemu
 

From b44c4a87f30b6f69ec1c554152587aac076b2fcd Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 14:36:19 +0200
Subject: [PATCH 14/18] RPCS3: removed branch name

---
 net.retrodeck.retrodeck.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index df295e0c..16f536c5 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -944,7 +944,6 @@ modules:
     sources:
       - type: git
         url: https://github.com/RPCS3/rpcs3.git
-        branch: master
         commit: 75d239356a773b8211354049477d79006597505e
 
   # RPCS3 - END

From d031eb23850789ef91c8010bb220d16a6109153e Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 17:01:46 +0200
Subject: [PATCH 15/18] MELONDS: use QT6, fix

---
 net.retrodeck.retrodeck.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 16f536c5..51911ae4 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -886,12 +886,13 @@ modules:
   - name: melonds
     buildsystem: cmake-ninja
     builddir: true
+    config-opts:
+      - -DUSE_QT6=ON
     build-options:
       arch:
         aarch64:
           config-opts:
             - -DENABLE_LTO_RELEASE=OFF
-            - -DUSE_QT6=ON
     sources:
       - type: git
         url: https://github.com/melonDS-emu/melonDS.git

From 2cf3f0e726f2a32ab64903f821d2d1209e689b1c Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 12 Oct 2023 18:54:34 +0200
Subject: [PATCH 16/18] PRIMEHACK: added proper patches

---
 net.retrodeck.retrodeck.yml                  |  4 +--
 rd-submodules/primehack/detectflatpak.patch  | 34 ++++++++++++++++++++
 rd-submodules/primehack/nodirtyversion.patch | 13 ++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 rd-submodules/primehack/detectflatpak.patch
 create mode 100644 rd-submodules/primehack/nodirtyversion.patch

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 51911ae4..2213991c 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -974,10 +974,10 @@ modules:
        # in non-writable paths, typically happens when a user
        # has leftover files from a previous non-flatpak install
       - type: patch
-        path: rd-submodules/dolphin/detectflatpak.patch
+        path: rd-submodules/primehack/detectflatpak.patch
        # version strings must match exactly for online multiplayer
       - type: patch
-        path: rd-submodules/dolphin/nodirtyversion.patch
+        path: rd-submodules/primehack/nodirtyversion.patch
       - type: script
         commands:
           - for i in {0..9}; do
diff --git a/rd-submodules/primehack/detectflatpak.patch b/rd-submodules/primehack/detectflatpak.patch
new file mode 100644
index 00000000..60dd1a2d
--- /dev/null
+++ b/rd-submodules/primehack/detectflatpak.patch
@@ -0,0 +1,34 @@
+From f2d3b349d8487cf0ee50b36ba024ac513d36f826 Mon Sep 17 00:00:00 2001
+From: Carles Pastor <cpbadosa@gmail.com>
+Date: Sat, 20 Aug 2022 13:35:32 +0200
+Subject: [PATCH] Detect we are running inside a flatpak sandbox
+
+---
+ Source/Core/UICommon/UICommon.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
+index 8d9dc2abb8..8a9d39a3d5 100644
+--- a/Source/Core/UICommon/UICommon.cpp
++++ b/Source/Core/UICommon/UICommon.cpp
+@@ -348,7 +348,7 @@ void SetUserDirectory(std::string custom_path)
+     //    -> Use GetExeDirectory()/User
+     // 2. $DOLPHIN_EMU_USERPATH is set
+     //    -> Use $DOLPHIN_EMU_USERPATH
+-    // 3. ~/.dolphin-emu directory exists
++    // 3. ~/.dolphin-emu directory exists, and we're not in flatpak
+     //    -> Use ~/.dolphin-emu
+     // 4. Default
+     //    -> Use XDG basedir, see
+@@ -381,7 +381,7 @@ void SetUserDirectory(std::string custom_path)
+     {
+       user_path = home_path + "." DOLPHIN_DATA_DIR DIR_SEP;
+ 
+-      if (!File::Exists(user_path))
++      if (File::Exists("/.flatpak-info") || !File::Exists(user_path))
+       {
+         const char* data_home = getenv("XDG_DATA_HOME");
+         std::string data_path =
+-- 
+2.37.1
+
diff --git a/rd-submodules/primehack/nodirtyversion.patch b/rd-submodules/primehack/nodirtyversion.patch
new file mode 100644
index 00000000..20b6f3c1
--- /dev/null
+++ b/rd-submodules/primehack/nodirtyversion.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9af66009a1..2acd3bed9a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -149,7 +149,7 @@ if(GIT_FOUND)
+       OUTPUT_VARIABLE DOLPHIN_WC_REVISION
+       OUTPUT_STRIP_TRAILING_WHITESPACE)
+   # defines DOLPHIN_WC_DESCRIBE
+-  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
++  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long
+       OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
+       OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 

From 9039cb836f82c1f47c689ac8b7562f2063807286 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Fri, 13 Oct 2023 08:39:47 +0200
Subject: [PATCH 17/18] PRIMEHACK: testing a patch

---
 net.retrodeck.retrodeck.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 2213991c..0d8f9c25 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -960,14 +960,17 @@ modules:
       - -DENABLE_SDL=ON
       - -DENABLE_EVDEV=ON
       - -DDISTRIBUTOR=Flathub
+      - -DQT_DIR=
     cleanup:
       - /share/man
     post-install:
       - install -D primehack-wrapper /app/bin/primehack-wrapper
     sources:
       - type: git
-        url: https://github.com/TheDrifter363/primehack.git
-        commit: 6295c695307a67f11ee202b05cbdd7b5c1edae5c
+        url: https://github.com/XargonWan/primehack
+        commit: af7710ef7b04a632b4294eae5e0eff8fe9c4d1f8
+        #url: https://github.com/TheDrifter363/primehack.git
+        #commit: 6295c695307a67f11ee202b05cbdd7b5c1edae5c
        # detects whether dolphin is running in a flatpak sandbox
        # and makes it use xdg directories if it is.
        # prevents dolphin from attempting to write conf files

From 9e2b59c4e48557f6caac6c8c9c907c95a4937bea Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Fri, 13 Oct 2023 11:16:21 +0200
Subject: [PATCH 18/18] QT6: failing on cleanup commands

---
 net.retrodeck.retrodeck.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 0d8f9c25..3fdaa519 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -61,9 +61,9 @@ cleanup:
   # XMLSTARLET
   - /lib/debug
   - /share/runtime
-cleanup-commands:
+#cleanup-commands:
   # Yuzu
-  - /app/cleanup-BaseApp.sh
+  #- /app/cleanup-BaseApp.sh
 
 modules: