summaryrefslogtreecommitdiff
path: root/games/melonds/files
diff options
context:
space:
mode:
Diffstat (limited to 'games/melonds/files')
-rw-r--r--games/melonds/files/patch-backport-43d091361e25
-rw-r--r--games/melonds/files/patch-backport-e6cc4b14b032
2 files changed, 0 insertions, 57 deletions
diff --git a/games/melonds/files/patch-backport-43d091361e b/games/melonds/files/patch-backport-43d091361e
deleted file mode 100644
index 0eaa9e42bbae..000000000000
--- a/games/melonds/files/patch-backport-43d091361e
+++ /dev/null
@@ -1,25 +0,0 @@
-From 43d091361ed6b400a68911147fd5fe524ccecf34 Mon Sep 17 00:00:00 2001
-From: RSDuck <RSDuck@users.noreply.github.com>
-Date: Fri, 25 Nov 2022 23:47:36 +0100
-Subject: [PATCH] fix #1551
-
----
- src/frontend/duckstation/duckstation_compat.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/frontend/duckstation/duckstation_compat.h src/frontend/duckstation/duckstation_compat.h
-index a661e926..fed37805 100644
---- src/frontend/duckstation/duckstation_compat.h
-+++ src/frontend/duckstation/duckstation_compat.h
-@@ -12,6 +12,6 @@
-
- #define Panic(msg) assert(false && msg)
-
--#define UnreachableCode() __builtin_unreachable
-+#define UnreachableCode() __builtin_unreachable()
-
- #endif
-\ No newline at end of file
---
-2.41.0
-
diff --git a/games/melonds/files/patch-backport-e6cc4b14b0 b/games/melonds/files/patch-backport-e6cc4b14b0
deleted file mode 100644
index 91ec9e0976a0..000000000000
--- a/games/melonds/files/patch-backport-e6cc4b14b0
+++ /dev/null
@@ -1,32 +0,0 @@
-From e6cc4b14b0eb603001e968be9b1ace8a09e1bce1 Mon Sep 17 00:00:00 2001
-From: Nadia Holmquist Pedersen <nadia@nhp.sh>
-Date: Sun, 16 Jul 2023 15:46:50 +0200
-Subject: [PATCH] Work around a strange bug in Qt5 that causes melonDS to crash
- on launch
-
-...but only with LTO enabled
-...but only on some UNIX systems
-...but only with some additional build options except when it breaks
- without any as well
----
- src/frontend/qt_sdl/CMakeLists.txt | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git src/frontend/qt_sdl/CMakeLists.txt src/frontend/qt_sdl/CMakeLists.txt
-index 0ae6ecea..24261030 100644
---- src/frontend/qt_sdl/CMakeLists.txt
-+++ src/frontend/qt_sdl/CMakeLists.txt
-@@ -222,4 +222,10 @@ if (UNIX AND NOT APPLE)
-
- install(FILES ${CMAKE_SOURCE_DIR}/res/net.kuribo64.melonDS.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
- install(TARGETS melonDS BUNDLE DESTINATION ${CMAKE_BINARY_DIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-+
-+ if (NOT USE_QT6)
-+ set_target_properties(melonDS PROPERTIES
-+ INTERPROCEDURAL_OPTIMIZATION OFF
-+ INTERPROCEDURAL_OPTIMIZATION_RELEASE OFF)
-+ endif()
- endif()
---
-2.41.0
-