summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorGanael LAPLANCHE <martymac@FreeBSD.org>2023-01-04 12:32:28 +0100
committerGanael LAPLANCHE <martymac@FreeBSD.org>2023-01-16 12:29:02 +0100
commita8fc4f020b26efff7faf9608653242d162bb89b4 (patch)
treee32e959ae4377a67543032683a64d1bb5de23a46 /emulators
parentsysutils/bsdisks: Update to 0.29 (diff)
emulators/dolphin-emu: Fix build after fmt update
Import patch from upstream to follow changes introduced with fmt 9.0.0. (cherry picked from commit 7780472b9bace927812a288f875550d13e90c34e)
Diffstat (limited to 'emulators')
-rw-r--r--emulators/dolphin-emu/files/patch-Source-Core-Common-MsgHandler.h32
1 files changed, 32 insertions, 0 deletions
diff --git a/emulators/dolphin-emu/files/patch-Source-Core-Common-MsgHandler.h b/emulators/dolphin-emu/files/patch-Source-Core-Common-MsgHandler.h
new file mode 100644
index 000000000000..0e2673dbdece
--- /dev/null
+++ b/emulators/dolphin-emu/files/patch-Source-Core-Common-MsgHandler.h
@@ -0,0 +1,32 @@
+commit 66f330e57316257fe81b46f57dad22ea6dee7bae
+Author: Christopher Rudolph <rudolchr@b-tu.de>
+Date: Sat Jul 9 17:02:09 2022 +0200
+
+ Add a check for libfmt version so that in case libfmt-9 is used the function is_compile_string is called under it's new namespace
+
+--- Source/Core/Common/MsgHandler.h.orig 2022-07-06 07:23:55 UTC
++++ Source/Core/Common/MsgHandler.h
+@@ -41,7 +41,11 @@ bool MsgAlertFmt(bool yes_no, MsgType style, Common::L
+ static_assert(NumFields == sizeof...(args),
+ "Unexpected number of replacement fields in format string; did you pass too few or "
+ "too many arguments?");
++#if FMT_VERSION >= 90000
++ static_assert(fmt::detail::is_compile_string<S>::value);
++#else
+ static_assert(fmt::is_compile_string<S>::value);
++#endif
+ return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format,
+ fmt::make_format_args(args...));
+ }
+@@ -56,7 +60,11 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, Common::
+ static_assert(NumFields == sizeof...(args),
+ "Unexpected number of replacement fields in format string; did you pass too few or "
+ "too many arguments?");
++#if FMT_VERSION >= 90000
++ static_assert(fmt::detail::is_compile_string<S>::value);
++#else
+ static_assert(fmt::is_compile_string<S>::value);
++#endif
+ auto arg_list = fmt::make_format_args(args...);
+ return MsgAlertFmtImpl(yes_no, style, log_type, file, line, translated_format, arg_list);
+ }