diff options
| author | Mikael Urankar <mikael@FreeBSD.org> | 2023-06-09 07:10:48 +0000 |
|---|---|---|
| committer | Mikael Urankar <mikael@FreeBSD.org> | 2023-06-09 11:38:15 +0000 |
| commit | 079eb8f6d4a5357aed0c1d4ad33f3a61ed7fbab2 (patch) | |
| tree | e8d0ae199b1b9b8b4c7e0544284681a0430355df | |
| parent | 6b9789547d5eeec192b5fe0039b0e6a54b743650 (diff) | |
| download | ports-079eb8f6d4a5357aed0c1d4ad33f3a61ed7fbab2.tar.gz ports-079eb8f6d4a5357aed0c1d4ad33f3a61ed7fbab2.zip | |
mail/thunderbird: 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
| -rw-r--r-- | mail/thunderbird/files/patch-rust-1.70.0 | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/mail/thunderbird/files/patch-rust-1.70.0 b/mail/thunderbird/files/patch-rust-1.70.0 new file mode 100644 index 000000000000..233e51bee164 --- /dev/null +++ b/mail/thunderbird/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 <kinetik@flim.org> +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(); + |