From nobody Mon Jan 16 11:30:07 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NwVDw1JmXz2p8F7; Mon, 16 Jan 2023 11:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NwVDw0sG0z41b7; Mon, 16 Jan 2023 11:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673868608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ea9Bry42U7bCJj51hT9qjTeHjGC31jHOOkVm9tgzx9E=; b=Rsg7eGoL9URw5rIQOO/8LFsf3vag/jTYcVG+uNbIDuOP1T01LzI5kLc3zTsc0bDInCwu09 xkK4DKJHXvC6B2Jk/ftqFGks7pzg+iy9x7dMt1se38qB9upK4gXLDnMmKf5wRABD/yCECK WfO9G304MimpH+1Vf2qaLBki2OdcLRUAFxuIn7nMwiizhBs5XTpG4Q6lC98+1OFVGBcrTB jgU3LqkV+tolzJiv+Zp93KsjOOclr7FCvoDeXzcIBzFgSFsU5qtekZI1LzNe9nmRkg6yY2 UB2QvF9154/ReKGjQUE2l/oBy0vwP0U26gCjIoCspo2TsmtFiqCQk2/pu0dtkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673868608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ea9Bry42U7bCJj51hT9qjTeHjGC31jHOOkVm9tgzx9E=; b=k4BU3THn9OkHC//dvrf3JfyLxaczVZ8wMVZPqfbRn/bYMxAyKOz3U30fEjzUYh1jya4ZXh XtlemFkSQoiilBTl2UGRhYam1asKWM2zXl/yjSbvPqMUL92WHZDKuYQymFSpANMYiQf65D 326yMAgU3s6ReHaPmsRY/dft4r+5WytainF7NyR/zfiWj1rjF1W/D7dLhH1Bg/ZSjoVy6w 74pHzy97By8oQx8LfzBaAIMwFTccVKHeWicDAdzBc9UwHdm4Mkiij+BtohND6qkNzKj9IC E04rjMPzJWc+dBhQHWMRw0uNlb7p9M+P4QSGPzXnBAVFMYC9lb0ViGQGtob1UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673868608; a=rsa-sha256; cv=none; b=cWRlbzn3HNKVPeM/J0LRQ8BXk/9u+lm82EGrJNdt6M0jnCPZ0aeCO3S5uBYWx4GKfvtuVb 5446aIPmevXoZKzSwQHB9C9DhGCFpKEjArCIbl6lq4KomW9uIaxwTU8M396y4n3q7lHLfS ydSYw7BIDsoaBrVNhL6b48WNvmtx7rDoNNg/T0X/GTAC3ub9Ltny16ZZ2XZiaQvamZGrer tDaxfOj2kLIpv0JoNkP2v4WnI2b7j2da1nvgNntimWh/hQnHi+BS2xzyjBkR+7EeRU8FgM kOMeFj5t3JnWbLnCyZy4ibCDt5ZLDxCcW8dw521wVZoMddI3yY5JjYoSQ6OqSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NwVDv71yzz14ZN; Mon, 16 Jan 2023 11:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30GBU7vD081889; Mon, 16 Jan 2023 11:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30GBU7u5081886; Mon, 16 Jan 2023 11:30:07 GMT (envelope-from git) Date: Mon, 16 Jan 2023 11:30:07 GMT Message-Id: <202301161130.30GBU7u5081886@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Ganael LAPLANCHE Subject: git: a8fc4f020b26 - 2023Q1 - emulators/dolphin-emu: Fix build after fmt update List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: a8fc4f020b26efff7faf9608653242d162bb89b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=a8fc4f020b26efff7faf9608653242d162bb89b4 commit a8fc4f020b26efff7faf9608653242d162bb89b4 Author: Ganael LAPLANCHE AuthorDate: 2023-01-04 11:32:28 +0000 Commit: Ganael LAPLANCHE CommitDate: 2023-01-16 11:29:02 +0000 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) --- .../files/patch-Source-Core-Common-MsgHandler.h | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) 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 +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::value); ++#else + static_assert(fmt::is_compile_string::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::value); ++#else + static_assert(fmt::is_compile_string::value); ++#endif + auto arg_list = fmt::make_format_args(args...); + return MsgAlertFmtImpl(yes_no, style, log_type, file, line, translated_format, arg_list); + }