diff --git a/files/config b/files/config --- a/files/config +++ b/files/config @@ -17,7 +17,8 @@ # PiSi does this anyway ac_add_options --enable-install-strip -ac_add_options --enable-rust-simd +# https://bugzilla.mozilla.org/show_bug.cgi?id=1521249 +#ac_add_options --enable-rust-simd (fails with rust 1.33) ac_add_options --enable-hardening ac_add_options --enable-official-branding diff --git a/files/rust-1.33.patch b/files/rust-1.33.patch new file mode 100644 --- /dev/null +++ b/files/rust-1.33.patch @@ -0,0 +1,70 @@ +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)] diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : thunderbird version : 60.6.1 -release : 70 +release : 71 source : - https://ftp.mozilla.org/pub/thunderbird/releases/60.6.1/source/thunderbird-60.6.1.source.tar.xz : 17aef9232a76bdc812422883c02b01b4ecb7633c3ee9870da5e4ec0e20ba5f67 - https://getsol.us/sources/mozilla/thunderbird-60.6.1-langpacks.tar.xz : ec8f7a24087b4280b73f03b48e4f7eef0f15bd4ce568e73300c622b5a0e0a3c2 @@ -44,6 +44,7 @@ sed -e 's|##JOBCOUNT##|%JOBS%|' -e 's|##LIBDIR##|%libdir%|' -i mozconfig %patch -p1 < $pkgfiles/thunderbird-enable-addons.patch + %patch -p1 < $pkgfiles/rust-1.33.patch ./mach configure build : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ thunderbird - Pierre-Yves - pyu@riseup.net + F. von Gellhorn + flinux@vongellhorn.ch GPL-2.0-or-later LGPL-2.1-or-later @@ -192,12 +192,12 @@ - - 2019-03-25 + + 2019-04-13 60.6.1 Packaging update - Pierre-Yves - pyu@riseup.net + F. von Gellhorn + flinux@vongellhorn.ch \ No newline at end of file