From 339fcf649a5815692f5ba5f964f1f399f1c1c7799fdd6e0a1291d55f125f6f5e Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 9 Jan 2018 18:50:27 +0000 Subject: [PATCH] - fixed build with latest rust (mozilla-rust-1.23.patch) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=626 --- MozillaFirefox.changes | 5 + MozillaFirefox.spec | 2 + mozilla-rust-1.23.patch | 1083 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 1090 insertions(+) create mode 100644 mozilla-rust-1.23.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index aca5f22..b6994ef 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 9 18:48:02 UTC 2018 - wr@rosenauer.org + +- fixed build with latest rust (mozilla-rust-1.23.patch) + ------------------------------------------------------------------- Thu Jan 4 12:23:41 UTC 2018 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 2c40fa9..e9697f9 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -156,6 +156,7 @@ Patch7: mozilla-aarch64-startup-crash.patch Patch8: mozilla-bindgen-systemlibs.patch Patch9: mozilla-bmo1360278.patch Patch10: mozilla-bmo1399611-csd.patch +Patch11: mozilla-rust-1.23.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-no-default-ualocale.patch @@ -269,6 +270,7 @@ cd $RPM_BUILD_DIR/mozilla %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 # Firefox %patch101 -p1 %patch102 -p1 diff --git a/mozilla-rust-1.23.patch b/mozilla-rust-1.23.patch new file mode 100644 index 0000000..7cafa9b --- /dev/null +++ b/mozilla-rust-1.23.patch @@ -0,0 +1,1083 @@ + +# HG changeset patch +# User Simon Sapin +# Date 1510231769 21600 +# Node ID 3242ac6fdb3879f723145e6b07fff04a5c960d1e +# Parent bf63b9d8f2410464d5f2526588e380f934e937cc +servo: Merge #19162 - Allow unused imports for AsciiExt in style code (from emilio:ascii-ext); r=emilio + +See #19128, this part is cherry-picked so Gecko can build with rust nightly. + +Source-Repo: https://github.com/servo/servo +Source-Revision: e7a654dd13f589e127193267bcb576ffd661c11d + +diff --git a/servo/components/gfx/font.rs b/servo/components/gfx/font.rs +--- a/servo/components/gfx/font.rs ++++ b/servo/components/gfx/font.rs +@@ -5,17 +5,17 @@ + use app_units::Au; + use euclid::{Point2D, Rect, Size2D}; + use font_template::FontTemplateDescriptor; + use ordered_float::NotNaN; + use platform::font::{FontHandle, FontTable}; + use platform::font_context::FontContextHandle; + use platform::font_template::FontTemplateData; + use smallvec::SmallVec; +-use std::ascii::AsciiExt; ++#[allow(unused_imports)] use std::ascii::AsciiExt; + use std::borrow::ToOwned; + use std::cell::RefCell; + use std::collections::HashMap; + use std::rc::Rc; + use std::str; + use std::sync::Arc; + use std::sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize, Ordering}; + use style::computed_values::{font_stretch, font_variant_caps, font_weight}; +diff --git a/servo/components/net/fetch/cors_cache.rs b/servo/components/net/fetch/cors_cache.rs +--- a/servo/components/net/fetch/cors_cache.rs ++++ b/servo/components/net/fetch/cors_cache.rs +@@ -7,17 +7,17 @@ + //! For stuff involving ``, `