From nobody Wed Mar 09 16:42:13 2022 X-Original-To: dev-commits-ports-main@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 02FD61A02E07; Wed, 9 Mar 2022 16:42:14 +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 4KDHzT6ZLhz4fGp; Wed, 9 Mar 2022 16:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646844133; 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=SgfLX01RMrh0uhO6Kth7fiT7cmLo56JQi1lzhBUW4zg=; b=T2MvaSRkCy3FzwMD0aPZXzYX6fGaa7my8sbA6CyAak4Up3z7dMMCW2ZCjWthXX3q4UNDuR n2M3dJsacWZgz618jyzg9iEzuIqvDz2T4L/NXSbnJy4z/oKoaRZTnqHGEZCx/2n9ESCf3H xkUnUJ5pZ46Q+h7QzcrdC6j0Iw7VlnRoMq+9QcGF2Q2JXLHh8/12u/h/e2So7HpDEMmxSD L7TCRcFJSDZW9YKNqRqwwuv4BMNzzNWMIKlBMUwWGlptAMop4aV+ie5FRQutGvpMGBKIno f00nRrbAi6VaMEAHz2Yc/uKFrPgxDuxfcwmio5sevKY748m6NSlID3Oi6hLiSA== 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 C235A1490D; Wed, 9 Mar 2022 16:42:13 +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 229GgDw9025448; Wed, 9 Mar 2022 16:42:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 229GgDk3025447; Wed, 9 Mar 2022 16:42:13 GMT (envelope-from git) Date: Wed, 9 Mar 2022 16:42:13 GMT Message-Id: <202203091642.229GgDk3025447@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 94859b453c20 - main - games/veloren: Fix build with rust 1.59.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94859b453c20464c165432c82d726b5c90a99633 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646844133; 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=SgfLX01RMrh0uhO6Kth7fiT7cmLo56JQi1lzhBUW4zg=; b=foLZJckv7SkhI+Qos83FXNo6uzenGtgb9RJ5vHjpsZnfWWeD7T8sUKS1G4g7FSXqPAq7Bv UvcG7uQQxZQl29qPYNITV+tW5dNhE8caRrqKWGBr48Lkv/cvAhMX1+A3unzaCmyJhOm+sI rSRGnu2byBhsZqLwskXakqovpXXgyidrLVU1trHUWKEhz8P75kZEeX+iw05SWPJsQMvyNg 4fC2kXD+pqeZ85wnzrlQZEsKWtngVBgWjtOMvpe0KIGKq3H6NiaEI3otedBsBsl37iFbfL 7Aw1VvvadQ24vf/Farc0MSCeODcBeeFodoiNeKBfAs5ADwVytks+ajLlACRXPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646844133; a=rsa-sha256; cv=none; b=pm1/HRoQTaKNFp89UKfAUqxXE6YA+s0w3o+TAFVEf7TuzBQ3WuILQT4GgFrMG6eODhrl+b slbgy1aCRFEWPodFI73X6ihyqdPy3xSrGZ1K9v5Sxwncoqs/GEFQbMzditJp9gl+8GM0EI ltGNBwr7+/2ostITQ0NJTxM7k2VppkCDorbmXxTeK0LQE5fUjmjpIrCsHTlx9CGkbrcC+H vbKr/IhobOA+/4COkGy24JoZLXHyqlKmOUOKAXZyJWApJv7NxSn/GkGFNSgceqPrx2SxQ5 NPEZA7Woyw/3xqeofj160YPw+0+dMe+bXGXyK0hlINxNRy9IS6WcMRNgPaK3mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=94859b453c20464c165432c82d726b5c90a99633 commit 94859b453c20464c165432c82d726b5c90a99633 Author: Mikael Urankar AuthorDate: 2022-03-09 16:38:41 +0000 Commit: Mikael Urankar CommitDate: 2022-03-09 16:40:09 +0000 games/veloren: Fix build with rust 1.59.0 error: format argument must be a string literal --> voxygen/src/hud/diary.rs:1263:49 | 1263 | unknown => unreachable!(unknown), | ^^^^^^^ Upstream PR: https://gitlab.com/veloren/veloren/-/issues/1493 Approved by: portmgr (build fix blanket) --- games/veloren/files/patch-voxygen_src_hud_diary.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/games/veloren/files/patch-voxygen_src_hud_diary.rs b/games/veloren/files/patch-voxygen_src_hud_diary.rs new file mode 100644 index 000000000000..f43a8d6e8cac --- /dev/null +++ b/games/veloren/files/patch-voxygen_src_hud_diary.rs @@ -0,0 +1,13 @@ +https://gitlab.com/veloren/veloren/-/issues/1493 + +--- voxygen/src/hud/diary.rs.orig 2022-03-08 09:15:13 UTC ++++ voxygen/src/hud/diary.rs +@@ -1260,7 +1260,7 @@ impl<'a> Widget for Diary<'a> { + (None, None) => String::new(), + } + }, +- unknown => unreachable!(unknown), ++ unknown => unreachable!("unknown"), + }; + + let mut number = Text::new(&value)