From a65dd614c617db34aefdf6e20ae6195e5b2186da Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Tue, 22 Oct 2019 12:04:14 +0200
Subject: [PATCH 1/2] - Put cbindgen .cargo/config to separate dir to avoid
 overwriting original stuff

---
 firefox.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index 1c42369..873a00d 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -466,19 +466,19 @@ chmod -x third_party/rust/itertools/src/lib.rs
 mkdir -p my_rust_vendor
 cd my_rust_vendor
 %{__tar} xf %{SOURCE2}
-cd -
 mkdir -p .cargo
 cat > .cargo/config <<EOL
 [source.crates-io]
 replace-with = "vendored-sources"
 
 [source.vendored-sources]
-directory = "`pwd`/my_rust_vendor"
+directory = "`pwd`"
 EOL
 
 env CARGO_HOME=.cargo cargo install cbindgen
 export PATH=`pwd`/.cargo/bin:$PATH
 %endif
+cd -
 
 echo "Generate big endian version of config/external/icu/data/icud58l.dat"
 %if 0%{?big_endian}

From 224952cb674dd7045c020467766841c17ecf1d93 Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Tue, 22 Oct 2019 12:38:47 +0200
Subject: [PATCH 2/2] Resolves: #1466936 Fixed aarch build patch
 rhbz-1354671.patch

---
 rhbz-1354671.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rhbz-1354671.patch b/rhbz-1354671.patch
index 1f867eb..b6e8bbd 100644
--- a/rhbz-1354671.patch
+++ b/rhbz-1354671.patch
@@ -1,12 +1,12 @@
-diff -up firefox-65.0/layout/base/PresShell.h.1354671 firefox-65.0/layout/base/PresShell.h
---- firefox-65.0/layout/base/PresShell.h.1354671	2019-01-29 11:50:08.516649643 +0100
-+++ firefox-65.0/layout/base/PresShell.h	2019-01-29 11:51:48.930258629 +0100
-@@ -205,7 +205,7 @@ class nsIPresShell : public nsStubDocume
+diff -up firefox-70.0/layout/base/PresShell.h.1354671 firefox-70.0/layout/base/PresShell.h
+--- firefox-70.0/layout/base/PresShell.h.1354671	2019-10-22 12:33:12.987775587 +0200
++++ firefox-70.0/layout/base/PresShell.h	2019-10-22 12:36:39.999366086 +0200
+@@ -257,7 +257,7 @@ class PresShell final : public nsStubDoc
     * to the same aSize value.  AllocateFrame is infallible and will abort
     * on out-of-memory.
     */
 -  void* AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) {
 +  void* __attribute__((optimize("no-lifetime-dse"))) AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) {
-     void* result = mFrameArena.AllocateByFrameID(aID, aSize);
-     RecordAlloc(result);
-     return result;
+ #define FRAME_ID(classname, ...)                                  \
+   static_assert(size_t(nsQueryFrame::FrameIID::classname##_id) == \
+                     size_t(eArenaObjectID_##classname),           \