Attachment 245669 Details for Bug 274499 – v2

[patch] v2

rust-1.73.0_3.patch (text/plain), 34.69 KB, created by Mikael Urankar on 2023-10-16 10:57:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2023-10-16 10:57:41 UTC

Size: 34.69 KB

patch

obsolete

>From 9189e29fbe5926524baa6df23d261c1b2aa1d940 Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Wed, 4 Oct 2023 16:09:35 +0200
>Subject: [PATCH 1/4] lang/rust:  Update to 1.73.0
>
>Announce:	https://blog.rust-lang.org/2023/10/05/Rust-1.73.0.html
>ChangeLog:	https://github.com/rust-lang/rust/releases/tag/1.73.0
>
>PR:		274499
>Tested by:	mikael,pkubaj
>---
> Mk/Uses/cargo.mk             |   2 +-
> Mk/bsd.gecko.mk              |   2 +-
> lang/rust-bootstrap/Makefile |   2 +-
> lang/rust-bootstrap/distinfo |   6 +--
> lang/rust/Makefile           |  13 ++---
> lang/rust/distinfo           | 102 +++++++++++++++++------------------
> 6 files changed, 60 insertions(+), 67 deletions(-)
>
>diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
>index 8caf609266..18db16f996 100644
>--- a/Mk/Uses/cargo.mk
>+++ b/Mk/Uses/cargo.mk
>@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}=	${WRKDIR}/${_wrksrc}
> 
> CARGO_BUILDDEP?=	yes
> .  if ${CARGO_BUILDDEP:tl} == "yes"
>-BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.72.0:lang/${RUST_DEFAULT}
>+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.73.0:lang/${RUST_DEFAULT}
> .  elif ${CARGO_BUILDDEP:tl} == "any-version"
> BUILD_DEPENDS+=	${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
> .  endif
>diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
>index 98eb1ed727..24fbebd623 100644
>--- a/Mk/bsd.gecko.mk
>+++ b/Mk/bsd.gecko.mk
>@@ -75,7 +75,7 @@ BUNDLE_LIBS=	yes
> 
> BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
> 				rust-cbindgen>=0.24.3:devel/rust-cbindgen \
>-				${RUST_DEFAULT}>=1.72.0:lang/${RUST_DEFAULT} \
>+				${RUST_DEFAULT}>=1.73.0:lang/${RUST_DEFAULT} \
> 				node:www/node
> LIB_DEPENDS+=	libdrm.so:graphics/libdrm
> RUN_DEPENDS+=	${LOCALBASE}/lib/libpci.so:devel/libpci
>diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile
>index 09067e4ff2..d61b6e1b93 100644
>--- a/lang/rust-bootstrap/Makefile
>+++ b/lang/rust-bootstrap/Makefile
>@@ -2,7 +2,7 @@
> # to upload them to ~/public_distfiles on freefall in preparation
> # for the next lang/rust update.
> PORTNAME=	rust
>-PORTVERSION=	1.72.0
>+PORTVERSION=	1.73.0
> CATEGORIES=	lang
> MASTER_SITES=	https://static.rust-lang.org/dist/
> PKGNAMEPREFIX=	${FLAVOR:S/_/-/g}-
>diff --git a/lang/rust-bootstrap/distinfo b/lang/rust-bootstrap/distinfo
>index 5052412ce0..8cae2863fb 100644
>--- a/lang/rust-bootstrap/distinfo
>+++ b/lang/rust-bootstrap/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1692897293
>-SHA256 (rust/rustc-1.72.0-src.tar.xz) = d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014
>-SIZE (rust/rustc-1.72.0-src.tar.xz) = 151630408
>+TIMESTAMP = 1696426328
>+SHA256 (rust/rustc-1.73.0-src.tar.xz) = 6eaf672dbea2e6596af8c999f5e6924b9af4bb8b02166bfe0b928e68aa75ae62
>+SIZE (rust/rustc-1.73.0-src.tar.xz) = 154319536
>diff --git a/lang/rust/Makefile b/lang/rust/Makefile
>index f17d0d8e8a..ed479523ff 100644
>--- a/lang/rust/Makefile
>+++ b/lang/rust/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	rust
>-PORTVERSION?=	1.72.0
>+PORTVERSION?=	1.73.0
> PORTREVISION?=	0
> CATEGORIES=	lang
> MASTER_SITES=	https://static.rust-lang.org/dist/:src \
>@@ -69,8 +69,8 @@ WASM_VARS=		_COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown
> 			_RUST_TARGETS+=wasm32-unknown-unknown
> 
> # See WRKSRC/src/stage0.json for the date and version values
>-BOOTSTRAPS_DATE?=		2023-07-13
>-RUST_BOOTSTRAP_VERSION?=	1.71.0
>+BOOTSTRAPS_DATE?=		2023-08-24
>+RUST_BOOTSTRAP_VERSION?=	1.72.0
> 
> CARGO_VENDOR_DIR?=		${WRKSRC}/vendor
> 
>@@ -96,13 +96,6 @@ _COMPONENTS+=		cargo-${_PACKAGE_VERS}-${_RUST_TARGET} \
> 
> .include <bsd.port.pre.mk>
> 
>-.ifndef NIGHTLY_DATE
>-PATCH_SITES=	https://github.com/rust-lang/rust/commit/
>-# LLVM 17 API compatibility fixes
>-PATCHFILES=	71958da4854176c50a8b12470b956d5c7ed11817.patch:-p1 \
>-		6ddf9128b2b55f9def80af57f7353d2521527c6a.patch:-p1
>-.endif
>-
> .if ${OPSYS} != FreeBSD
> IGNORE=		is only for FreeBSD
> .endif
>diff --git a/lang/rust/distinfo b/lang/rust/distinfo
>index 2beb9b4763..42e0f64c45 100644
>--- a/lang/rust/distinfo
>+++ b/lang/rust/distinfo
>@@ -1,54 +1,54 @@
>-TIMESTAMP = 1692897225
>-SHA256 (rust/rustc-1.72.0-src.tar.xz) = d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014
>-SIZE (rust/rustc-1.72.0-src.tar.xz) = 151630408
>-SHA256 (rust/2023-07-13/rustc-1.71.0-aarch64-unknown-freebsd.tar.xz) = 67a63e4bf9f69f0a07a79e759e754d66afdc1a644c08dc699ffb17083e05199e
>-SIZE (rust/2023-07-13/rustc-1.71.0-aarch64-unknown-freebsd.tar.xz) = 54896968
>-SHA256 (rust/2023-07-13/rust-std-1.71.0-aarch64-unknown-freebsd.tar.xz) = 644b1f08cddb684e19eae04f315c464c1ba1af11c09d59eb4449c1635a7a05f3
>-SIZE (rust/2023-07-13/rust-std-1.71.0-aarch64-unknown-freebsd.tar.xz) = 25694436
>-SHA256 (rust/2023-07-13/cargo-1.71.0-aarch64-unknown-freebsd.tar.xz) = 9ed2a3f06431a9e962ab29a3a4d4dc5b2e3703460845d9eec45da9f990618fbb
>-SIZE (rust/2023-07-13/cargo-1.71.0-aarch64-unknown-freebsd.tar.xz) = 7197836
>-SHA256 (rust/2023-07-13/rustc-1.71.0-x86_64-unknown-freebsd.tar.xz) = 5d2b10d7b7db4117627aafe9e2bcc8002e714da44fa9dd3aedbc0e50ffe1dd80
>-SIZE (rust/2023-07-13/rustc-1.71.0-x86_64-unknown-freebsd.tar.xz) = 45992472
>-SHA256 (rust/2023-07-13/rust-std-1.71.0-x86_64-unknown-freebsd.tar.xz) = 38b75d357110e539af7b6b155903adb8f5800226423da5ada798f7e1f768bb40
>-SIZE (rust/2023-07-13/rust-std-1.71.0-x86_64-unknown-freebsd.tar.xz) = 26217172
>-SHA256 (rust/2023-07-13/cargo-1.71.0-x86_64-unknown-freebsd.tar.xz) = 1d881ed89e9b4eb686a11bdd2f1bebf907fc2da6061192c40ac579a5b26094c7
>-SIZE (rust/2023-07-13/cargo-1.71.0-x86_64-unknown-freebsd.tar.xz) = 7973836
>-SHA256 (rust/2023-07-13/rustc-1.71.0-armv7-unknown-freebsd.tar.xz) = f2b9db2d046da7494e7c2b0b613f9f469124b6e3711b4904b7207b8d9c39964c
>-SIZE (rust/2023-07-13/rustc-1.71.0-armv7-unknown-freebsd.tar.xz) = 53254816
>-SHA256 (rust/2023-07-13/rust-std-1.71.0-armv7-unknown-freebsd.tar.xz) = a81c72e919a340bdc93e2009d8623fa47f01db342a170d0dd563a06bc00ccb30
>-SIZE (rust/2023-07-13/rust-std-1.71.0-armv7-unknown-freebsd.tar.xz) = 25050696
>-SHA256 (rust/2023-07-13/cargo-1.71.0-armv7-unknown-freebsd.tar.xz) = bb27f0be22140081b613802cd9f0c38682bc02c7716d41d9ccaa0d861cfc2d47
>-SIZE (rust/2023-07-13/cargo-1.71.0-armv7-unknown-freebsd.tar.xz) = 7071008
>-SHA256 (rust/2023-07-13/rustc-1.71.0-i686-unknown-freebsd.tar.xz) = 23f9a1fc89db35766dca997bd1f841dd058610f1761989105097710586407c57
>-SIZE (rust/2023-07-13/rustc-1.71.0-i686-unknown-freebsd.tar.xz) = 61659320
>-SHA256 (rust/2023-07-13/rust-std-1.71.0-i686-unknown-freebsd.tar.xz) = e6b35baff3bcc7dd7feb1447eeaef54fef4136c75af2e6f4b218ff52507b9d63
>-SIZE (rust/2023-07-13/rust-std-1.71.0-i686-unknown-freebsd.tar.xz) = 26212032
>-SHA256 (rust/2023-07-13/cargo-1.71.0-i686-unknown-freebsd.tar.xz) = eca40d3ec40bad1aec54851768e3a307db38d5989a7b2be80deb4a8dd2983bd2
>-SIZE (rust/2023-07-13/cargo-1.71.0-i686-unknown-freebsd.tar.xz) = 8338280
>-SHA256 (rust/2023-07-13/rustc-1.71.0-powerpc-unknown-freebsd.tar.xz) = d4bd4f7c38ede47def389ff8b8bf1f994fd15f9ae05824facb48bf8ada1d7ba2
>-SIZE (rust/2023-07-13/rustc-1.71.0-powerpc-unknown-freebsd.tar.xz) = 60245728
>-SHA256 (rust/2023-07-13/rust-std-1.71.0-powerpc-unknown-freebsd.tar.xz) = 48c3f746fdcedb1decefd5f9bd70343b0b8b7573ffd0b65ea77a67b0ce90ab60
>-SIZE (rust/2023-07-13/rust-std-1.71.0-powerpc-unknown-freebsd.tar.xz) = 24179884
>-SHA256 (rust/2023-07-13/cargo-1.71.0-powerpc-unknown-freebsd.tar.xz) = 30e1c54c7844094f6c463cc4a9be7455e207db598d12fb9203e47d6951b7de53
>-SIZE (rust/2023-07-13/cargo-1.71.0-powerpc-unknown-freebsd.tar.xz) = 8248108
>-SHA256 (rust/2023-07-13/rustc-1.71.0-powerpc64-unknown-freebsd.tar.xz) = e57a31a65f3ee3b3540c17ed20ea72895a9ea063a5cd7f621571947c75a982cd
>-SIZE (rust/2023-07-13/rustc-1.71.0-powerpc64-unknown-freebsd.tar.xz) = 58478560
>-SHA256 (rust/2023-07-13/rust-std-1.71.0-powerpc64-unknown-freebsd.tar.xz) = 5ba721993d54d15e6fe87001641eaf30aab2fd099e03119656898809bb607db1
>-SIZE (rust/2023-07-13/rust-std-1.71.0-powerpc64-unknown-freebsd.tar.xz) = 24186732
>-SHA256 (rust/2023-07-13/cargo-1.71.0-powerpc64-unknown-freebsd.tar.xz) = c46c43a943f2ff631a53c4efb5882756ec0a164368135a54d0f719a65333d1a4
>-SIZE (rust/2023-07-13/cargo-1.71.0-powerpc64-unknown-freebsd.tar.xz) = 7780232
>-SHA256 (rust/2023-07-13/rustc-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = aefb51616e8165e6dac99291520746a024b71d28c814a2570817473f1a6a20d2
>-SIZE (rust/2023-07-13/rustc-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = 60218776
>-SHA256 (rust/2023-07-13/rust-std-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = 2f80c9979e9a9dfe4f00fc62fae02656b5263e55c73b990e14b2140cdc620dc5
>-SIZE (rust/2023-07-13/rust-std-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = 24236100
>-SHA256 (rust/2023-07-13/cargo-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = 17d3145ab8f3d8d28562364f40f25db2fda9b526044e598095eea5cc28e56fec
>-SIZE (rust/2023-07-13/cargo-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = 8014976
>-SHA256 (rust/2023-07-13/rustc-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = efb38a182166f01d4d31a6534afcbaff3c6a1f58bf90f8db5cfd8016ee4ac520
>-SIZE (rust/2023-07-13/rustc-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = 70827420
>-SHA256 (rust/2023-07-13/rust-std-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = 4ca3b70a9839e567b62fdc71bcbf35782262ec97c35c5a29a02309e8b76efd63
>-SIZE (rust/2023-07-13/rust-std-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = 24375500
>-SHA256 (rust/2023-07-13/cargo-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = b49977e17a42a9175cfa016941a6006f8e188f610f4ed59945f114fcb9f04820
>-SIZE (rust/2023-07-13/cargo-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = 10130160
>+TIMESTAMP = 1697357059
>+SHA256 (rust/rustc-1.73.0-src.tar.xz) = 6eaf672dbea2e6596af8c999f5e6924b9af4bb8b02166bfe0b928e68aa75ae62
>+SIZE (rust/rustc-1.73.0-src.tar.xz) = 154319536
>+SHA256 (rust/2023-08-24/rustc-1.72.0-aarch64-unknown-freebsd.tar.xz) = f87def3751c86536dc8c2a1ac493d2832bdfb791a31a4782d5f6d47ae384cd5b
>+SIZE (rust/2023-08-24/rustc-1.72.0-aarch64-unknown-freebsd.tar.xz) = 54855264
>+SHA256 (rust/2023-08-24/rust-std-1.72.0-aarch64-unknown-freebsd.tar.xz) = 6712823eccc77234fe914992f26c37e72e050c85dc78d81f8bcfd5a6c0177779
>+SIZE (rust/2023-08-24/rust-std-1.72.0-aarch64-unknown-freebsd.tar.xz) = 26185760
>+SHA256 (rust/2023-08-24/cargo-1.72.0-aarch64-unknown-freebsd.tar.xz) = 957c3061c2d4c9bb03c74c059cdba16da5d8c1ba28ce671d762552e67fe02390
>+SIZE (rust/2023-08-24/cargo-1.72.0-aarch64-unknown-freebsd.tar.xz) = 8065312
>+SHA256 (rust/2023-08-24/rustc-1.72.0-x86_64-unknown-freebsd.tar.xz) = 7e913d82625e1fa9daaf89948d657944685be4bc3b5e136a312f9dc4230d72f2
>+SIZE (rust/2023-08-24/rustc-1.72.0-x86_64-unknown-freebsd.tar.xz) = 46396244
>+SHA256 (rust/2023-08-24/rust-std-1.72.0-x86_64-unknown-freebsd.tar.xz) = b4982586d84b8d419943083d28f3b3f3992eec99b13dbd7c0a5a8e63bfe3415f
>+SIZE (rust/2023-08-24/rust-std-1.72.0-x86_64-unknown-freebsd.tar.xz) = 26854796
>+SHA256 (rust/2023-08-24/cargo-1.72.0-x86_64-unknown-freebsd.tar.xz) = 0fd521fb5bf0e3a58210eeb242a22f24f92a94b886905f4b895bc36782a7dd78
>+SIZE (rust/2023-08-24/cargo-1.72.0-x86_64-unknown-freebsd.tar.xz) = 8866252
>+SHA256 (rust/2023-08-24/rustc-1.72.0-armv7-unknown-freebsd.tar.xz) = cd8dfc34e5901dd2845835c7c7978f6a5725e15a3925eaba551b49e104355d4b
>+SIZE (rust/2023-08-24/rustc-1.72.0-armv7-unknown-freebsd.tar.xz) = 55045532
>+SHA256 (rust/2023-08-24/rust-std-1.72.0-armv7-unknown-freebsd.tar.xz) = 519b61de0c56b11f5403a31f5198d93b2109ce7e9777df4899943c97c95c8ee0
>+SIZE (rust/2023-08-24/rust-std-1.72.0-armv7-unknown-freebsd.tar.xz) = 25630140
>+SHA256 (rust/2023-08-24/cargo-1.72.0-armv7-unknown-freebsd.tar.xz) = 90287dcb755268a67c5959c36d21270d04685ee55878d0314998272b32738dc1
>+SIZE (rust/2023-08-24/cargo-1.72.0-armv7-unknown-freebsd.tar.xz) = 7944012
>+SHA256 (rust/2023-08-24/rustc-1.72.0-i686-unknown-freebsd.tar.xz) = 103910d967b01ad2a27a886bfca8b64842be9a2b044074f58f56c6cccd2270fe
>+SIZE (rust/2023-08-24/rustc-1.72.0-i686-unknown-freebsd.tar.xz) = 61326204
>+SHA256 (rust/2023-08-24/rust-std-1.72.0-i686-unknown-freebsd.tar.xz) = 1747a9d544c759b8fab05a172f90c5eabde9be4b370d564177487be56549ae52
>+SIZE (rust/2023-08-24/rust-std-1.72.0-i686-unknown-freebsd.tar.xz) = 26697152
>+SHA256 (rust/2023-08-24/cargo-1.72.0-i686-unknown-freebsd.tar.xz) = eaed4aef4ad1341ebf990fdd264fb639635bc4840221074534af74e443f45f51
>+SIZE (rust/2023-08-24/cargo-1.72.0-i686-unknown-freebsd.tar.xz) = 9249016
>+SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc-unknown-freebsd.tar.xz) = 43f44d1fd8194921b391d5c46c30163e42742073015dcc713c34ff35a0067bb5
>+SIZE (rust/2023-08-24/rustc-1.72.0-powerpc-unknown-freebsd.tar.xz) = 60208348
>+SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc-unknown-freebsd.tar.xz) = de731b713a68c6db6e2bf05a02b8fdee0969cdb80dda756c41956d9a00a3194c
>+SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc-unknown-freebsd.tar.xz) = 24553168
>+SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc-unknown-freebsd.tar.xz) = d266f36de042cad9dd310febad76cf8d11ac1f188e2ce751b95841d7724ae4c8
>+SIZE (rust/2023-08-24/cargo-1.72.0-powerpc-unknown-freebsd.tar.xz) = 9247480
>+SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 333d82f18d75b3fcf9ee7afc578bd0ee09a1a1c1f8f9308d0b1c4f9159ca4d2f
>+SIZE (rust/2023-08-24/rustc-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 58536072
>+SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc64-unknown-freebsd.tar.xz) = d371b600719dc4f500d6a453d64fc713fba0a188ad6c02c72fe25e2e413468a8
>+SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 24770180
>+SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc64-unknown-freebsd.tar.xz) = ba4b5d2df913151e70b7d406c49163915b640f7ab6a4360ce0132e5cfa5ad891
>+SIZE (rust/2023-08-24/cargo-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 8793828
>+SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 44eb1bf540f146fb8fafa7585639b08592f0934e81cc95ae4bfdd7d8662da0ad
>+SIZE (rust/2023-08-24/rustc-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 60191980
>+SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 656950dca59bf303e40263f92694242ec62d992f08a224c600765254e6a20acc
>+SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 24904632
>+SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = a2d11bb9a49f91e3da992fd4d8b141d7221c218a7b2e07af4d1bb486ba95253f
>+SIZE (rust/2023-08-24/cargo-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 9067788
>+SHA256 (rust/2023-08-24/rustc-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = a0b184b96203a4bd99c78ff61f228f843a6bfbdb6a7c690f1424e55a78c44e41
>+SIZE (rust/2023-08-24/rustc-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 70320872
>+SHA256 (rust/2023-08-24/rust-std-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 24904a553337220e8b50caaec5fe0309c3ef40c58b57102e2b9ee9131c3b981c
>+SIZE (rust/2023-08-24/rust-std-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 24923728
>+SHA256 (rust/2023-08-24/cargo-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 52ef515ce550b58954cc71a19696e8bdeee24037273458d4115259725343bd40
>+SIZE (rust/2023-08-24/cargo-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 11394328
> SHA256 (rust/71958da4854176c50a8b12470b956d5c7ed11817.patch) = 5a6b67dfc1218ea953421816834ffe3aa8ac1fc078dfaea4ebab121460ca5211
> SIZE (rust/71958da4854176c50a8b12470b956d5c7ed11817.patch) = 2007
> SHA256 (rust/6ddf9128b2b55f9def80af57f7353d2521527c6a.patch) = 6eaaaf6714c496b610712aa9ecbe1a1614e042323ec872fbf31a0a74c9020f29
>-- 
>2.42.0
>
>
>From bc683ce4afb90edb8152640016cc31d14d34955a Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Sun, 15 Oct 2023 19:51:28 +0200
>Subject: [PATCH 2/4] www/firefox: fix build with rust 1.73.0
>
>The crate packed_simd_2 is not maintained anymore.
>firefox switched to packed_simd [1] in [2] but
>it's not yet part of firefox 118.
>Backport [3] to fix the following issue:
>
>error: unrecognized platform-specific intrinsic function: `simd_shuffle2`
>  --> /wrkdirs/usr/ports/www/firefox/work/firefox-118.0.2/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
>   |
>10 |     pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
>   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>
>[1] https://github.com/rust-lang/packed_simd/
>[2] https://github.com/mozilla/gecko-dev/commit/1e1bec8c6e383abf667d64ba1e556a4e68833f28
>[3] https://github.com/rust-lang/packed_simd/commit/a79edf4cfc54aad30a5630b217645c4b8274d8f7
>
>PR:		274499
>---
> www/firefox/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++++++
> 1 file changed, 83 insertions(+)
> create mode 100644 www/firefox/files/patch-rust-1.73.0
>
>diff --git a/www/firefox/files/patch-rust-1.73.0 b/www/firefox/files/patch-rust-1.73.0
>new file mode 100644
>index 0000000000..b838ffd90d
>--- /dev/null
>+++ b/www/firefox/files/patch-rust-1.73.0
>@@ -0,0 +1,83 @@
>+From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
>+From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
>+Date: Mon, 10 Jul 2023 09:46:53 +0000
>+Subject: [PATCH] Stop using old-style `simd_shuffle`
>+
>+---
>+ src/codegen/llvm.rs | 20 +++++++-------------
>+ 1 file changed, 7 insertions(+), 13 deletions(-)
>+
>+diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
>+index b4c09849..bb482fac 100644
>+--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
>++++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
>+@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
>+ #[allow(unused_imports)] // FIXME: spurious warning?
>+ use crate::sealed::Simd;
>+ 
>+-// Shuffle intrinsics: expanded in users' crates, therefore public.
>+ extern "platform-intrinsic" {
>+-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
>+-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
>+-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
>+-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
>+-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
>+-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
>++    fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -22,7 +16,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
>+ {
>+-    simd_shuffle2(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -32,7 +26,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
>+ {
>+-    simd_shuffle4(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -42,7 +36,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
>+ {
>+-    simd_shuffle8(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -52,7 +46,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
>+ {
>+-    simd_shuffle16(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -62,7 +56,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
>+ {
>+-    simd_shuffle32(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -72,7 +66,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
>+ {
>+-    simd_shuffle64(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ extern "platform-intrinsic" {
>-- 
>2.42.0
>
>
>From 2874be6eb15d232481bad33e5c65e0fc42ddfca9 Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Sun, 15 Oct 2023 19:58:23 +0200
>Subject: [PATCH 3/4] www/tor-browser: fix build with rust 1.73.0
>
>The crate packed_simd_2 is not maintained anymore.
>firefox switched to packed_simd [1] in [2] but
>it's not yet part of tor-browser 12.0.6
>Backport [3] to fix the following issue:
>
>error: unrecognized platform-specific intrinsic function: `simd_shuffle2`
>  --> /wrkdirs/usr/ports/www/tor-browser/work/firefox-tor-browser-102.11.0esr-12.0-1-build1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
>   |
>10 |     pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
>   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>
>[1] https://github.com/rust-lang/packed_simd/
>[2] https://github.com/mozilla/gecko-dev/commit/1e1bec8c6e383abf667d64ba1e556a4e68833f28
>[3] https://github.com/rust-lang/packed_simd/commit/a79edf4cfc54aad30a5630b217645c4b8274d8f7
>
>PR:		274499
>---
> www/tor-browser/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++
> 1 file changed, 83 insertions(+)
> create mode 100644 www/tor-browser/files/patch-rust-1.73.0
>
>diff --git a/www/tor-browser/files/patch-rust-1.73.0 b/www/tor-browser/files/patch-rust-1.73.0
>new file mode 100644
>index 0000000000..b838ffd90d
>--- /dev/null
>+++ b/www/tor-browser/files/patch-rust-1.73.0
>@@ -0,0 +1,83 @@
>+From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
>+From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
>+Date: Mon, 10 Jul 2023 09:46:53 +0000
>+Subject: [PATCH] Stop using old-style `simd_shuffle`
>+
>+---
>+ src/codegen/llvm.rs | 20 +++++++-------------
>+ 1 file changed, 7 insertions(+), 13 deletions(-)
>+
>+diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
>+index b4c09849..bb482fac 100644
>+--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
>++++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
>+@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
>+ #[allow(unused_imports)] // FIXME: spurious warning?
>+ use crate::sealed::Simd;
>+ 
>+-// Shuffle intrinsics: expanded in users' crates, therefore public.
>+ extern "platform-intrinsic" {
>+-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
>+-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
>+-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
>+-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
>+-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
>+-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
>++    fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -22,7 +16,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
>+ {
>+-    simd_shuffle2(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -32,7 +26,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
>+ {
>+-    simd_shuffle4(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -42,7 +36,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
>+ {
>+-    simd_shuffle8(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -52,7 +46,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
>+ {
>+-    simd_shuffle16(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -62,7 +56,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
>+ {
>+-    simd_shuffle32(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -72,7 +66,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
>+ {
>+-    simd_shuffle64(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ extern "platform-intrinsic" {
>-- 
>2.42.0
>
>
>From 9ad79d36155fd66bc93c06246df4bd8a6711d2b1 Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Sun, 15 Oct 2023 19:58:51 +0200
>Subject: [PATCH 4/4] www/librewolf: fix build with rust 1.73.0
>
>The crate packed_simd_2 is not maintained anymore.
>firefox switched to packed_simd [1] in [2] but
>it's not yet part of librewolf 117
>Backport [3] to fix the following issue:
>
>error: unrecognized platform-specific intrinsic function: `simd_shuffle2`
>  --> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
>   |
>10 |     pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
>   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>
>[1] https://github.com/rust-lang/packed_simd/
>[2] https://github.com/mozilla/gecko-dev/commit/1e1bec8c6e383abf667d64ba1e556a4e68833f28
>[3] https://github.com/rust-lang/packed_simd/commit/a79edf4cfc54aad30a5630b217645c4b8274d8f7
>
>PR:		274499
>---
> www/librewolf/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++++
> 1 file changed, 83 insertions(+)
> create mode 100644 www/librewolf/files/patch-rust-1.73.0
>
>diff --git a/www/librewolf/files/patch-rust-1.73.0 b/www/librewolf/files/patch-rust-1.73.0
>new file mode 100644
>index 0000000000..b838ffd90d
>--- /dev/null
>+++ b/www/librewolf/files/patch-rust-1.73.0
>@@ -0,0 +1,83 @@
>+From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
>+From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
>+Date: Mon, 10 Jul 2023 09:46:53 +0000
>+Subject: [PATCH] Stop using old-style `simd_shuffle`
>+
>+---
>+ src/codegen/llvm.rs | 20 +++++++-------------
>+ 1 file changed, 7 insertions(+), 13 deletions(-)
>+
>+diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
>+index b4c09849..bb482fac 100644
>+--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
>++++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
>+@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
>+ #[allow(unused_imports)] // FIXME: spurious warning?
>+ use crate::sealed::Simd;
>+ 
>+-// Shuffle intrinsics: expanded in users' crates, therefore public.
>+ extern "platform-intrinsic" {
>+-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
>+-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
>+-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
>+-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
>+-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
>+-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
>++    fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -22,7 +16,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
>+ {
>+-    simd_shuffle2(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -32,7 +26,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
>+ {
>+-    simd_shuffle4(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -42,7 +36,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
>+ {
>+-    simd_shuffle8(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -52,7 +46,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
>+ {
>+-    simd_shuffle16(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -62,7 +56,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
>+ {
>+-    simd_shuffle32(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -72,7 +66,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
>+ {
>+-    simd_shuffle64(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ extern "platform-intrinsic" {
>-- 
>2.42.0
>
>From 6f2f701018a6cc780a2e7ece172bea26c7104219 Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Mon, 16 Oct 2023 12:39:44 +0200
>Subject: [PATCH] databases/gobang: Fix build with rust 1.73.0
>
>Import upstream patch to fix the following build error with rust 1.73.0
>error[E0308]: mismatched types
>  --> /wrkdirs/usr/ports/databases/gobang/work/gobang-0.1.0-alpha.5/cargo-crates/num-bigint-0.3.2/src/biguint/convert.rs:70:19
>   |
>70 |         .div_ceil(&big_digit::BITS.into())
>   |          -------- ^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `&_`
>   |          |
>   |          arguments to this method are incorrect
>
>error[E0308]: mismatched types
>   --> /wrkdirs/usr/ports/databases/gobang/work/gobang-0.1.0-alpha.5/cargo-crates/num-bigint-0.3.2/src/biguint/convert.rs:585:19
>    |
>585 |         .div_ceil(&u64::from(bits))
>    |          -------- ^^^^^^^^^^^^^^^^ expected `u64`, found `&u64`
>    |          |
>    |          arguments to this method are incorrect
>
>PR:		274499
>Approved by:	portmgr (build fix blanket)
>
>---
> databases/gobang/files/patch-rust-1.73.0 | 64 ++++++++++++++++++++++++
> 2 files changed, 65 insertions(+), 1 deletion(-)
> create mode 100644 databases/gobang/files/patch-rust-1.73.0
>
>diff --git a/databases/gobang/files/patch-rust-1.73.0 b/databases/gobang/files/patch-rust-1.73.0
>new file mode 100644
>index 0000000000..aa0bf93735
>--- /dev/null
>+++ b/databases/gobang/files/patch-rust-1.73.0
>@@ -0,0 +1,64 @@
>+From a8fc78c1e28c55af83a57d97dff3f6a93c45b46c Mon Sep 17 00:00:00 2001
>+From: Philippe Antoine <contact@catenacyber.fr>
>+Date: Fri, 3 Sep 2021 09:29:36 +0200
>+Subject: [PATCH] rust: use explicitily Integer::div_ceil
>+
>+cf https://github.com/rust-lang/rust/issues/88581
>+---
>+ src/biguint.rs         |  2 +-
>+ src/biguint/convert.rs | 15 ++++++---------
>+ 2 files changed, 7 insertions(+), 10 deletions(-)
>+
>+diff --git a/src/biguint.rs b/src/biguint.rs
>+index 271a8837..623823c8 100644
>+--- cargo-crates/num-bigint-0.3.2/src/biguint.rs
>++++ cargo-crates/num-bigint-0.3.2/src/biguint.rs
>+@@ -395,7 +395,7 @@ impl Roots for BigUint {
>+                 // Try to guess by scaling down such that it does fit in `f64`.
>+                 // With some (x * 2â¿áµ), its nth root â (â¿âx * 2áµ)
>+                 let extra_bits = bits - (core::f64::MAX_EXP as u64 - 1);
>+-                let root_scale = extra_bits.div_ceil(&n64);
>++                let root_scale = Integer::div_ceil(&extra_bits, &n64);
>+                 let scale = root_scale * n64;
>+                 if scale < bits && bits - scale > n64 {
>+                     (self >> scale).nth_root(n) << root_scale
>+diff --git a/src/biguint/convert.rs b/src/biguint/convert.rs
>+index edeed84c..799152d5 100644
>+--- cargo-crates/num-bigint-0.3.2/src/biguint/convert.rs
>++++ cargo-crates/num-bigint-0.3.2/src/biguint/convert.rs
>+@@ -65,9 +65,8 @@ fn from_inexact_bitwise_digits_le(v: &[u8], bits: u8) -> BigUint {
>+     debug_assert!(!v.is_empty() && bits <= 8 && big_digit::BITS % bits != 0);
>+     debug_assert!(v.iter().all(|&c| BigDigit::from(c) < (1 << bits)));
>+ 
>+-    let big_digits = (v.len() as u64)
>+-        .saturating_mul(bits.into())
>+-        .div_ceil(&big_digit::BITS.into())
>++    let big_digits = (v.len() as u64).saturating_mul(bits.into());
>++    let big_digits = Integer::div_ceil(&big_digits, &big_digit::BITS.into())
>+         .to_usize()
>+         .unwrap_or(core::usize::MAX);
>+     let mut data = Vec::with_capacity(big_digits);
>+@@ -580,9 +579,8 @@ pub(super) fn to_bitwise_digits_le(u: &BigUint, bits: u8) -> Vec<u8> {
>+     let last_i = u.data.len() - 1;
>+     let mask: BigDigit = (1 << bits) - 1;
>+     let digits_per_big_digit = big_digit::BITS / bits;
>+-    let digits = u
>+-        .bits()
>+-        .div_ceil(&u64::from(bits))
>++    let digits = u.bits();
>++    let digits = Integer::div_ceil(&digits, &u64::from(bits))
>+         .to_usize()
>+         .unwrap_or(core::usize::MAX);
>+     let mut res = Vec::with_capacity(digits);
>+@@ -608,9 +606,8 @@ fn to_inexact_bitwise_digits_le(u: &BigUint, bits: u8) -> Vec<u8> {
>+     debug_assert!(!u.is_zero() && bits <= 8 && big_digit::BITS % bits != 0);
>+ 
>+     let mask: BigDigit = (1 << bits) - 1;
>+-    let digits = u
>+-        .bits()
>+-        .div_ceil(&u64::from(bits))
>++    let digits = u.bits();
>++    let digits = Integer::div_ceil(&digits, &u64::from(bits))
>+         .to_usize()
>+         .unwrap_or(core::usize::MAX);
>+     let mut res = Vec::with_capacity(digits);
>-- 
>2.42.0
>
>From e2b569c3c5e829df7580f363f514154ddc3168c8 Mon Sep 17 00:00:00 2001
>From: Mikael Urankar <mikael@FreeBSD.org>
>Date: Mon, 16 Oct 2023 10:56:30 +0200
>Subject: [PATCH] textproc/ripgrep: Fix build with rust 1.73.0
>
>The crate packed_simd_2 is not maintained anymore.
>firefox switched to packed_simd [1] in [2] but
>it's not yet part of ripgrep 13.0.0
>Backport [3] to fix the following issue:
>
>error: unrecognized platform-specific intrinsic function: `simd_shuffle2`
>  --> /wrkdirs/usr/ports/textproc/ripgrep/work/ripgrep-13.0.0/cargo-crates/packed_simd_2-0.3.8/src/codegen/llvm.rs:10:5
>   |
>10 |     pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
>   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>
>[1] https://github.com/rust-lang/packed_simd/
>[2] https://github.com/mozilla/gecko-dev/commit/1e1bec8c6e383abf667d64ba1e556a4e68833f28
>[3] https://github.com/rust-lang/packed_simd/commit/a79edf4cfc54aad30a5630b217645c4b8274d8f7
>
>PR:		274499
>Approved by:	portmgr (build fix blanket)
>
>---
> textproc/ripgrep/files/patch-rust-1.73.0 | 83 ++++++++++++++++++++++++
> 1 file changed, 83 insertions(+)
> create mode 100644 textproc/ripgrep/files/patch-rust-1.73.0
>
>diff --git a/textproc/ripgrep/files/patch-rust-1.73.0 b/textproc/ripgrep/files/patch-rust-1.73.0
>new file mode 100644
>index 0000000000..c80b7ea2c8
>--- /dev/null
>+++ b/textproc/ripgrep/files/patch-rust-1.73.0
>@@ -0,0 +1,83 @@
>+From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
>+From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
>+Date: Mon, 10 Jul 2023 09:46:53 +0000
>+Subject: [PATCH] Stop using old-style `simd_shuffle`
>+
>+---
>+ src/codegen/llvm.rs | 20 +++++++-------------
>+ 1 file changed, 7 insertions(+), 13 deletions(-)
>+
>+diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
>+index b4c09849..bb482fac 100644
>+--- cargo-crates/packed_simd_2-0.3.8/src/codegen/llvm.rs
>++++ cargo-crates/packed_simd_2-0.3.8/src/codegen/llvm.rs
>+@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
>+ #[allow(unused_imports)] // FIXME: spurious warning?
>+ use crate::sealed::Simd;
>+ 
>+-// Shuffle intrinsics: expanded in users' crates, therefore public.
>+ extern "platform-intrinsic" {
>+-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
>+-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
>+-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
>+-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
>+-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
>+-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
>++    fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -22,7 +16,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
>+ {
>+-    simd_shuffle2(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -32,7 +26,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
>+ {
>+-    simd_shuffle4(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -42,7 +36,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
>+ {
>+-    simd_shuffle8(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -52,7 +46,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
>+ {
>+-    simd_shuffle16(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -62,7 +56,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
>+ {
>+-    simd_shuffle32(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ #[allow(clippy::missing_safety_doc)]
>+@@ -72,7 +66,7 @@ where
>+     T: Simd,
>+     <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
>+ {
>+-    simd_shuffle64(x, y, IDX)
>++    simd_shuffle(x, y, IDX)
>+ }
>+ 
>+ extern "platform-intrinsic" {
>-- 
>2.42.0
>

Actions: View | Diff

Attachments on bug 274499: 245644 | 245645 | 245669