From nobody Fri Jun 09 11:38:28 2023 X-Original-To: dev-commits-ports-main@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 4Qczc525RNz4bgmV; Fri, 9 Jun 2023 11:38:29 +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 4Qczc51gXyz4JBw; Fri, 9 Jun 2023 11:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686310709; 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=cGmpcEfqlIUKihYMf/Z+bKXKCBQgT0gaTK3owpec5nk=; b=UJ8p4SUF8tmlZlYrD2ng6C673Uhyf4suI7mFmz8UavmAj83BUhPbdQL52MwaMB1jHWipOL DQtdVtzn3ViQn4YVL9B/kxT2WQEoKhV3KfkpfXOqbsThZXcUzK7FpUrlhHV10ujI38Pd1f DeKDB+YyX8CNO9H2Jj0C2eNcDJvILzC85j9eZnAcVIKrSHbvPvCjth/Y6a4Nwr+y+OWzDN obvnIy3Zfl8RmrHZrdIxHDNo5s7kTzVXDBD4zIONxZds9MVgpe4o3wC5YSk9m3z17pxlu+ NhPo6w5gYxltv2JIWJU54EPat0bG3tH2iG7jsNlbZDR3cLKerHD+AELb+8EJYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686310709; 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=cGmpcEfqlIUKihYMf/Z+bKXKCBQgT0gaTK3owpec5nk=; b=Te/YeOi/4rOH/uxMw/qV7b4mNf6a2Pa+XRa+9lZY+ali2CbiWmvTRDWDN+MC+2z6xNe5JA AdPpBo3x/BL37PlT+KUz219gj2gXQNe2ymIWru4E2GiF6CZrThG8CXeBPt5zuT/C6E4ywa Mh+3HGQOPp1iNBeAQSc8r4fNNBF90P6XYWmcNrYHah3WdoWd2a5ypJDI23xqzyDJ7WtXXa E9SYWMiQF4CI4ajeVL5AK1NnRWV+BqX/iKxEYQ5YPi7a3/yMyKJGXu+RGyyUERpeGmX5ob oW9Pjgc76d/rj0H7x0Cs+p+BQXo1t/a8xGHA/KcZBUvvqGV83+zhjvPhre912A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686310709; a=rsa-sha256; cv=none; b=nqOGu5lGl6V8tXD+HXtcARwhJWEuXuExScszZPgCEwlKBj0kXRfQDEpoiiWujdzm2AX0pf dsvtWdCYcGRaZ5iXFvA0zk/AarOAdlj32CAYXVUcUz7gPkEU46PDE8p+TywpLoOHiEYd3F eUyg+qJl4GD2cI0FckbjR9NAQazbDk9tRlvoY8cVI/lWIgqw/Ked+NrnjUG0Z5nmBi6VFk OguCodZObpnpGwqx/JjSJ7Glku0mFaNpXeVJspnBIaPVSNB995rekE6NnGJwVnIp7K0a1Z /oLRc7+7NjpyBYsKOkqdPmn0zEZ+IzPW0egzLXsnkMp/4wMHlMN+MgTADace/A== 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 4Qczc50StqzZ38; Fri, 9 Jun 2023 11:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 359BcSBe046704; Fri, 9 Jun 2023 11:38:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359BcSxo046703; Fri, 9 Jun 2023 11:38:28 GMT (envelope-from git) Date: Fri, 9 Jun 2023 11:38:28 GMT Message-Id: <202306091138.359BcSxo046703@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: 283822d1e5e7 - main - www/tor-browser: Fix build with rust 1.70.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 283822d1e5e74d8e647ec0674d7b5a70dc965f67 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=283822d1e5e74d8e647ec0674d7b5a70dc965f67 commit 283822d1e5e74d8e647ec0674d7b5a70dc965f67 Author: Mikael Urankar AuthorDate: 2023-06-09 07:25:04 +0000 Commit: Mikael Urankar CommitDate: 2023-06-09 11:38:16 +0000 www/tor-browser: Fix build with rust 1.70.0 Import an upstream patch to fix a build failure with rust 1.70.0. Obtained from: https://github.com/mozilla/mp4parse-rust/pull/376 PR: 271797 --- www/tor-browser/files/patch-rust-1.70.0 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/www/tor-browser/files/patch-rust-1.70.0 b/www/tor-browser/files/patch-rust-1.70.0 new file mode 100644 index 000000000000..233e51bee164 --- /dev/null +++ b/www/tor-browser/files/patch-rust-1.70.0 @@ -0,0 +1,33 @@ +https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100 + +From 8b5b652d38e007e736bb442ccd5aa5ed699db100 Mon Sep 17 00:00:00 2001 +From: Matthew Gregan +Date: Thu, 16 Jun 2022 13:54:02 +1200 +Subject: [PATCH] Fix `unstable-name-collisions` warning by using fully + qualified path. + +--- + mp4parse/src/lib.rs | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/mp4parse/src/lib.rs b/mp4parse/src/lib.rs +index 567ee21d..4f3d7153 100644 +--- third_party/rust/mp4parse/src/lib.rs ++++ third_party/rust/mp4parse/src/lib.rs +@@ -3506,8 +3506,13 @@ macro_rules! impl_mul { + type Output = $output; + + fn mul(self, rhs: $rhs) -> Self::Output { +- static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64); +- static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX); ++ static_assertions::const_assert!( ++ <$output as UpperBounded>::MAX <= <$inner>::MAX as u64 ++ ); ++ static_assertions::const_assert!( ++ <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX ++ <= <$output as UpperBounded>::MAX ++ ); + + let lhs: $inner = self.get().into(); + let rhs: $inner = rhs.get().into(); +