cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emulators/dolphin-emu: Fix build after fmt update

Browse Source 
Import patch from upstream to follow changes introduced with fmt 9.0.0.

(cherry picked from commit 7780472b9b)
This commit is contained in:
Ganael LAPLANCHE 2023-01-04 12:32:28 +01:00
parent 184d4a26fe
commit a8fc4f020b
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
emulators/dolphin-emu/files/patch-Source-Core-Common-MsgHandler.h Normal file
View File

@ -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);
}