From nobody Tue Oct 24 10:23:15 2023 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 4SF7S36S2wz4xrNF; Tue, 24 Oct 2023 10:23:15 +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 4SF7S34pPbz4FqT; Tue, 24 Oct 2023 10:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698142995; 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=3ou9stdye0gryJ0xv0/qTF+Q16vHTOgIYcs8b9Nyb+M=; b=UYvgzw9spwwWOywXlc3/vvr38OD0bCM5mSTq7aPxxcYj1qG3/h+VHynUoLH5rYa0nvX9k5 zGUTlpBqJc0hCiA1QRF97++ykoOPlCt9DMw8kcHEiElmig6CP3aXxrMA8YtGe3tGIAHmHG McoY+99rmZUJqqmcbdIcGVqzgpCTfysWE+EgtzwFAmwU8a9w1/ldqe0hlERbfY5JPt6QLA P1ygHPzjXAuauTXi4CWT+V0y1xlZKJjG4mjpffExmvnZE2oMYpD1PcpBtlCyqUqFpqfdZs sdTI9cpErfz8WoU77muSa4qU6P0NxK1VvNVE8Bc2UdX6WDJJnNYRqGVbp52U9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698142995; a=rsa-sha256; cv=none; b=Zd+hbL36hz/+jP5+ZrSeqp6nHindMSocxYXOst+l7S2Sh8vikhOekDF+ehXYvzU+X0sgoK hlAHMHgcaAAZr0WGmKwpX3R8I4mu3QlZiYDpnAC5PjrsTs9770QSHorXfjIhTSzGjenIPK XGqoIK+PWc4dfhGuctQ7tl2A8bBa2R08xmvJPfbXKRijK+TLwvLIIrubQMxJTsOEfcpz0G 9SPUmqaBChnjn3eJeJ90ZVtwWuc5hCbXw8j3gGvOScyCNWRxJ6DsDKd6ZMEw8GDiIrgICJ Q0Kv+23BE4ZYSKRwy+fRKSxEhxwHse3vj9XBa6+85cehx6zmukaf1azXgizscQ== 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=1698142995; 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=3ou9stdye0gryJ0xv0/qTF+Q16vHTOgIYcs8b9Nyb+M=; b=i88CsECsgIgF1Fc+nUMbHyoj0XCx0Q0bEx1Yxs2iKk5+/ok0qASW5QVV+/WSusplFcwENk IMOA/JGEqctjgOrTb5382AstfpJPYCZSpL44GGNUOLcPqh21XSmW+NdJ0S0qQ0H4CWSmDz A/q5RVo5lBMFVvwTOmfgrbyWpRcKrLIO2kz7uuGQ+tg9LXXMyEIts/BNe7wWBG4uz2qm6Y /NpEx0QvxTfWBaf2QPBAxq2Rhiw9tdKaTflFbmJ9QLA0ORuApRW1oDUlLzAK8UnQvhtuj7 CU/mgHN1ZY5WAskoWfSNwjy88pu36KOdfR46d2TTsU5kUCbCRPTD1hQBNoHEmw== 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 4SF7S33w7Sz3tQ; Tue, 24 Oct 2023 10:23:15 +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 39OANFmq070672; Tue, 24 Oct 2023 10:23:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OANFQk070669; Tue, 24 Oct 2023 10:23:15 GMT (envelope-from git) Date: Tue, 24 Oct 2023 10:23:15 GMT Message-Id: <202310241023.39OANFQk070669@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 3e99d4e97814 - main - databases/gobang: Fix build with rust 1.73.0 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e99d4e978144e6e424bda44e3041abfc6cc92bf Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e99d4e978144e6e424bda44e3041abfc6cc92bf commit 3e99d4e978144e6e424bda44e3041abfc6cc92bf Author: Mikael Urankar AuthorDate: 2023-10-16 10:39:44 +0000 Commit: Mikael Urankar CommitDate: 2023-10-24 10:21:47 +0000 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/Makefile | 2 +- databases/gobang/files/patch-rust-1.73.0 | 64 ++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/databases/gobang/Makefile b/databases/gobang/Makefile index 3ebf3f1f65cb..646fd3ff7e62 100644 --- a/databases/gobang/Makefile +++ b/databases/gobang/Makefile @@ -1,7 +1,7 @@ PORTNAME= gobang DISTVERSIONPREFIX= v DISTVERSION= 0.1.0-alpha.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= databases MAINTAINER= yuri@FreeBSD.org 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 000000000000..aa0bf93735c8 --- /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 +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 { + 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 { + 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);