diff options
| author | Martin Stransky <stransky@redhat.com> | 2019-10-31 23:42:16 +0100 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2019-10-31 23:42:16 +0100 |
| commit | e117f6436c1f5ddd96b65eb6368c9f62f2d02280 (patch) | |
| tree | 50ab6434ce47827018dd751d3b343af58251c744 | |
| parent | Switched to in-tree nss due to rhbz#1752303 (diff) | |
| parent | Resolves: #1466936 Fixed aarch build patch rhbz-1354671.patch (diff) | |
| download | librewolf-fedora-ff-e117f6436c1f5ddd96b65eb6368c9f62f2d02280.tar.gz librewolf-fedora-ff-e117f6436c1f5ddd96b65eb6368c9f62f2d02280.tar.bz2 librewolf-fedora-ff-e117f6436c1f5ddd96b65eb6368c9f62f2d02280.zip | |
Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/firefox
| -rw-r--r-- | firefox.spec | 4 | ||||
| -rw-r--r-- | rhbz-1354671.patch | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/firefox.spec b/firefox.spec index 4861773..dd7bab4 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} 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), \ |