From nobody Wed Jan 04 11:36:59 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 4Nn6yN1sbWz2nyXQ; Wed, 4 Jan 2023 11:37:00 +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 4Nn6yN1KvWz3Nfw; Wed, 4 Jan 2023 11:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672832220; 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=sNgRYyKTAbs2kJL4FEDNm8nW5mAadM2vTkmoqbT/PkE=; b=oZysg2iL+URU4649CALLUIA9f/1zWM/0BCscD3DlxnrlQlKyGnjkBpOVQ9XCd7qz2MaNbE QKQm1w6dw+MVCUmtejRI8TCS2jM+QtL4H/fGpArWqzNpE9nhiZbkhwqEW9MM9vitHtnqoh thNyQFS+duxZoCKqJznm3STxqGx3i7O7m4e3LHH76QSw+vMLhnANIpC83eOO5RTqwJiZIR RRhW4BPoYxCGoklPY51+RQNFJTAHBH3K8FTuV5FYE17K2Z4t8wzw6rklj/hDNQJabidrEk U4RJKqKr17wlWg84LSexvaBBk4sKp5lGVO526xcTvw/emBoTzGj7pqJCZrT+JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672832220; 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=sNgRYyKTAbs2kJL4FEDNm8nW5mAadM2vTkmoqbT/PkE=; b=J6QP6JOarfAUPBEI3zT9wlhusGG6RcetJ545HGNvU52PiZR3824pU5WpfnsWnC6oXnCsmk Iiw2ULq6WlOR+4wda6Q5ix23DGOK700XaAo6X5YixTNsZaJDCtY5ooj/niGWml1oCDC4SZ 1dfjAN2VDbVIHmpu3y26UvibmCTx4wHVoQcZn9ZODu0mhtNUU8CkliksahsOLn0Yr6yKNx s8TwdsUEe4KYir8zmFOgZ+L8EaL0ZOCABp0JR6v833OjJMKRkaLVUPKms1Jc5ovSV99YYF siBWAYObmIKVlzx6Lhj53/1d+j4ycTmCocs4ot0DB5xr8TjDkD2SgXGZiKdThQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672832220; a=rsa-sha256; cv=none; b=NDvNn0DhMbLR9D/+s9DNlXX1HbsEESzdVs1cEvfljNnf29peDqZ6q6FZenOusFHfIyworb gekQjhnGJky/0oUjgabKhbJFNgKiM7N/krJ52nDiNZU/AcD39Ii2wNRDR/WAgDiEVMaf8G wgkUiUKM3WUo1+g29Y0401DFtnzOGwc/4ClJO+RiC3vpJXTsr67FDeOcdQA936SOz0FYVX lLsMwhcmiXN3nGje9ec2K5DvucKGrNPeI1WkNzR4a09R/eCvuWBVB21uqslMs6AQgwjyJN VsAjdQkM+np9B4NwHtTnguBhKp6ctb9/cp0HZVrBwG2g+0SqG5M8Dvc9CZKdOQ== 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 4Nn6yN0C0Rz18dm; Wed, 4 Jan 2023 11:37:00 +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 304Bax4U031371; Wed, 4 Jan 2023 11:36:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 304Baxot031370; Wed, 4 Jan 2023 11:36:59 GMT (envelope-from git) Date: Wed, 4 Jan 2023 11:36:59 GMT Message-Id: <202301041136.304Baxot031370@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 7780472b9bac - main - 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/main X-Git-Reftype: branch X-Git-Commit: 7780472b9bace927812a288f875550d13e90c34e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=7780472b9bace927812a288f875550d13e90c34e commit 7780472b9bace927812a288f875550d13e90c34e Author: Ganael LAPLANCHE AuthorDate: 2023-01-04 11:32:28 +0000 Commit: Ganael LAPLANCHE CommitDate: 2023-01-04 11:32:28 +0000 emulators/dolphin-emu: Fix build after fmt update Import patch from upstream to follow changes introduced with fmt 9.0.0. --- .../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); + }