git: ab28f4b0287c - 2024Q2 - games/veloren-weekly: unbreak patch after c749a57bff9a
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Jun 2024 03:16:26 UTC
The branch 2024Q2 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ab28f4b0287c4afb810795e737ecab452ff02f86
commit ab28f4b0287c4afb810795e737ecab452ff02f86
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-06-27 03:15:00 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-06-27 03:15:00 +0000
games/veloren-weekly: unbreak patch after c749a57bff9a
===> Patching for veloren-weekly-s20240626
===> Applying FreeBSD patches for veloren-weekly-s20240626 from /usr/ports/games/veloren-weekly/files
1 out of 1 hunks failed--saving rejects to Cargo.toml.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 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/games/veloren-weekly/files/patch-rust-1.77.0 b/games/veloren-weekly/files/patch-rust-1.77.0
index 41b48a32d6ec..d06c478abc10 100644
--- a/games/veloren-weekly/files/patch-rust-1.77.0
+++ b/games/veloren-weekly/files/patch-rust-1.77.0
@@ -141,15 +141,15 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr
"veloren-common",
"veloren-common-base",
"veloren-common-dynlib",
---- Cargo.toml.orig 2024-05-20 18:26:00 UTC
+--- Cargo.toml.orig 2024-06-26 12:12:15 UTC
+++ Cargo.toml
-@@ -145,7 +145,7 @@ num-traits = { version = "0.2" }
- ordered-float = { version = "3", default-features = true }
+@@ -149,7 +149,7 @@ num-traits = { version = "0.2" }
+ ordered-float = { version = "4.2", default-features = true }
num = { version = "0.4" }
num-traits = { version = "0.2" }
-vek = { version = "0.17.0", features = ["serde"] }
+vek = { version = "0.16.1", features = ["serde"] }
- itertools = { version = "0.10" }
+ itertools = { version = "0.13" }
serde = { version = "1.0.118", features = ["derive"] }
--- cargo-crates/shred-0.16.1/src/meta.rs.orig 2006-07-24 01:21:28 UTC