Date: Monday, April 27, 2020 @ 14:02:06 Author: foutrelis Revision: 381723
Fix build with rust 1.43 Added: thunderbird/trunk/rust-1.43.patch Modified: thunderbird/trunk/PKGBUILD -----------------+ PKGBUILD | 4 +++ rust-1.43.patch | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-27 13:21:44 UTC (rev 381722) +++ PKGBUILD 2020-04-27 14:02:06 UTC (rev 381723) @@ -19,9 +19,11 @@ optdepends=('libcanberra: sound support') options=(!emptydirs !makeflags) source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz{,.asc} + rust-1.43.patch $pkgname.desktop) sha512sums=('fae763030b7a54930291a10f298b7fa4ffc400849082f576556b9040d095f1007ae686daf1241dff8b73bac35c14acf21c156a18a3e16d62a7719c6cc34e4d1f' 'SKIP' + '8833130802e2bfb34036444d6855c96a5b819f90c9835decd816bbf50dc507a71b2c343fd53d3fec0d79df791bb56436b06f2430abbeb70c726574a57c385d54' 'a0061fcb2a7f66061e336a8d95948592f56f4752e56467f14ba63846720ebf845cce7511d1a2637e3b80d5a1ffdaa2fb783fa37195103425ef65222d45372012') validpgpkeys=(14F26682D0916CDD81E37B6D61B7B526D98F0353) # Mozilla Software Releases <rele...@mozilla.com> @@ -40,6 +42,8 @@ prepare() { cd $pkgname-$pkgver + patch -Np1 -i ../rust-1.43.patch + echo -n "$_google_api_key" >google-api-key echo -n "$_mozilla_api_key" >mozilla-api-key Added: rust-1.43.patch =================================================================== --- rust-1.43.patch (rev 0) +++ rust-1.43.patch 2020-04-27 14:02:06 UTC (rev 381723) @@ -0,0 +1,71 @@ + +# HG changeset patch +# User Emilio Cobos Álvarez <emi...@crisal.io> +# Date 1568322567 0 +# Node ID 773adf85740c7f5f295f9e17bba1d8a95888ee32 +# Parent a1824d4c404b8926930c2fbde5c9a14c7bd05763 +Bug 1580963 - Cherry-pick some servo changes from a rustc upgrade. + +This cherry-picks from Servo commit 98e4a53b724. + +Differential Revision: https://phabricator.services.mozilla.com/D45738 + +diff --git a/servo/components/style/stylesheets/viewport_rule.rs b/servo/components/style/stylesheets/viewport_rule.rs +--- a/servo/components/style/stylesheets/viewport_rule.rs ++++ b/servo/components/style/stylesheets/viewport_rule.rs +@@ -286,38 +286,47 @@ impl<'a, 'b, 'i> DeclarationParser<'i> f + + fn parse_value<'t>( + &mut self, + name: CowRcStr<'i>, + input: &mut Parser<'i, 't>, + ) -> Result<Vec<ViewportDescriptorDeclaration>, ParseError<'i>> { + macro_rules! declaration { + ($declaration:ident($parse:expr)) => { +- declaration!($declaration(value: try!($parse(input)), +- important: input.try(parse_important).is_ok())) ++ declaration!($declaration { ++ value: $parse(input)?, ++ important: input.try(parse_important).is_ok(), ++ }) + }; +- ($declaration:ident(value: $value:expr, important: $important:expr)) => { ++ ($declaration:ident { value: $value:expr, important: $important:expr, }) => { + ViewportDescriptorDeclaration::new( + self.context.stylesheet_origin, + ViewportDescriptor::$declaration($value), +- $important) +- } ++ $important, ++ ) ++ }; + } + + macro_rules! ok { + ($declaration:ident($parse:expr)) => { + Ok(vec![declaration!($declaration($parse))]) + }; + (shorthand -> [$min:ident, $max:ident]) => {{ + let shorthand = parse_shorthand(self.context, input)?; + let important = input.try(parse_important).is_ok(); + + Ok(vec![ +- declaration!($min(value: shorthand.0, important: important)), +- declaration!($max(value: shorthand.1, important: important)), ++ declaration!($min { ++ value: shorthand.0, ++ important: important, ++ }), ++ declaration!($max { ++ value: shorthand.1, ++ important: important, ++ }), + ]) + }}; + } + + match_ignore_ascii_case! { &*name, + "min-width" => ok!(MinWidth(|i| ViewportLength::parse(self.context, i))), + "max-width" => ok!(MaxWidth(|i| ViewportLength::parse(self.context, i))), + "width" => ok!(shorthand -> [MinWidth, MaxWidth]), +