thunderbird-kde: fix build

thunderbird-kde/PKGBUILD

@@ -19,12 +19,12 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sou
         thunderbird.desktop
         mozilla-kde.patch
         mozilla-nongnome-proxies.patch
-        0001-bz-1468911.patch)
+        rust-1.33.patch)
 sha512sums=('78e96aeb235a07ea3f53c4212a764e9b92dacd0e5d5561e454008a56d165a1e235ed05a8ecdb77efecf80f4c7f7ba2cf7a682c775047d7c175dfb50a1d9a42d2'
             '057513bc1b2573f31986916dc905f2e1a165e7500fea51ce7cba1f9f600c0a74396d0d39283ec5ee76fb401133bc614ebcf803b5d15fadac46728d55e30353ea'
             '00f363a5ece0afecf42597d0305aa8d363ce35870d3f54fd2d3c2f5d12b863e2e1d243b88e1ca506673a862da1eef48934d07cc7e7d10c2920453c49f7bb171c'
             '7f255bb3e02ac3a703bdcffe4bdb531489dace4e669a557fe9845e8137e87939fc671ed103dcef44162e3297dd04aad5484ab5f3b1d0859b75249fdad9de11f7'
-            '950c918813b88fbc4fe8aeb86f9686443d2bec7c5b7be2a05ed8818c8e3c9fef7359129624732e0c922da1bd454b6c123a50afde722ecd51798495068aea0ec6')
+            '7e6c9096c50ffcd216a36b6c2ad3eee773c7f337ffc3ed69538b4dec691748b87da822ef0b8cf73990efacd4bb0cb30313cec13ad2946483f8345e3eb0c1592f')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 # Note: These are for Chakra Linux use ONLY. For your own distribution, please
@@ -58,7 +58,8 @@ ac_add_options --enable-release
 ac_add_options --enable-linker=gold
 ac_add_options --enable-hardening
 ac_add_options --enable-optimize
-ac_add_options --enable-rust-simd
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
+#ac_add_options --enable-rust-simd
 ac_add_options --enable-default-toolkit=cairo-gtk3
 
 # Keys
@@ -105,7 +106,8 @@ END
   mkdir "$srcdir/path"
   ln -s /usr/bin/python2 "$srcdir/path/python"
 
-  patch -Np1 -i $srcdir/0001-bz-1468911.patch
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1539901 (Patch from Fedora)
+  patch -Np1 -i ../rust-1.33.patch
 }
          
 build() {

thunderbird-kde/rust-1.33.patch

+diff -up thunderbird-60.5.3/servo/components/style/gecko/regen_atoms.py.rust-1.33-build thunderbird-60.5.3/servo/components/style/gecko/regen_atoms.py
+--- thunderbird-60.5.3/servo/components/style/gecko/regen_atoms.py.rust-1.33-build	2019-03-04 19:17:31.000000000 +0100
++++ thunderbird-60.5.3/servo/components/style/gecko/regen_atoms.py	2019-03-13 15:05:58.965726109 +0100
+@@ -202,6 +202,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n  '
+                  ' }}}};')
+ 
+ MACRO = '''
++/// Returns a static atom by passing the literal string it represents.
+ #[macro_export]
+ macro_rules! atom {{
+ {}
+diff -up thunderbird-60.5.3/servo/components/style/gecko_string_cache/namespace.rs.rust-1.33-build thunderbird-60.5.3/servo/components/style/gecko_string_cache/namespace.rs
+--- thunderbird-60.5.3/servo/components/style/gecko_string_cache/namespace.rs.rust-1.33-build	2019-03-04 19:17:27.000000000 +0100
++++ thunderbird-60.5.3/servo/components/style/gecko_string_cache/namespace.rs	2019-03-13 15:05:58.966726107 +0100
+@@ -11,6 +11,7 @@ use std::fmt;
+ use std::ops::Deref;
+ use string_cache::{Atom, WeakAtom};
+ 
++/// Macro text
+ #[macro_export]
+ macro_rules! ns {
+     () => { $crate::string_cache::Namespace(atom!("")) };
+diff -up thunderbird-60.5.3/servo/components/style/properties/properties.mako.rs.rust-1.33-build thunderbird-60.5.3/servo/components/style/properties/properties.mako.rs
+--- thunderbird-60.5.3/servo/components/style/properties/properties.mako.rs.rust-1.33-build	2019-03-04 19:17:30.000000000 +0100
++++ thunderbird-60.5.3/servo/components/style/properties/properties.mako.rs	2019-03-13 15:05:58.966726107 +0100
+@@ -55,6 +55,7 @@ use style_adjuster::StyleAdjuster;
+ 
+ pub use self::declaration_block::*;
+ 
++/// Generated
+ #[cfg(feature = "gecko")]
+ #[macro_export]
+ macro_rules! property_name {
+@@ -3852,7 +3853,7 @@ impl fmt::Debug for AliasId {
+     }
+ }
+ 
+-// NOTE(emilio): Callers are responsible to deal with prefs.
++/// Callers are responsible to deal with prefs.
+ #[macro_export]
+ macro_rules! css_properties_accessors {
+     ($macro_name: ident) => {
+@@ -3875,6 +3876,7 @@ macro_rules! css_properties_accessors {
+     }
+ }
+ 
++/// Neco
+ #[macro_export]
+ macro_rules! longhand_properties_idents {
+     ($macro_name: ident) => {
+diff -up thunderbird-60.5.3/servo/components/style_traits/values.rs.rust-1.33-build thunderbird-60.5.3/servo/components/style_traits/values.rs
+--- thunderbird-60.5.3/servo/components/style_traits/values.rs.rust-1.33-build	2019-03-04 19:17:27.000000000 +0100
++++ thunderbird-60.5.3/servo/components/style_traits/values.rs	2019-03-13 15:37:34.077560034 +0100
+@@ -135,6 +135,7 @@ where
+     }
+ }
+ 
++/// Neco
+ #[macro_export]
+ macro_rules! serialize_function {
+     ($dest: expr, $name: ident($( $arg: expr, )+)) => {
+@@ -404,7 +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);
+ 
+-#[macro_export]
++/// Define an enum type with unit variants that each correspond to a CSS keyword.
+ macro_rules! define_css_keyword_enum {
+     (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => {
+         #[allow(missing_docs)]