From 6f5a900d7a3edda1bf41b2506a7ab6f850cf63f4 Mon Sep 17 00:00:00 2001
From: Carles Pastor <cpbadosa@gmail.com>
Date: Wed, 4 Sep 2024 23:01:57 +0200
Subject: [PATCH] Dropping the patches, they are already upstream

---
 detectflatpak.patch            | 34 ----------------------------------
 nodirtyversion.patch           | 13 -------------
 org.DolphinEmu.dolphin-emu.yml | 10 ----------
 3 files changed, 57 deletions(-)
 delete mode 100644 detectflatpak.patch
 delete mode 100644 nodirtyversion.patch

diff --git a/detectflatpak.patch b/detectflatpak.patch
deleted file mode 100644
index 60dd1a2..0000000
--- a/detectflatpak.patch
+++ /dev/null
@@ -1,34 +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
-
diff --git a/nodirtyversion.patch b/nodirtyversion.patch
deleted file mode 100644
index 583edbb..0000000
--- a/nodirtyversion.patch
+++ /dev/null
@@ -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)
- 
diff --git a/org.DolphinEmu.dolphin-emu.yml b/org.DolphinEmu.dolphin-emu.yml
index 82ac848..db11994 100644
--- a/org.DolphinEmu.dolphin-emu.yml
+++ b/org.DolphinEmu.dolphin-emu.yml
@@ -91,16 +91,6 @@ modules:
           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: detectflatpak.patch
-      # version strings must match exactly for online multiplayer
-      - type: patch
-        path: nodirtyversion.patch
       - type: file
         path: org.DolphinEmu.dolphin-emu.metainfo.xml
       - type: script