Merge c8b3955ede into 7ec793ea9a

.github/workflows/cooker-selfhosted.yml

@@ -30,6 +30,7 @@ jobs:
 
   Building_RetroDECK:
     runs-on: self-hosted
+    #runs-on: ubuntu-latest
     steps:
 
       # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317

.gitmodules

@@ -1,9 +0,0 @@
-[submodule "rd-submodules/shared-modules"]
-	path = rd-submodules/shared-modules
-	url = https://github.com/flathub/shared-modules.git
-[submodule "rd-submodules/retroarch"]
-	path = rd-submodules/retroarch
-	url = https://github.com/flathub/org.libretro.RetroArch.git
-[submodule "rd-submodules/ryujinx"]
-	path = rd-submodules/ryujinx
-	url = https://github.com/flathub/org.ryujinx.Ryujinx

README.md

@@ -102,7 +102,7 @@ Read up here on how to help out, there is something for everyone:
 | [RetroDECK-website](https://github.com/XargonWan/RetroDECK-website)  | Where our website source code is |
 | [RetroDECK on Flathub](https://github.com/flathub/net.retrodeck.retrodeck) | Our little space in Flathub's organization                 |
 | [RetroDECK-MAME](https://github.com/XargonWan/RetroDECK-MAME)   | MAME is big to build, so it's pre-built here and then imported in the build |
-| [RetroDECK-ES-DE](https://github.com/XargonWan/RetroDECK-ES-DE)  | This is where we store our patched fork of ES-DE          |
+| [RetroDECK-ES-DE](https://github.com/RetroDECK/ES-DE)  | This is where we store our patched fork of ES-DE          |
 
 
 # The RetroDECK Wiki

automation_tools/automation_task_list.cfg

@@ -1,6 +1,7 @@
 # The proper format for this file is
 # ACTION^PLACEHOLDERTEXT^URL^REPO(Optional)
 # hash^DOOMSHAPLACEHOLDER^https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip
+# Please leave some newlines in the end of this file or it will break
 #hash^DUCKSTATIONSHAPLACEHOLDER^https://github.com/stenzek/duckstation/releases/download/preview/DuckStation-x64.AppImage
 hash^SAMEDUCKSHAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/latest/sameduck_libretro.so.zip
 hash^PPSSPPBIOSHASHPLACEHOLDER^https://github.com/hrydgard/ppsspp/archive/refs/heads/master.zip
@@ -10,6 +11,21 @@ hash^VITA3KSHAPLACEHOLDER^https://github.com/Vita3K/Vita3K/releases/download/con
 hash^RANIGHTLYCORESPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/RetroArch_cores.7z
 hash^RETRODECKMAMEPLACEHOLDER^"https://github.com/XargonWan/RetroDECK-MAME/releases/download/$(curl -s https://api.github.com/repos/XargonWan/RetroDECK-MAME/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-MAME-Artifact.tar.gz"
 url^RETRODECKMAMEURLPLACEHOLDER^"https://github.com/XargonWan/RetroDECK-MAME/releases/download/$(curl -s https://api.github.com/repos/XargonWan/RetroDECK-MAME/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-MAME-Artifact.tar.gz"
+url^RETRODECKESDEURLPLACEHOLDER^"https://github.com/RetroDECK/ES-DE/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/ES-DE/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-ES-DE-Artifact.tar.gz"
+hash^RETRODECKESDEPLACEHOLDER^"https://github.com/RetroDECK/ES-DE/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/ES-DE/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-ES-DE-Artifact.tar.gz"
+url^RETRODECKPPSSPPURL^"https://github.com/RetroDECK/org.ppsspp.PPSSPP/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/org.ppsspp.PPSSPP/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-PPSSPP-Artifact.tar.gz"
+hash^RETRODECKPPSSPPHASH^"https://github.com/RetroDECK/org.ppsspp.PPSSPP/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/org.ppsspp.PPSSPP/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-PPSSPP-Artifact.tar.gz"
+url^RETRODECKDOLPHINURLPLACEHOLDER^"https://github.com/RetroDECK/org.DolphinEmu.dolphin-emu/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/org.DolphinEmu.dolphin-emu/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-dolphin-Artifact.tar.gz"
+hash^RETRODECKDOLPHINPLACEHOLDER^"https://github.com/RetroDECK/org.DolphinEmu.dolphin-emu/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/org.DolphinEmu.dolphin-emu/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-dolphin-Artifact.tar.gz"
+url^RETRODECKSOLARUSURLPLACEHOLDER^"https://github.com/RetroDECK/org.solarus_games.solarus.Launcher/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/org.solarus_games.solarus.Launcher/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-solarus-Artifact.tar.gz"
+hash^RETRODECKSOLARUSPLACEHOLDER^"https://github.com/RetroDECK/org.solarus_games.solarus.Launcher/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/org.solarus_games.solarus.Launcher/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-solarus-Artifact.tar.gz"
+url^RETRODECKPRIMEHACKURLPLACEHOLDER^"https://github.com/RetroDECK/io.github.shiiion.primehack/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/io.github.shiiion.primehack/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-primehack-Artifact.tar.gz"
+hash^RETRODECKPRIMEHACKPLACEHOLDER^"https://github.com/RetroDECK/io.github.shiiion.primehack/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/io.github.shiiion.primehack/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-primehack-Artifact.tar.gz"
+url^RETRODECKGZDOOMSURLPLACEHOLDER^"https://github.com/RetroDECK/org.zdoom.GZDoom/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/org.zdoom.GZDoom/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-gzdoom-Artifact.tar.gz"
+hash^RETRODECKGZDOOMSHASPLACEHOLDER^"https://github.com/RetroDECK/org.zdoom.GZDoom/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/org.zdoom.GZDoom/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-gzdoom-Artifact.tar.gz"
+url^RETRODECKMELONDSURLPLACEHOLDER^"https://github.com/RetroDECK/net.kuribo64.melonDS/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/net.kuribo64.melonDS/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-melonds-Artifact.tar.gz"
+hash^RETRODECKMELONDSSHAPLACEHOLDER^"https://github.com/RetroDECK/net.kuribo64.melonDS/releases/download/$(curl -s https://api.github.com/repos/RetroDECK/net.kuribo64.melonDS/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-melonds-Artifact.tar.gz"
 latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main
 outside_file^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid
 branch^THISBRANCH
+hash^RASHAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/RetroArch.7z

developer_toolbox/build_retrodeck_locally.sh

@@ -4,7 +4,7 @@
 
 # Check if script is running with elevated privileges
 if [ "$EUID" -ne 0 ]; then
-    echo "The build might fail without some superuser permissions, please run me with sudo. Continue without sudo? [y/N,]"
+    echo "The build might fail without some superuser permissions, please run me with sudo. Continue without sudo? [y/N]"
     read -r continue_without_sudo
     if [[ "$continue_without_sudo" != "y" ]]; then
         exit 1

functions/050_save_migration.sh

@@ -6,8 +6,8 @@ save_migration() {
   then
     # ROMs on SD card
     roms_folder="$default_sd/retrodeck/roms"
-    if [[ ! -L $rdhome && ! -L $rdhome/roms ]]; then # Add a roms folder symlink back to ~/retrodeck if missing, to fix things like PS2 autosaves until user migrates whole ~retrodeck directory
+    if [[ ! -L "$rdhome" && ! -L "$rdhome/roms" ]]; then # Add a roms folder symlink back to ~/retrodeck if missing, to fix things like PS2 autosaves until user migrates whole ~retrodeck directory
-      ln -s $roms_folder $rdhome/roms
+      ln -s $roms_folder "$rdhome/roms"
     fi
   else
     # ROMs on Internal
@@ -30,7 +30,7 @@ save_migration() {
   # Doing the dir prep as we don't know from which version we came
   dir_prep "$media_folder" "/var/config/ES-DE/downloaded_media"
   dir_prep "$themes_folder" "/var/config/ES-DE/themes"
-  create_dir $rdhome/logs #this was added later, maybe safe to remove in a few versions
+  create_dir "$rdhome/logs" #this was added later, maybe safe to remove in a few versions
 
   # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed
   cp -fv /app/retrodeck/es_settings.xml /var/config/ES-DE/settings/es_settings.xml
@@ -39,13 +39,13 @@ save_migration() {
   # Perform save and state migration if needed
 
   # Moving PCSX2 Saves
-  mv -fv /var/config/PCSX2/sstates/* $rdhome/states/ps2/pcsx2
+  mv -fv /var/config/PCSX2/sstates/* "$rdhome/states/ps2/pcsx2"
-  mv -fv /var/config/PCSX2/memcards/* $rdhome/saves/ps2/memcards
+  mv -fv /var/config/PCSX2/memcards/* "$rdhome/saves/ps2/memcards"
 
   # Moving Citra saves from legacy location to 0.5.0b structure
 
-  mv -fv $rdhome/saves/Citra/* $rdhome/saves/n3ds/citra
+  mv -fv "$rdhome/saves/Citra/"* "$rdhome/saves/n3ds/citra"
-  rmdir $rdhome/saves/Citra # Old folder cleanup
+  rmdir "$rdhome/saves/Citra" # Old folder cleanup
 
   versionwheresaveschanged="0.4.5b" # Hardcoded break point between unsorted and sorted saves
 
@@ -71,9 +71,9 @@ save_migration() {
     current_dest_folder=
     gamestoskip=
 
-    tar -C $rdhome -czf $save_backup_file saves # Backup save directory for safety
+    tar -C "$rdhome" -czf $save_backup_file saves # Backup save directory for safety
     log i "Saves backed up to" $save_backup_file $migration_logfile
-    tar -C $rdhome -czf $state_backup_file states # Backup state directory for safety
+    tar -C "$rdhome" -czf $state_backup_file states # Backup state directory for safety
     log i "States backed up to" $state_backup_file $migration_logfile
 
     (

functions/global.sh

@@ -2,6 +2,9 @@
 
 # This file is containing some global function needed for the script such as the config file tools
 
+# pathing the retrodeck components provided libraries
+export LD_LIBRAY_PATH="$LD_LIBRAY_PATH:/app/retrodeck/lib/"
+
 source /app/libexec/050_save_migration.sh
 source /app/libexec/checks.sh
 source /app/libexec/compression.sh

net.retrodeck.retrodeck.appdata.xml

@@ -67,6 +67,19 @@
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
+      <release version="0.9.0b" date="2024-07-19">
+         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.9.0b</url>
+         <description>
+            <p>Changes:</p>
+            <ul>
+               <li>WELCOME TO cooker-0.9.0b!</li>
+            </ul>
+            <p>Known issues:</p>
+            <ul>
+               <li>Please check the know issues in the Wiki under General Information.</li>
+            </ul>
+         </description>
+      </release>
       <release version="0.8.2b" date="2024-07-17">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.2b</url>
          <description>

old/removed-modules.yml

@@ -173,3 +173,181 @@
       path: rd-submodules/ryujinx/ryujinx-wrapper
 
   # Ryujinx - END
+
+  # Needed from ES-DE 2.1.0+
+  - name: libpoppler-glib
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DENABLE_BOOST=OFF
+    sources:
+      - type: archive
+        # original link not working, found a mirror
+        url: https://poppler.freedesktop.org/poppler-22.11.0.tar.xz
+        #url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2
+        sha256: 093ba9844ed774285517361c15e21a31ba4df278a499263d4403cca74f2da828
+    cleanup:
+      - /lib/pkgconfig
+      - /include
+      - '*.a'
+      - '*.la'
+
+
+  # dependency of: XEMU, MelonDS (4.7.0)
+  - name: libslirp
+    buildsystem: meson
+    cleanup:
+      - /include
+    sources:
+      - type: archive
+        url: https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v4.8.0/libslirp-v4.8.0.tar.gz
+        sha256: 2a98852e65666db313481943e7a1997abff0183bd9bea80caec1b5da89fda28c
+        x-checker-data:
+          type: anitya
+          project-id: 96796
+          stable-only: true
+          url-template: https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v$version/libslirp-v$version.tar.gz
+
+  # dependency of: CEMU (1.0.26), DOLPHIN (1.0.27)
+  - name: libusb
+    config-opts:
+      - --disable-static
+    cleanup:
+      - /include
+      - /lib/*.la
+      - /lib/pkgconfig
+    sources:
+      - type: archive
+        url: https://github.com/libusb/libusb/releases/download/v1.0.27/libusb-1.0.27.tar.bz2
+        sha256: ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575
+        x-checker-data:
+          type: anitya
+          project-id: 1749
+          stable-only: true
+          url-template: https://github.com/libusb/libusb/releases/download/v$version/libusb-$version.tar.bz2
+
+    # Dolphin - START
+  # why from source: AppImage not provided, only Flatpak
+  # https://github.com/flathub/org.DolphinEmu.dolphin-emu
+  # WHEN UPADTING: remember to update rd-submodules/dolphin contents
+
+  - name: xdg-screensaver-shim
+    buildsystem: meson
+    sources:
+      - type: archive
+        url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz
+        sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399
+
+  - name: dolphin-emu
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DENABLE_ALSA=OFF
+      - -DENABLE_SDL=ON
+      - -DENABLE_EVDEV=ON
+      - -DDISTRIBUTOR=Flathub
+    cleanup:
+      - /share/man
+    post-install:
+      - install -D -t ${FLATPAK_DEST}/bin/ dolphin-emu-wrapper
+      - sed -i -e 's/viewBox="0 0 1024.02 571.29"/viewBox="0 -285.645 1024 1024" width="2048"
+        height="2048"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
+    sources:
+      - type: git
+        # Sometimes Dolphin or its submodules clone are failing in https so it must done in ssh
+        # fatal: remote transport reported error
+        # url: ssh://git@github.com/dolphin-emu/dolphin.git
+        url: https://github.com/dolphin-emu/dolphin.git
+        commit: cc3ff347b437fd80f3a2880d1bbc7ba2d5f191f4
+        # x-checker-data:
+        #   type: json
+        #   url: https://dolphin-emu.org/update/latest/beta
+        #   commit-query: .hash
+        #   version-query: .shortrev
+        #   timestamp-query: .date
+        #   is-main-source: true
+      # 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
+      # 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
+      # version strings must match exactly for online multiplayer
+      - type: patch
+        path: rd-submodules/dolphin/nodirtyversion.patch
+      - type: script
+        commands:
+          - |
+            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
+            dolphin-emu "$@"
+        dest-filename: dolphin-emu-wrapper
+
+  - name: universal_dynamic_input
+    buildsystem: simple
+    build-commands:
+      - mkdir -p ${FLATPAK_DEST}/retrodeck/extras/DynamicInputTextures
+      - cp -rf * ${FLATPAK_DEST}/retrodeck/extras/DynamicInputTextures/
+    sources:
+      - type: git
+        url: https://github.com/Venomalia/UniversalDynamicInput.git
+        commit: UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER
+
+  # Dolphin - END
+
+  # SOLARUS - START
+  # why from source: they only provide a snap
+  # https://github.com/flathub/org.solarus_games.solarus.Launcher
+
+  - name: luajit
+    no-autogen: true
+    cleanup:
+      - /bin
+      - /lib/*.a
+      - /include
+      - /lib/pkgconfig
+      - /share/man
+    sources:
+      - type: archive
+        url: https://luajit.org/download/LuaJIT-2.0.5.tar.gz
+        sha256: 874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979
+      - type: shell
+        commands:
+          - sed -i 's|/usr/local|/app|' ./Makefile
+
+  - name: libmodplug
+    cleanup:
+      - /include
+    sources:
+      - type: archive
+        url: https://download.sourceforge.net/project/modplug-xmms/libmodplug/0.8.9.0/libmodplug-0.8.9.0.tar.gz
+        sha512: 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
+
+  - name: physfs
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DPHYSFS_BUILD_TEST=OFF
+    sources:
+      - type: archive
+        url: https://icculus.org/physfs/downloads/physfs-3.0.2.tar.bz2
+        sha256: 304df76206d633df5360e738b138c94e82ccf086e50ba84f456d3f8432f9f863
+        size: 194888
+        x-checker-data:
+          type: anitya
+          project-id: 3631
+          url-template: https://icculus.org/physfs/downloads/physfs-$version.tar.bz2
+
+  - name: solarus
+    buildsystem: cmake-ninja
+    builddir: true
+    config-opts:
+      - -DSOLARUS_GUI=OFF
+    sources:
+      - type: git
+        url: https://gitlab.com/solarus-games/solarus.git
+        tag: v1.6.5
+        commit: 3aec70b0556a8d7aed7903d1a3e4d9a18c5d1649
+
+  # SOLARUS - END

rd-submodules/dolphin/detectflatpak.patch

@@ -1,33 +0,0 @@
-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

rd-submodules/dolphin/nodirtyversion.patch

@@ -1,13 +0,0 @@
-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
--  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)
- 

rd-submodules/melonds/hotkeys.patch

@@ -1,18 +0,0 @@
-diff -au1r melonDS/src/frontend/qt_sdl/main.cpp melonDS/src/frontend/qt_sdl/main.cpp
---- melonDS/src/frontend/qt_sdl/main.cpp	2023-05-06 17:27:24.822375255 +0200
-+++ melonDS/src/frontend/qt_sdl/main.cpp	2023-05-06 17:47:19.587498189 +0200
-@@ -1467,3 +1467,3 @@
-             actSaveState[0] = submenu->addAction("File...");
--            actSaveState[0]->setShortcut(QKeySequence(Qt::ShiftModifier | Qt::Key_F9));
-+            actSaveState[0]->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_S));
-             actSaveState[0]->setData(QVariant(0));
-@@ -1483,3 +1483,3 @@
-             actLoadState[0] = submenu->addAction("File...");
--            actLoadState[0]->setShortcut(QKeySequence(Qt::Key_F9));
-+            actLoadState[0]->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_A));
-             actLoadState[0]->setData(QVariant(0));
-@@ -1489,3 +1489,3 @@
-         actUndoStateLoad = menu->addAction("Undo state load");
--        actUndoStateLoad->setShortcut(QKeySequence(Qt::Key_F12));
-+        actUndoStateLoad->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_8));
-         connect(actUndoStateLoad, &QAction::triggered, this, &MainWindow::onUndoStateLoad);

rd-submodules/primehack/detectflatpak.patch

@@ -1,33 +0,0 @@
-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

rd-submodules/primehack/nodirtyversion.patch

@@ -1,12 +0,0 @@
-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
--  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)

rd-submodules/retroarch

@@ -1 +0,0 @@
-Subproject commit eec4bcca8c9e514467fb62cca4a7b2d12c6a2328

rd-submodules/ryujinx

@@ -1 +0,0 @@
-Subproject commit 41761a7dc36ec8520bdaca796d9d0b1219b66a07

rd-submodules/shared-modules

@@ -1 +0,0 @@
-Subproject commit 782d3cc04ccdd8071017f622d4bacd35faecbd86