rpm/MozillaThunderbird
SHA256
1
0
Fork 0
forked from pool/MozillaThunderbird
Code Pull Requests Activity

Accepting request 800249 from home:namtrac:branches:mozilla:Factory

Browse Source 
- Add mozilla-bmo1580963.patch to fix build with rust 1.43

OBS-URL: https://build.opensuse.org/request/show/800249
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=527
This commit is contained in:
Wolfgang Rosenauer 2020-05-05 07:28:14 +00:00 committed by Git OBS Bridge
parent 12132f7191
commit 34187271c9
3 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MozillaThunderbird.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 5 07:00:36 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
- Add mozilla-bmo1580963.patch to fix build with rust 1.43
-------------------------------------------------------------------
Thu Apr 9 17:27:50 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>

2
MozillaThunderbird.spec
View File

@ -172,6 +172,7 @@ Patch21: mozilla-bmo1554971.patch
Patch22: mozilla-nestegg-big-endian.patch
Patch24: mozilla-fix-top-level-asm.patch
Patch25: mozilla-bmo1504834-part4.patch
Patch26: mozilla-bmo1580963.patch
%endif # only_print_mozconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: coreutils fileutils textutils /bin/sh
@ -269,6 +270,7 @@ fi
%patch22 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
%endif # only_print_mozconfig
%build

61
mozilla-bmo1580963.patch Normal file
View File

@ -0,0 +1,61 @@
From 7617a0e6fe2bb7afab6ffda49fc8cd9eca2f035b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 12 Sep 2019 21:09:27 +0000
Subject: [PATCH] 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
--HG--
extra : moz-landing-system : lando
---
.../style/stylesheets/viewport_rule.rs | 23 +++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/servo/components/style/stylesheets/viewport_rule.rs b/servo/components/style/stylesheets/viewport_rule.rs
index 8cc858f7a7f69..7d0881e3336a9 100644
--- old/servo/components/style/stylesheets/viewport_rule.rs
+++ new/servo/components/style/stylesheets/viewport_rule.rs
@@ -291,15 +291,18 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> {
) -> 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 {
@@ -311,8 +314,14 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> {
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,
+ }),
])
}};
}