aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Urankar <mikael@FreeBSD.org>2025-05-21 06:56:55 +0000
committerMikael Urankar <mikael@FreeBSD.org>2025-06-05 07:51:45 +0000
commitfe09ef412fc4ef7ed798132ed224e9b6c8429038 (patch)
tree342f671e42d8bfc630cfd127a7e1026f1c9a6a68
parent7ab7ce23ef0889abe56d368e8945bcd9c9ab5496 (diff)
math/kalker: Fix build with rust 1.87.0
Update the wasm-bindgen crates: error: older versions of the `wasm-bindgen` crate are incompatible with current versions of Rust; please update to `wasm-bindgen` v0.2.88 PR: 286829 Approved by: portmgr (build fix blanket)
-rw-r--r--math/kalker/Makefile.crates16
-rw-r--r--math/kalker/distinfo34
-rw-r--r--math/kalker/files/patch-rust-1.87.0159
3 files changed, 187 insertions, 22 deletions
diff --git a/math/kalker/Makefile.crates b/math/kalker/Makefile.crates
index 2996f93e1e9e..f9213f6d2439 100644
--- a/math/kalker/Makefile.crates
+++ b/math/kalker/Makefile.crates
@@ -23,19 +23,21 @@ CARGO_CRATES= aho-corasick-0.7.20 \
memchr-2.5.0 \
nix-0.19.1 \
once_cell-1.17.0 \
- proc-macro2-1.0.50 \
- quote-1.0.23 \
+ proc-macro2-1.0.95 \
+ quote-1.0.40 \
redox_syscall-0.2.16 \
redox_users-0.4.3 \
regex-1.7.1 \
regex-syntax-0.6.28 \
rug-1.24.0 \
+ rustversion-1.0.20 \
rustyline-7.1.0 \
scoped-tls-1.0.1 \
scopeguard-1.1.0 \
seahorse-1.1.2 \
serde-1.0.152 \
syn-1.0.107 \
+ syn-2.0.101 \
test-case-1.2.3 \
thiserror-1.0.38 \
thiserror-impl-1.0.38 \
@@ -46,12 +48,12 @@ CARGO_CRATES= aho-corasick-0.7.20 \
utf8parse-0.2.0 \
version_check-0.9.4 \
wasi-0.11.0+wasi-snapshot-preview1 \
- wasm-bindgen-0.2.83 \
- wasm-bindgen-backend-0.2.83 \
+ wasm-bindgen-0.2.100 \
+ wasm-bindgen-backend-0.2.100 \
wasm-bindgen-futures-0.4.33 \
- wasm-bindgen-macro-0.2.83 \
- wasm-bindgen-macro-support-0.2.83 \
- wasm-bindgen-shared-0.2.83 \
+ wasm-bindgen-macro-0.2.100 \
+ wasm-bindgen-macro-support-0.2.100 \
+ wasm-bindgen-shared-0.2.100 \
wasm-bindgen-test-0.3.33 \
wasm-bindgen-test-macro-0.3.33 \
web-sys-0.3.60 \
diff --git a/math/kalker/distinfo b/math/kalker/distinfo
index 63188b189da9..a5b17c4bd1cd 100644
--- a/math/kalker/distinfo
+++ b/math/kalker/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1727997006
+TIMESTAMP = 1747750217
SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac
SIZE (rust/crates/aho-corasick-0.7.20.crate) = 111440
SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2
@@ -49,10 +49,10 @@ SHA256 (rust/crates/nix-0.19.1.crate) = b2ccba0cfe4fdf15982d1674c69b1fd80bad427d
SIZE (rust/crates/nix-0.19.1.crate) = 213462
SHA256 (rust/crates/once_cell-1.17.0.crate) = 6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66
SIZE (rust/crates/once_cell-1.17.0.crate) = 32736
-SHA256 (rust/crates/proc-macro2-1.0.50.crate) = 6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2
-SIZE (rust/crates/proc-macro2-1.0.50.crate) = 41667
-SHA256 (rust/crates/quote-1.0.23.crate) = 8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b
-SIZE (rust/crates/quote-1.0.23.crate) = 28058
+SHA256 (rust/crates/proc-macro2-1.0.95.crate) = 02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778
+SIZE (rust/crates/proc-macro2-1.0.95.crate) = 51820
+SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
+SIZE (rust/crates/quote-1.0.40.crate) = 31063
SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b
@@ -63,6 +63,8 @@ SHA256 (rust/crates/regex-syntax-0.6.28.crate) = 456c603be3e8d448b072f410900c09f
SIZE (rust/crates/regex-syntax-0.6.28.crate) = 299288
SHA256 (rust/crates/rug-1.24.0.crate) = 76a82fd85950d103ad075f104d10c77d71640830c6a959a418380be380eaf7cd
SIZE (rust/crates/rug-1.24.0.crate) = 353283
+SHA256 (rust/crates/rustversion-1.0.20.crate) = eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2
+SIZE (rust/crates/rustversion-1.0.20.crate) = 20666
SHA256 (rust/crates/rustyline-7.1.0.crate) = 8227301bfc717136f0ecbd3d064ba8199e44497a0bdd46bb01ede4387cfd2cec
SIZE (rust/crates/rustyline-7.1.0.crate) = 88494
SHA256 (rust/crates/scoped-tls-1.0.1.crate) = e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294
@@ -75,6 +77,8 @@ SHA256 (rust/crates/serde-1.0.152.crate) = bb7d1f0d3021d347a83e556fc4683dea2ea09
SIZE (rust/crates/serde-1.0.152.crate) = 77091
SHA256 (rust/crates/syn-1.0.107.crate) = 1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5
SIZE (rust/crates/syn-1.0.107.crate) = 237539
+SHA256 (rust/crates/syn-2.0.101.crate) = 8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf
+SIZE (rust/crates/syn-2.0.101.crate) = 299250
SHA256 (rust/crates/test-case-1.2.3.crate) = e9e5f048404b43e8ae66dce036163515b6057024cf58c6377be501f250bd3c6a
SIZE (rust/crates/test-case-1.2.3.crate) = 14323
SHA256 (rust/crates/thiserror-1.0.38.crate) = 6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0
@@ -95,18 +99,18 @@ SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7
SIZE (rust/crates/version_check-0.9.4.crate) = 14895
SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
-SHA256 (rust/crates/wasm-bindgen-0.2.83.crate) = eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268
-SIZE (rust/crates/wasm-bindgen-0.2.83.crate) = 169618
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142
-SIZE (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 25620
+SHA256 (rust/crates/wasm-bindgen-0.2.100.crate) = 1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5
+SIZE (rust/crates/wasm-bindgen-0.2.100.crate) = 48288
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6
+SIZE (rust/crates/wasm-bindgen-backend-0.2.100.crate) = 32111
SHA256 (rust/crates/wasm-bindgen-futures-0.4.33.crate) = 23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d
SIZE (rust/crates/wasm-bindgen-futures-0.4.33.crate) = 15216
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810
-SIZE (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 12075
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 18530
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f
-SIZE (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 7194
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407
+SIZE (rust/crates/wasm-bindgen-macro-0.2.100.crate) = 9663
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.100.crate) = 26243
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d
+SIZE (rust/crates/wasm-bindgen-shared-0.2.100.crate) = 8570
SHA256 (rust/crates/wasm-bindgen-test-0.3.33.crate) = 09d2fff962180c3fadf677438054b1db62bee4aa32af26a45388af07d1287e1d
SIZE (rust/crates/wasm-bindgen-test-0.3.33.crate) = 15718
SHA256 (rust/crates/wasm-bindgen-test-macro-0.3.33.crate) = 4683da3dfc016f704c9f82cf401520c4f1cb3ee440f7f52b3d6ac29506a49ca7
diff --git a/math/kalker/files/patch-rust-1.87.0 b/math/kalker/files/patch-rust-1.87.0
new file mode 100644
index 000000000000..408758cec377
--- /dev/null
+++ b/math/kalker/files/patch-rust-1.87.0
@@ -0,0 +1,159 @@
+--- Cargo.lock.orig 2025-05-20 16:09:06.821792000 +0200
++++ Cargo.lock 2025-05-20 16:09:16.235274000 +0200
+@@ -1,6 +1,6 @@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
+-version = 3
++version = 4
+
+ [[package]]
+ name = "aho-corasick"
+@@ -241,18 +241,18 @@ name = "proc-macro2"
+
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.50"
++version = "1.0.95"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
++checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+ dependencies = [
+ "unicode-ident",
+ ]
+
+ [[package]]
+ name = "quote"
+-version = "1.0.23"
++version = "1.0.40"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
++checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+ dependencies = [
+ "proc-macro2",
+ ]
+@@ -307,6 +307,12 @@ dependencies = [
+ ]
+
+ [[package]]
++name = "rustversion"
++version = "1.0.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
++
++[[package]]
+ name = "rustyline"
+ version = "7.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -363,6 +369,17 @@ dependencies = [
+ ]
+
+ [[package]]
++name = "syn"
++version = "2.0.101"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-ident",
++]
++
++[[package]]
+ name = "test-case"
+ version = "1.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -371,7 +388,7 @@ dependencies = [
+ "cfg-if",
+ "proc-macro2",
+ "quote",
+- "syn",
++ "syn 1.0.107",
+ "version_check",
+ ]
+
+@@ -392,7 +409,7 @@ dependencies = [
+ dependencies = [
+ "proc-macro2",
+ "quote",
+- "syn",
++ "syn 1.0.107",
+ ]
+
+ [[package]]
+@@ -442,26 +459,27 @@ name = "wasm-bindgen"
+
+ [[package]]
+ name = "wasm-bindgen"
+-version = "0.2.83"
++version = "0.2.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
++checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+ dependencies = [
+ "cfg-if",
++ "once_cell",
++ "rustversion",
+ "wasm-bindgen-macro",
+ ]
+
+ [[package]]
+ name = "wasm-bindgen-backend"
+-version = "0.2.83"
++version = "0.2.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
++checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+ dependencies = [
+ "bumpalo",
+ "log",
+- "once_cell",
+ "proc-macro2",
+ "quote",
+- "syn",
++ "syn 2.0.101",
+ "wasm-bindgen-shared",
+ ]
+
+@@ -479,9 +497,9 @@ name = "wasm-bindgen-macro"
+
+ [[package]]
+ name = "wasm-bindgen-macro"
+-version = "0.2.83"
++version = "0.2.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
++checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+ dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+@@ -489,22 +507,25 @@ name = "wasm-bindgen-macro-support"
+
+ [[package]]
+ name = "wasm-bindgen-macro-support"
+-version = "0.2.83"
++version = "0.2.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
++checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+ dependencies = [
+ "proc-macro2",
+ "quote",
+- "syn",
++ "syn 2.0.101",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+ ]
+
+ [[package]]
+ name = "wasm-bindgen-shared"
+-version = "0.2.83"
++version = "0.2.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
++checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
++dependencies = [
++ "unicode-ident",
++]
+
+ [[package]]
+ name = "wasm-bindgen-test"