From nobody Mon Oct 25 08:57:34 2021 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 84AA71811673; Mon, 25 Oct 2021 08:57:42 +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 4Hd83n2p1mz4mXv; Mon, 25 Oct 2021 08:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0D7F025AF0; Mon, 25 Oct 2021 08:57:35 +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 19P8vYEG099700; Mon, 25 Oct 2021 08:57:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19P8vYDJ099699; Mon, 25 Oct 2021 08:57:34 GMT (envelope-from git) Date: Mon, 25 Oct 2021 08:57:34 GMT Message-Id: <202110250857.19P8vYDJ099699@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: ba8bb92c6189 - main - games/veloren: Unbreak with Rust 1.56.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: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba8bb92c6189b1d08a0095137cb1ab0f610b9312 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba8bb92c6189b1d08a0095137cb1ab0f610b9312 commit ba8bb92c6189b1d08a0095137cb1ab0f610b9312 Author: Jan Beich AuthorDate: 2021-10-19 06:37:06 +0000 Commit: Tobias Kortkamp CommitDate: 2021-10-25 08:49:18 +0000 games/veloren: Unbreak with Rust 1.56.0 error[E0557]: feature has been removed --> /wrkdirs/usr/ports/games/veloren/work/veloren-e4716147a7356eb13088e7d74ace3ccdcb5cd900/cargo-crates/packed_simd_2-0.3.5/src/lib.rs:215:5 | 215 | const_generics, | ^^^^^^^^^^^^^^ feature has been removed | = note: removed in favor of `#![feature(adt_const_params]` and `#![feature(generic_const_exprs)]` PR: 259251 --- games/veloren/files/patch-rust-1.56 | 64 +++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/games/veloren/files/patch-rust-1.56 b/games/veloren/files/patch-rust-1.56 new file mode 100644 index 000000000000..736e6cb24636 --- /dev/null +++ b/games/veloren/files/patch-rust-1.56 @@ -0,0 +1,64 @@ +https://gitlab.com/veloren/veloren/-/commit/88685cc01650 +https://gitlab.com/veloren/veloren/-/commit/2a82405df26a +https://github.com/rust-lang/packed_simd/commit/45d5347a0d21 + +--- cargo-crates/packed_simd_2-0.3.5/src/lib.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/packed_simd_2-0.3.5/src/lib.rs +@@ -212,7 +212,7 @@ + //! guide](https://rust-lang-nursery.github.io/packed_simd/perf-guide/) + + #![feature( +- const_generics, ++ adt_const_params, + repr_simd, + rustc_attrs, + platform_intrinsics, +--- common/net/src/lib.rs.orig 2021-09-10 20:02:36 UTC ++++ common/net/src/lib.rs +@@ -1,8 +1,7 @@ + #![allow(incomplete_features)] + #![feature( +- const_generics, ++ generic_const_exprs, + const_fn_floating_point_arithmetic, +- const_evaluatable_checked + )] + pub mod msg; + pub mod sync; +--- common/src/lib.rs.orig 2021-09-10 20:02:36 UTC ++++ common/src/lib.rs +@@ -7,7 +7,6 @@ + arbitrary_enum_discriminant, + associated_type_defaults, + bool_to_option, +- const_generics, + fundamental, + iter_map_while, + label_break_value, +--- voxygen/anim/src/lib.rs.orig 2021-09-10 20:02:36 UTC ++++ voxygen/anim/src/lib.rs +@@ -1,4 +1,3 @@ +-#![feature(const_generics)] + #![feature(generic_associated_types)] + #![allow(incomplete_features)] + #[cfg(all(feature = "be-dyn-lib", feature = "use-dyn-lib"))] +--- voxygen/src/lib.rs.orig 2021-09-10 20:02:36 UTC ++++ voxygen/src/lib.rs +@@ -7,7 +7,6 @@ + array_methods, + array_zip, + bool_to_option, +- const_generics, + drain_filter, + once_cell, + trait_alias +--- world/src/lib.rs.orig 2021-09-10 20:02:36 UTC ++++ world/src/lib.rs +@@ -10,7 +10,6 @@ + #![feature( + arbitrary_enum_discriminant, + bool_to_option, +- const_generics, + const_panic, + label_break_value, + array_map