diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 2c0b9e1..7d63f56 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 30 11:36:41 UTC 2019 - Manfred Hollstein + +- Add patch to fix build using rust-1.33: + * mozilla-bmo1519629.patch + ------------------------------------------------------------------- Mon Mar 25 12:08:23 UTC 2019 - Wolfgang Rosenauer diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index b47f762..d1b0b09 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -122,6 +122,7 @@ Patch8: mozilla-bmo1464766.patch Patch9: mozilla-i586-DecoderDoctorLogger.patch Patch10: mozilla-i586-domPrefs.patch Patch11: mozilla-bmo1463035.patch +Patch12: mozilla-bmo1519629.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils fileutils textutils /bin/sh Recommends: libcanberra0 @@ -205,6 +206,7 @@ symbols meant for upload to Mozilla's crash collector database. %patch10 -p1 %endif %patch11 -p1 +%patch12 -p1 %build # no need to add build time to binaries diff --git a/mozilla-bmo1519629.patch b/mozilla-bmo1519629.patch new file mode 100644 index 0000000..7b6f11d --- /dev/null +++ b/mozilla-bmo1519629.patch @@ -0,0 +1,20 @@ +diff -rup thunderbird-60.6.1.orig/servo/components/style_traits/values.rs thunderbird-60.6.1/servo/components/style_traits/values.rs +--- thunderbird-60.6.1.orig/servo/components/style_traits/values.rs 2019-03-25 02:38:43.000000000 +0100 ++++ thunderbird-60.6.1/servo/components/style_traits/values.rs 2019-03-30 12:31:55.070634646 +0100 +@@ -135,6 +135,7 @@ where + } + } + ++/// Documentation needed here, but the macro appears to be unused anyway... + #[macro_export] + macro_rules! serialize_function { + ($dest: expr, $name: ident($( $arg: expr, )+)) => { +@@ -404,6 +405,8 @@ impl_to_css_for_predefined_type!(::csspa + impl_to_css_for_predefined_type!(::cssparser::Color); + impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); + ++ ++/// Define an enum type with unit variants that each correspond to a CSS keyword. + #[macro_export] + macro_rules! define_css_keyword_enum { + (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => {