freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysutils/zellij: Fix build with rust 1.86.0

Browse Source 
Import upstream patch [1]

[1] https://github.com/zellij-org/zellij/pull/4118

PR:		285840
Approved by:	portmgr (build fix blanket)
This commit is contained in:
Mikael Urankar
2025-04-07 10:15:26 +02:00
parent 11e425bbfd
commit 7d61294c35
3 changed files with 121 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sysutils/zellij/Makefile
+3 -3
View File
@@ -1,6 +1,7 @@
PORTNAME= zellij
DISTVERSIONPREFIX= v
DISTVERSION= 0.42.1
PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= riggs@FreeBSD.org
@@ -273,7 +274,6 @@ CARGO_CRATES= addr2line-0.17.0 \
object-0.36.7 \
once_cell-1.18.0 \
openssl-probe-0.1.5 \
openssl-src-300.1.6+3.1.4 \
openssl-sys-0.9.93 \
option-ext-0.2.0 \
ordered-float-2.10.0 \
@@ -448,7 +448,7 @@ CARGO_CRATES= addr2line-0.17.0 \
wasm-bindgen-shared-0.2.87 \
wasm-encoder-0.221.2 \
wasm-encoder-0.224.0 \
wasmparser-0.221.2 \
wasmparser-0.221.3 \
wasmparser-0.224.0 \
wasmprinter-0.221.2 \
wasmtime-29.0.1 \
@@ -520,7 +520,7 @@ CARGO_CRATES= addr2line-0.17.0 \
winnow-0.6.8 \
winx-0.36.3 \
wit-bindgen-rt-0.33.0 \
wit-parser-0.221.2 \
wit-parser-0.221.3 \
witx-0.9.1 \
xflags-0.3.2 \
xflags-macros-0.3.2 \
sysutils/zellij/distinfo
+5 -7
View File
@@ -1,4 +1,4 @@
TIMESTAMP = 1742626501
TIMESTAMP = 1744012963
SHA256 (rust/crates/addr2line-0.17.0.crate) = b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b
SIZE (rust/crates/addr2line-0.17.0.crate) = 32260
SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
@@ -497,8 +497,6 @@ SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb5196
SIZE (rust/crates/once_cell-1.18.0.crate) = 32969
SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
SHA256 (rust/crates/openssl-src-300.1.6+3.1.4.crate) = 439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085
SIZE (rust/crates/openssl-src-300.1.6+3.1.4.crate) = 8839739
SHA256 (rust/crates/openssl-sys-0.9.93.crate) = db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d
SIZE (rust/crates/openssl-sys-0.9.93.crate) = 66922
SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
@@ -847,8 +845,8 @@ SHA256 (rust/crates/wasm-encoder-0.221.2.crate) = c17a3bd88f2155da63a1f2fcb8a563
SIZE (rust/crates/wasm-encoder-0.221.2.crate) = 65262
SHA256 (rust/crates/wasm-encoder-0.224.0.crate) = b7249cf8cb0c6b9cb42bce90c0a5feb276fbf963fa385ff3d818ab3d90818ed6
SIZE (rust/crates/wasm-encoder-0.224.0.crate) = 70355
SHA256 (rust/crates/wasmparser-0.221.2.crate) = 9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083
SIZE (rust/crates/wasmparser-0.221.2.crate) = 242909
SHA256 (rust/crates/wasmparser-0.221.3.crate) = d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185
SIZE (rust/crates/wasmparser-0.221.3.crate) = 242903
SHA256 (rust/crates/wasmparser-0.224.0.crate) = 65881a664fdd43646b647bb27bf186ab09c05bf56779d40aed4c6dce47d423f5
SIZE (rust/crates/wasmparser-0.224.0.crate) = 247038
SHA256 (rust/crates/wasmprinter-0.221.2.crate) = a80742ff1b9e6d8c231ac7c7247782c6fc5bce503af760bca071811e5fc9ee56
@@ -991,8 +989,8 @@ SHA256 (rust/crates/winx-0.36.3.crate) = f9643b83820c0cd246ecabe5fa454dd04ba4fa6
SIZE (rust/crates/winx-0.36.3.crate) = 13696
SHA256 (rust/crates/wit-bindgen-rt-0.33.0.crate) = 3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c
SIZE (rust/crates/wit-bindgen-rt-0.33.0.crate) = 3357
SHA256 (rust/crates/wit-parser-0.221.2.crate) = fbe1538eea6ea5ddbe5defd0dc82539ad7ba751e1631e9185d24a931f0a5adc8
SIZE (rust/crates/wit-parser-0.221.2.crate) = 137746
SHA256 (rust/crates/wit-parser-0.221.3.crate) = 896112579ed56b4a538b07a3d16e562d101ff6265c46b515ce0c701eef16b2ac
SIZE (rust/crates/wit-parser-0.221.3.crate) = 142585
SHA256 (rust/crates/witx-0.9.1.crate) = e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b
SIZE (rust/crates/witx-0.9.1.crate) = 45928
SHA256 (rust/crates/xflags-0.3.2.crate) = 7d9e15fbb3de55454b0106e314b28e671279009b363e6f1d8e39fdc3bf048944
sysutils/zellij/files/patch-rust-1.86.0
+113
View File
@@ -0,0 +1,113 @@
https://github.com/bytecodealliance/wasmtime/issues/10184
https://github.com/zellij-org/zellij/pull/4118
From 95ea43f1969d9f9ee50a701023b5f90cf36d3967 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 3 Apr 2025 17:36:02 +0200
Subject: [PATCH] fix(deps): fix --locked build on rust 1.86
---
Cargo.lock | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 4b7bebbc67..83298ba165 100644
--- Cargo.lock
+++ Cargo.lock
@@ -4084,7 +4084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c17a3bd88f2155da63a1f2fcb8a56377a24f0b6dfed12733bb5f544e86f690c5"
dependencies = [
"leb128",
- "wasmparser 0.221.2",
+ "wasmparser 0.221.3",
]
[[package]]
@@ -4099,9 +4099,9 @@ dependencies = [
[[package]]
name = "wasmparser"
-version = "0.221.2"
+version = "0.221.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083"
+checksum = "d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185"
dependencies = [
"bitflags 2.5.0",
"hashbrown 0.15.2",
@@ -4129,7 +4129,7 @@ checksum = "a80742ff1b9e6d8c231ac7c7247782c6fc5bce503af760bca071811e5fc9ee56"
dependencies = [
"anyhow",
"termcolor",
- "wasmparser 0.221.2",
+ "wasmparser 0.221.3",
]
[[package]]
@@ -4172,7 +4172,7 @@ dependencies = [
"target-lexicon",
"trait-variant",
"wasm-encoder 0.221.2",
- "wasmparser 0.221.2",
+ "wasmparser 0.221.3",
"wasmtime-asm-macros",
"wasmtime-cache",
"wasmtime-component-macro",
@@ -4260,7 +4260,7 @@ dependencies = [
"smallvec",
"target-lexicon",
"thiserror 1.0.61",
- "wasmparser 0.221.2",
+ "wasmparser 0.221.3",
"wasmtime-environ",
"wasmtime-versioned-export-macros",
]
@@ -4287,7 +4287,7 @@ dependencies = [
"smallvec",
"target-lexicon",
"wasm-encoder 0.221.2",
- "wasmparser 0.221.2",
+ "wasmparser 0.221.3",
"wasmprinter",
"wasmtime-component-util",
]
@@ -4398,7 +4398,7 @@ dependencies = [
"gimli 0.31.1",
"object 0.36.7",
"target-lexicon",
- "wasmparser 0.221.2",
+ "wasmparser 0.221.3",
"wasmtime-cranelift",
"wasmtime-environ",
"winch-codegen",
@@ -4635,7 +4635,7 @@ dependencies = [
"smallvec",
"target-lexicon",
"thiserror 1.0.61",
- "wasmparser 0.221.2",
+ "wasmparser 0.221.3",
"wasmtime-cranelift",
"wasmtime-environ",
]
@@ -4893,9 +4893,9 @@ dependencies = [
[[package]]
name = "wit-parser"
-version = "0.221.2"
+version = "0.221.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbe1538eea6ea5ddbe5defd0dc82539ad7ba751e1631e9185d24a931f0a5adc8"
+checksum = "896112579ed56b4a538b07a3d16e562d101ff6265c46b515ce0c701eef16b2ac"
dependencies = [
"anyhow",
"id-arena",
@@ -4906,7 +4906,7 @@ dependencies = [
"serde_derive",
"serde_json",
"unicode-xid",
- "wasmparser 0.221.2",
+ "wasmparser 0.221.3",
]
[[package]]