rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added rust 1.33 build fixes

Browse Source
This commit is contained in:
Martin Stransky 2019-03-12 12:13:13 +01:00
parent 0f15451c7e
commit a3aebc6fea
2 changed files with 64 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
rust-1.33-build.patch Normal file
View File

@ -0,0 +1,60 @@
diff -up thunderbird-60.5.3/servo/components/style_traits/Cargo.toml.rust-1.33-build thunderbird-60.5.3/servo/components/style_traits/Cargo.toml
--- thunderbird-60.5.3/servo/components/style_traits/Cargo.toml.rust-1.33-build 2019-03-04 19:17:27.000000000 +0100
+++ thunderbird-60.5.3/servo/components/style_traits/Cargo.toml 2019-03-12 12:09:28.754720164 +0100
@@ -19,7 +19,7 @@ cssparser = "0.23.0"
bitflags = "1.0"
euclid = "0.17"
malloc_size_of = { path = "../malloc_size_of" }
-malloc_size_of_derive = { path = "../malloc_size_of_derive" }
+malloc_size_of_derive = "0.1"
selectors = { path = "../selectors" }
serde = {version = "1.0", optional = true}
webrender_api = {git = "https://github.com/servo/webrender", optional = true}
diff -up thunderbird-60.5.3/servo/components/style_traits/lib.rs.rust-1.33-build thunderbird-60.5.3/servo/components/style_traits/lib.rs
--- thunderbird-60.5.3/servo/components/style_traits/lib.rs.rust-1.33-build 2019-03-04 19:17:27.000000000 +0100
+++ thunderbird-60.5.3/servo/components/style_traits/lib.rs 2019-03-12 12:10:04.596635368 +0100
@@ -72,7 +72,6 @@ pub enum CSSPixel {}
// / hidpi_ratio => DeviceIndependentPixel
// / desktop_zoom => CSSPixel
-pub mod cursor;
#[macro_use]
pub mod values;
#[macro_use]
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-12 12:10:04.596635368 +0100
@@ -135,24 +135,6 @@ where
}
}
-#[macro_export]
-macro_rules! serialize_function {
- ($dest: expr, $name: ident($( $arg: expr, )+)) => {
- serialize_function!($dest, $name($($arg),+))
- };
- ($dest: expr, $name: ident($first_arg: expr $( , $arg: expr )*)) => {
- {
- $dest.write_str(concat!(stringify!($name), "("))?;
- $first_arg.to_css($dest)?;
- $(
- $dest.write_str(", ")?;
- $arg.to_css($dest)?;
- )*
- $dest.write_char(')')
- }
- }
-}
-
/// Convenience wrapper to serialise CSS values separated by a given string.
pub struct SequenceWriter<'a, 'b: 'a, W: 'b> {
inner: &'a mut CssWriter<'b, W>,
@@ -404,7 +386,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)]

9
thunderbird.spec
View File

@ -106,15 +106,14 @@ Source21: thunderbird.sh.in
Source28: thunderbird-wayland.sh.in
Source29: thunderbird-wayland.desktop
# Mozilla (XULRunner) patches
# Build patches
Patch1: rust-1.33-build.patch
Patch9: mozilla-build-arm.patch
Patch26: build-icu-big-endian.patch
Patch37: build-jit-atomic-always-lucky.patch
Patch40: build-aarch64-skia.patch
Patch226: rhbz-1354671.patch
Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
# Build patches
Patch103: rhbz-1219542-s390-build.patch
# PPC fix
@ -231,8 +230,8 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%prep
%setup -q
# Mozilla (XULRunner) patches
#cd mozilla
# Build patches
%patch1 -p1 -b .rust-1.33-build
%patch9 -p2 -b .arm
%ifarch s390
%patch103 -p1 -b .rhbz-1219542-s390-build