From 6501ca7120684b22026c7f02d189ccf90c27dfad Mon Sep 17 00:00:00 2001 From: Kimpe Andy Date: Fri, 2 Feb 2024 07:13:26 +0100 Subject: [PATCH] Create desmume-0.9.13-tinyxml.patch --- snap/patches/desmume-0.9.13-tinyxml.patch | 43 +++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 snap/patches/desmume-0.9.13-tinyxml.patch diff --git a/snap/patches/desmume-0.9.13-tinyxml.patch b/snap/patches/desmume-0.9.13-tinyxml.patch new file mode 100644 index 000000000..3acf8fc7e --- /dev/null +++ b/snap/patches/desmume-0.9.13-tinyxml.patch @@ -0,0 +1,43 @@ +diff -durN desmume-release_0_9_13.orig/desmume/src/frontend/posix/meson.build desmume-release_0_9_13/desmume/src/frontend/posix/meson.build +--- desmume-release_0_9_13.orig/desmume/src/frontend/posix/meson.build 2022-05-23 06:37:41.000000000 +0200 ++++ desmume-release_0_9_13/desmume/src/frontend/posix/meson.build 2022-06-18 19:22:06.688637556 +0200 +@@ -15,6 +15,7 @@ + dep_pcap = dependency('pcap') + dep_zlib = dependency('zlib') + dep_threads = dependency('threads') ++dep_tinyxml = dependency('tinyxml') + dep_gl = dependency('gl', required: false) + dep_openal = dependency('openal', required: get_option('openal')) + dep_alsa = dependency('alsa', required: false) +@@ -28,7 +29,7 @@ + add_global_arguments('-DEXPERIMENTAL_WIFI_COMM', language: ['c', 'cpp']) + endif + +-dependencies = [dep_glib2, dep_sdl, dep_pcap, dep_zlib, dep_threads] ++dependencies = [dep_glib2, dep_sdl, dep_pcap, dep_zlib, dep_threads, dep_tinyxml] + + if target_machine.cpu() == 'x86_64' + add_global_arguments('-DHAVE_JIT', language: ['c', 'cpp']) +@@ -99,10 +100,6 @@ + '../../utils/libfat/libfat_public_api.cpp', + '../../utils/libfat/lock.cpp', + '../../utils/libfat/partition.cpp', +- '../../utils/tinyxml/tinystr.cpp', +- '../../utils/tinyxml/tinyxml.cpp', +- '../../utils/tinyxml/tinyxmlerror.cpp', +- '../../utils/tinyxml/tinyxmlparser.cpp', + '../../utils/colorspacehandler/colorspacehandler.cpp', + '../../addons/slot2_auto.cpp', '../../addons/slot2_mpcf.cpp', '../../addons/slot2_paddle.cpp', '../../addons/slot2_gbagame.cpp', '../../addons/slot2_none.cpp', '../../addons/slot2_rumblepak.cpp', '../../addons/slot2_guitarGrip.cpp', '../../addons/slot2_expMemory.cpp', '../../addons/slot2_piano.cpp', '../../addons/slot2_passme.cpp', '../../addons/slot1_none.cpp', '../../addons/slot1_r4.cpp', '../../addons/slot1_retail_nand.cpp', '../../addons/slot1_retail_auto.cpp', '../../addons/slot1_retail_mcrom.cpp', '../../addons/slot1_retail_mcrom_debug.cpp', '../../addons/slot1comp_mc.cpp', '../../addons/slot1comp_rom.cpp', '../../addons/slot1comp_protocol.cpp', + '../../cheatSystem.cpp', +diff -durN desmume-release_0_9_13.orig/desmume/src/utils/advanscene.cpp desmume-release_0_9_13/desmume/src/utils/advanscene.cpp +--- desmume-release_0_9_13.orig/desmume/src/utils/advanscene.cpp 2022-05-23 06:37:41.000000000 +0200 ++++ desmume-release_0_9_13/desmume/src/utils/advanscene.cpp 2022-06-18 19:14:40.054101672 +0200 +@@ -19,7 +19,7 @@ + #include + + #define TIXML_USE_STL +-#include "tinyxml/tinyxml.h" ++#include + + #include "advanscene.h" + #include "../common.h"