From nobody Thu May 30 14:02:41 2024 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 4Vqny944wbz5MhsV; Thu, 30 May 2024 14:02:41 +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 4Vqny939dpz4gVd; Thu, 30 May 2024 14:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717077761; 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=rb3rrHJgvxZmmKwLSn1Jd3MQHu463/nZEjEjqJZYF3s=; b=H9Nohea/76GlAZvOv+rb6oIXcFI7fX3sAQWU4CAksgnh42vvG1PNeSwo5JDbnAiUSHnp9n ivBt+V/4d3VTxChqiq/RZ8bG8VIENAS2ZFr3D6YSeydfomCvqHBbjOEoNEfrbLJavSbh92 MZezgML/86EMqb2eSYj2sBNthiSEKwfntM7utksJG3rzlZDwjJzRsZERU3hu+K9i3LX4PP ZQE+ww9sxZxgsXFvCGVZw5P42OhXQR5ui221BGObIyiZGwXij8CiIutzw9H+MOtYqFpUXM Mv+qqKl4GK+2BgQ7VqUurM86Wv1JDrOX/hXKf557FSnotI6QMw90HLljnejCVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717077761; a=rsa-sha256; cv=none; b=yvTgJxYc9hbe6OgZhg4IbaunCRx1m0Rorju4VSZRh8VbB46euJXIn4FHDPWGTIpJtDklJK DYLRNo4Ri0gDleOD35nk3CNwAf4zvqNob9rnqoT+GYqS7SXfeZiubP1OZTkwIBwlk/Ou3q KLJnoBXLU1RZDLGwKopVOmhojjQRm9gqycZWjd9/vqvuLIqpEWU6XLX9WrtwqPW2FoRcr8 f7qJAkl1DjLLEjQtP+JGtwAQk0vZjVo8xOFLus06qo9iYGfPCEELSLegz8wz7Vutj2b5lL f07PS/XEwLLNEZrHLrMI1Vh7hwbcEZa1KkzpsAyeLh1Tci7ZUfjzh7fCiSMvUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717077761; 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=rb3rrHJgvxZmmKwLSn1Jd3MQHu463/nZEjEjqJZYF3s=; b=XPAR3gRImolAXPh7KbR7YYbDJkafq5Gd2dYaq/x48tuJ4G6nTl+GRKeIoA9+LJKcplTzX+ IfIl/1R9CUCZozYdOEy0wDmm5afg9uEg/zBBwrW7PvaonRU3+QlgTmiuCO7X1/t9qBOT5V VUotnFb5dSDqisDzjVI2SV1tjvyV8138QY7lhhVXVLFRSirQP9dVWSO7vUEvaxmKYX5mO/ cVTvPezK/B9MiAzn4IzAXo7xbjvCTefI8m452VbNgP2+KjDb4inadJL9vsZyv818hOE5SW 0UPMb5e0C+5TN5sOlmH0vt46JxtQTQpVs5wBwOldavEsU91YqvKgzDFz6nitdA== 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 4Vqny92T6JzjwV; Thu, 30 May 2024 14:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44UE2fmZ081375; Thu, 30 May 2024 14:02:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44UE2fpF081372; Thu, 30 May 2024 14:02:41 GMT (envelope-from git) Date: Thu, 30 May 2024 14:02:41 GMT Message-Id: <202405301402.44UE2fpF081372@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: c1ea1076983d - 2024Q2 - games/veloren-weekly: unbreak patch after 7f02093c3135 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: c1ea1076983de36ada56eeb49dde903c59121f8a Auto-Submitted: auto-generated The branch 2024Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1ea1076983de36ada56eeb49dde903c59121f8a commit c1ea1076983de36ada56eeb49dde903c59121f8a Author: Jan Beich AuthorDate: 2024-05-30 12:56:26 +0000 Commit: Jan Beich CommitDate: 2024-05-30 14:01:45 +0000 games/veloren-weekly: unbreak patch after 7f02093c3135 ===> Patching for veloren-weekly-s20240529 ===> Applying FreeBSD patches for veloren-weekly-s20240529 from /usr/ports/games/veloren-weekly/files Ignoring previously applied (or reversed) patch. 15 out of 15 hunks ignored--saving rejects to Cargo.lock.rej ===> FAILED Applying FreeBSD patch-rust-1.77.0 ===> Cleanly applied FreeBSD patch(es) patch-gilrs patch-i386 patch-keyboard-keynames patch-nodebug ===> FAILED to apply cleanly FreeBSD patch(es) patch-rust-1.77.0 *** Error code 1 Reported by: pkg-fallout (direct commit to 2024Q2 as 7e86fe10e4c7 is missing on the branch) --- games/veloren-weekly/files/patch-rust-1.77.0 | 48 ++++++++-------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/games/veloren-weekly/files/patch-rust-1.77.0 b/games/veloren-weekly/files/patch-rust-1.77.0 index 44fb25530cea..41b48a32d6ec 100644 --- a/games/veloren-weekly/files/patch-rust-1.77.0 +++ b/games/veloren-weekly/files/patch-rust-1.77.0 @@ -12,18 +12,9 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr 402 | let invalid_ptr = core::ptr::without_provenance_mut::((self as *mut Self).addr()); | ^^^^^^^^^^^^^^^^^^^^^^ not found in `core::ptr` ---- Cargo.lock.orig 2024-05-20 18:26:00 UTC +--- Cargo.lock.orig 2024-05-29 15:52:55 UTC +++ Cargo.lock -@@ -495,7 +495,7 @@ dependencies = [ - "bitflags 2.5.0", - "cexpr", - "clang-sys", -- "itertools 0.10.5", -+ "itertools 0.12.1", - "lazy_static", - "lazycell", - "proc-macro2 1.0.83", -@@ -6744,12 +6744,12 @@ name = "treeculler" +@@ -6819,12 +6819,12 @@ dependencies = [ [[package]] name = "treeculler" @@ -39,18 +30,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr ] [[package]] -@@ -6776,8 +6776,8 @@ dependencies = [ - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" - dependencies = [ -- "cfg-if 0.1.10", -- "rand 0.7.3", -+ "cfg-if 1.0.0", -+ "rand 0.8.5", - "static_assertions", - ] - -@@ -6941,9 +6941,9 @@ name = "vek" +@@ -7010,9 +7010,9 @@ dependencies = [ [[package]] name = "vek" @@ -62,7 +42,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr dependencies = [ "approx 0.5.1", "num-integer", -@@ -6973,7 +6973,7 @@ dependencies = [ +@@ -7042,7 +7042,7 @@ dependencies = [ "specs", "tokio", "tracing", @@ -71,7 +51,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr "veloren-client-i18n", "veloren-common", "veloren-common-base", -@@ -7044,7 +7044,7 @@ dependencies = [ +@@ -7113,7 +7113,7 @@ dependencies = [ "tracing", "tracing-subscriber", "uuid", @@ -80,7 +60,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr "veloren-common-assets", "veloren-common-base", "veloren-common-i18n", -@@ -7129,7 +7129,7 @@ dependencies = [ +@@ -7198,7 +7198,7 @@ dependencies = [ "specs", "sum_type", "tracing", @@ -89,7 +69,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr "veloren-common", ] -@@ -7153,7 +7153,7 @@ dependencies = [ +@@ -7222,7 +7222,7 @@ dependencies = [ "timer-queue", "toml 0.8.13", "tracing", @@ -98,7 +78,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr "veloren-common", "veloren-common-assets", "veloren-common-base", -@@ -7173,7 +7173,7 @@ dependencies = [ +@@ -7242,7 +7242,7 @@ dependencies = [ "rayon", "specs", "tracing", @@ -107,7 +87,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr "veloren-common", "veloren-common-base", "veloren-common-ecs", -@@ -7257,7 +7257,7 @@ dependencies = [ +@@ -7326,7 +7326,7 @@ dependencies = [ "serde", "slotmap", "tracing", @@ -116,7 +96,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr "veloren-common", "veloren-world", ] -@@ -7300,7 +7300,7 @@ dependencies = [ +@@ -7369,7 +7369,7 @@ dependencies = [ "strum 0.24.1", "tokio", "tracing", @@ -125,7 +105,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr "veloren-common", "veloren-common-base", "veloren-common-ecs", -@@ -7323,7 +7323,7 @@ dependencies = [ +@@ -7392,7 +7392,7 @@ dependencies = [ "rand 0.8.5", "specs", "tracing", @@ -134,7 +114,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr "veloren-common", "veloren-common-base", "veloren-common-dynlib", -@@ -7420,7 +7420,7 @@ dependencies = [ +@@ -7489,7 +7489,7 @@ dependencies = [ "tokio", "tracing", "treeculler", @@ -143,7 +123,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr "veloren-client", "veloren-client-i18n", "veloren-common", -@@ -7448,7 +7448,7 @@ dependencies = [ +@@ -7517,7 +7517,7 @@ version = "0.10.0" dependencies = [ "bytemuck", "lazy_static", @@ -152,7 +132,7 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr "veloren-common", "veloren-common-dynlib", ] -@@ -7516,7 +7516,7 @@ dependencies = [ +@@ -7585,7 +7585,7 @@ dependencies = [ "svg_fmt", "tracing", "tracing-subscriber",