From c4da64813b9661abb36415eb87fde8f66323f0b9 Mon Sep 17 00:00:00 2001
From: Xargon Wan <xargonwan@gmail.com>
Date: Mon, 2 May 2022 21:47:47 +0900
Subject: [PATCH] Temporarly removed Primehack as it cannot coexhist with
 Dolphin

---
 net.retrodeck.retrodeck.yml | 70 ++++++++++++++++++-------------------
 tools/start-dolphin.sh      |  2 +-
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 71d4e54b..b9dcea4f 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -879,41 +879,41 @@ modules:
   
   # PRIMEHACK - START
   # https://github.com/flathub/io.github.shiiion.primehack
-
-  - name: primehack
-    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 dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper
-      - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
-    sources:
-      - type: git
-        url: https://github.com/shiiion/dolphin.git
-        commit: 9ca0eb888bd6f8ed13a4efb92d808fbf0705ffa4
-      # 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/primehack/detectflatpak.patch
-      # version strings must match exactly for online multiplayer
-      - type: patch
-        path: rd-submodules/primehack/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
+  # Disabled because it's overwriting Dolphin
+  # - name: primehack
+  #   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 dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper
+  #     - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
+  #   sources:
+  #     - type: git
+  #       url: https://github.com/shiiion/dolphin.git
+  #       commit: 9ca0eb888bd6f8ed13a4efb92d808fbf0705ffa4
+  #     # 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/primehack/detectflatpak.patch
+  #     # version strings must match exactly for online multiplayer
+  #     - type: patch
+  #       path: rd-submodules/primehack/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
 
   # PRIMEHACK - END
 
diff --git a/tools/start-dolphin.sh b/tools/start-dolphin.sh
index ed58102f..e5943836 100644
--- a/tools/start-dolphin.sh
+++ b/tools/start-dolphin.sh
@@ -3,5 +3,5 @@
 kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?"
 if [ $? == 0 ]
 then
-    dolphin-qt
+    dolphin-emu
 fi
\ No newline at end of file