From 2259ccb75cf9a39a9c2efb35736b6c823254360a Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Tue, 10 Jan 2023 16:25:50 +0000
Subject: [PATCH] DOLPHIN: Updated

---
 net.retrodeck.retrodeck.appdata.xml        |  1 +
 net.retrodeck.retrodeck.yml                | 14 ++++----------
 rd-submodules/dolphin/detectflatpak.patch  |  6 +++---
 rd-submodules/dolphin/nodirtyversion.patch |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index 963182df..27936862 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -76,6 +76,7 @@
           <li>Removed Ryjuinx as it was broken (sorry)</li>
           <li>Yuzu updated to mainline-1301</li>
           <li>Added missing Primehack config and Configurator options</li>
+          <li>Add CLI option to run Configurator directly</li>
           <li>Resized configurator windows</li>
           <li>Fixed a bug where the retrodeck folder was having a symlink creation issue after migration</li>
       </ul>
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 98700bcd..3d6c51ce 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -599,13 +599,14 @@ modules:
     cleanup:
       - /share/man
     post-install:
-      - install -D dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper
+      - install -D -t ${FLATPAK_DEST}/bin/ dolphin-emu-wrapper
+      - install -Dm644 -t ${FLATPAK_DEST}/share/appdata/ org.DolphinEmu.dolphin-emu.appdata.xml
       - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
     sources:
       - type: git
         url: ssh://git@github.com/dolphin-emu/dolphin.git
         #url: https://github.com/dolphin-emu/dolphin.git
-        commit: 48c9c224cf9f82f0f9f2690b7cc6283d7448480c
+        commit: 8bad821019721b9b72701b495da95656ace5fea5
         x-checker-data:
           type: json
           url: https://dolphin-emu.org/update/latest/beta
@@ -630,14 +631,7 @@ modules:
               test -S $XDG_RUNTIME_DIR/discord-ipc-$i ||
                 ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
             done
-            # use gtk3 filechooser on steamdeck
-            bv=`cat /sys/devices/virtual/dmi/id/board_vendor`
-            bv=$bv`cat /sys/devices/virtual/dmi/id/board_name`
-            if [[ $bv == "ValveJupiter" ]]; then
-              QT_QPA_PLATFORMTHEME=gtk3 dolphin-emu "$@"
-            else
-              dolphin-emu "$@"
-            fi
+            dolphin-emu "$@"
         dest-filename: dolphin-emu-wrapper
 
   # Dolphin - END
diff --git a/rd-submodules/dolphin/detectflatpak.patch b/rd-submodules/dolphin/detectflatpak.patch
index d0b0f889..80930684 100644
--- a/rd-submodules/dolphin/detectflatpak.patch
+++ b/rd-submodules/dolphin/detectflatpak.patch
@@ -23,11 +23,11 @@ index 8d9dc2abb8..8a9d39a3d5 100644
 @@ -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
\ No newline at end of file
+-- 
+2.37.1
diff --git a/rd-submodules/dolphin/nodirtyversion.patch b/rd-submodules/dolphin/nodirtyversion.patch
index 20b6f3c1..f20ae789 100644
--- a/rd-submodules/dolphin/nodirtyversion.patch
+++ b/rd-submodules/dolphin/nodirtyversion.patch
@@ -10,4 +10,4 @@ index 9af66009a1..2acd3bed9a 100644
 +  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long
        OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
        OUTPUT_STRIP_TRAILING_WHITESPACE)
- 
+ 
\ No newline at end of file