--- a/MozillaFirefox/MozillaFirefox.changes	Sat Nov 10 15:07:31 2018 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Wed Nov 14 08:31:32 2018 +0100
@@ -54,10 +54,12 @@
     Memory safety bugs fixed in Firefox 63 and Firefox ESR 60.3
 - requires NSPR 4.20, NSS 3.39 and Rust 1.28
 - latest rust does not provide rust-std so stop requiring it
-- requires cargo-crate-cbindgen >= 0.6.2 to build
-- requires nodejs to build
+- requires rust-cbindgen >= 0.6.2 to build
+- requires nodejs >= 8.11 to build
 - added mozilla-bmo1491289.patch to fix system NSS build (bmo#1491289)
 - added mozilla-cubeb-noreturn.patch to fix non-return function
+- added mozilla-newer-cbindgen.patch to fix build with cbindgen 0.6.7
+- disable elfhack for TW and newer due to build errors
 
 -------------------------------------------------------------------
 Thu Oct 25 14:39:04 UTC 2018 - guillaume.gardet@opensuse.org

--- a/MozillaFirefox/MozillaFirefox.spec	Sat Nov 10 15:07:31 2018 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Nov 14 08:31:32 2018 +0100
@@ -75,13 +75,13 @@
 BuildRequires:  makeinfo
 BuildRequires:  mozilla-nspr-devel >= 4.20
 BuildRequires:  mozilla-nss-devel >= 3.39
-BuildRequires:  nodejs
+BuildRequires:  nodejs8 >= 8.11
 BuildRequires:  python-devel
 BuildRequires:  python2-xml
 BuildRequires:  python3 >= 3.5
 BuildRequires:  rust >= 1.28
 BuildRequires:  cargo >= 1.28
-BuildRequires:  cargo-crate-cbindgen >= 0.6.2
+BuildRequires:  rust-cbindgen >= 0.6.2
 BuildRequires:  startup-notification-devel
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
@@ -162,6 +162,7 @@
 Patch9:         mozilla-bmo1463035.patch
 Patch10:        mozilla-bmo1491289.patch
 Patch11:        mozilla-cubeb-noreturn.patch
+Patch12:        mozilla-newer-cbindgen.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@@ -273,6 +274,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
@@ -360,6 +362,9 @@
 %ifarch %arm
 ac_add_options --disable-elf-hack
 %endif
+%if 0%{?suse_version} > 1549
+ac_add_options --disable-elf-hack
+%endif
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 %if %{localize}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-newer-cbindgen.patch	Wed Nov 14 08:31:32 2018 +0100
@@ -0,0 +1,1 @@
+../mozilla-newer-cbindgen.patch
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-newer-cbindgen.patch	Wed Nov 14 08:31:32 2018 +0100
@@ -0,0 +1,18 @@
+diff --git servo/components/style/cbindgen.toml servo/components/style/cbindgen.toml
+index 46162e43db5e..49872e88b7d9 100644
+--- a/servo/components/style/cbindgen.toml
++++ b/servo/components/style/cbindgen.toml
+@@ -28,6 +28,12 @@ include = [
+   "StyleDisplay",
+   "StyleDisplayMode",
+   "StyleFillRule",
+-  "StylePathCommand"
++  "StylePathCommand",
++
++  "Appearance",
++  "Display",
++  "DisplayMode",
++  "FillRule",
++  "PathCommand"
+ ]
+ item_types = ["enums", "structs", "typedefs"]

--- a/series	Sat Nov 10 15:07:31 2018 +0100
+++ b/series	Wed Nov 14 08:31:32 2018 +0100
@@ -10,6 +10,7 @@
 mozilla-bmo1463035.patch
 mozilla-bmo1491289.patch
 mozilla-cubeb-noreturn.patch
+mozilla-newer-cbindgen.patch
 
 # Firefox patches
 firefox-kde.patch