From 149d30b308a8e46ce895a4791d496dc33518cd70 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Thu, 11 Jul 2019 14:26:24 +0200
Subject: [PATCH] Add rust 1.35 fixes

---
 rust-1.33-build.patch | 36 ++++++++++++++++++++++--------------
 thunderbird.spec      |  4 ++--
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/rust-1.33-build.patch b/rust-1.33-build.patch
index 7fc4131..746145f 100644
--- a/rust-1.33-build.patch
+++ b/rust-1.33-build.patch
@@ -1,22 +1,30 @@
-diff -up thunderbird-60.7.0/servo/components/style/gecko/regen_atoms.py.rust-1.33-build thunderbird-60.7.0/servo/components/style/gecko/regen_atoms.py
---- thunderbird-60.7.0/servo/components/style/gecko/regen_atoms.py.rust-1.33-build	2019-05-17 14:05:38.000000000 +0200
-+++ thunderbird-60.7.0/servo/components/style/gecko/regen_atoms.py	2019-05-20 15:01:06.284881858 +0200
-@@ -202,6 +202,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n  '
-                  ' }}}};')
+diff -up thunderbird-60.8.0/servo/components/style_traits/values.rs.rust-1.33-build thunderbird-60.8.0/servo/components/style_traits/values.rs
+--- thunderbird-60.8.0/servo/components/style_traits/values.rs.rust-1.33-build	2019-07-03 17:25:28.000000000 +0200
++++ thunderbird-60.8.0/servo/components/style_traits/values.rs	2019-07-11 13:38:53.687318154 +0200
+@@ -135,6 +135,7 @@ where
+     }
+ }
  
- MACRO = '''
-+/// Returns a static atom by passing the literal string it represents.
++/// Some comment
  #[macro_export]
- macro_rules! atom {{
- {}
-diff -up thunderbird-60.7.0/servo/components/style/properties/properties.mako.rs.rust-1.33-build thunderbird-60.7.0/servo/components/style/properties/properties.mako.rs
---- thunderbird-60.7.0/servo/components/style/properties/properties.mako.rs.rust-1.33-build	2019-05-17 14:05:38.000000000 +0200
-+++ thunderbird-60.7.0/servo/components/style/properties/properties.mako.rs	2019-05-20 15:01:06.286881852 +0200
+ macro_rules! serialize_function {
+     ($dest: expr, $name: ident($( $arg: expr, )+)) => {
+@@ -404,6 +405,7 @@ impl_to_css_for_predefined_type!(::csspa
+ impl_to_css_for_predefined_type!(::cssparser::Color);
+ impl_to_css_for_predefined_type!(::cssparser::UnicodeRange);
+ 
++/// Some comment
+ #[macro_export]
+ macro_rules! define_css_keyword_enum {
+     (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => {
+diff -up thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs.old thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs
+--- thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs.old	2019-07-11 14:22:51.393784701 +0200
++++ thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs	2019-07-11 14:24:03.182578100 +0200
 @@ -55,6 +55,7 @@ use style_adjuster::StyleAdjuster;
  
  pub use self::declaration_block::*;
  
-+/// Generated
++/// Neco
  #[cfg(feature = "gecko")]
  #[macro_export]
  macro_rules! property_name {
@@ -25,7 +33,7 @@ diff -up thunderbird-60.7.0/servo/components/style/properties/properties.mako.rs
  }
  
 -// NOTE(emilio): Callers are responsible to deal with prefs.
-+/// Callers are responsible to deal with prefs.
++/// NOTE(emilio): Callers are responsible to deal with prefs.
  #[macro_export]
  macro_rules! css_properties_accessors {
      ($macro_name: ident) => {
diff --git a/thunderbird.spec b/thunderbird.spec
index 73cf836..8a84488 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -109,7 +109,7 @@ Source28:       thunderbird-wayland.sh.in
 Source29:       thunderbird-wayland.desktop
 
 # Build patches
-#Patch1:         rust-1.33-build.patch
+Patch1:         rust-1.33-build.patch
 Patch9:         mozilla-build-arm.patch
 Patch26:        build-icu-big-endian.patch
 Patch37:        build-jit-atomic-always-lucky.patch
@@ -238,7 +238,7 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 %setup -q
 
 # Build patches
-#%patch1   -p1 -b .rust-1.33-build
+%patch1   -p1 -b .rust-1.33-build
 %patch9   -p2 -b .arm
 %ifarch s390
 %patch103 -p1 -b .rhbz-1219542-s390-build