Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/firefox
This commit is contained in:
commit
e117f6436c
@ -466,19 +466,19 @@ chmod -x third_party/rust/itertools/src/lib.rs
|
|||||||
mkdir -p my_rust_vendor
|
mkdir -p my_rust_vendor
|
||||||
cd my_rust_vendor
|
cd my_rust_vendor
|
||||||
%{__tar} xf %{SOURCE2}
|
%{__tar} xf %{SOURCE2}
|
||||||
cd -
|
|
||||||
mkdir -p .cargo
|
mkdir -p .cargo
|
||||||
cat > .cargo/config <<EOL
|
cat > .cargo/config <<EOL
|
||||||
[source.crates-io]
|
[source.crates-io]
|
||||||
replace-with = "vendored-sources"
|
replace-with = "vendored-sources"
|
||||||
|
|
||||||
[source.vendored-sources]
|
[source.vendored-sources]
|
||||||
directory = "`pwd`/my_rust_vendor"
|
directory = "`pwd`"
|
||||||
EOL
|
EOL
|
||||||
|
|
||||||
env CARGO_HOME=.cargo cargo install cbindgen
|
env CARGO_HOME=.cargo cargo install cbindgen
|
||||||
export PATH=`pwd`/.cargo/bin:$PATH
|
export PATH=`pwd`/.cargo/bin:$PATH
|
||||||
%endif
|
%endif
|
||||||
|
cd -
|
||||||
|
|
||||||
echo "Generate big endian version of config/external/icu/data/icud58l.dat"
|
echo "Generate big endian version of config/external/icu/data/icud58l.dat"
|
||||||
%if 0%{?big_endian}
|
%if 0%{?big_endian}
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
diff -up firefox-65.0/layout/base/PresShell.h.1354671 firefox-65.0/layout/base/PresShell.h
|
diff -up firefox-70.0/layout/base/PresShell.h.1354671 firefox-70.0/layout/base/PresShell.h
|
||||||
--- firefox-65.0/layout/base/PresShell.h.1354671 2019-01-29 11:50:08.516649643 +0100
|
--- firefox-70.0/layout/base/PresShell.h.1354671 2019-10-22 12:33:12.987775587 +0200
|
||||||
+++ firefox-65.0/layout/base/PresShell.h 2019-01-29 11:51:48.930258629 +0100
|
+++ firefox-70.0/layout/base/PresShell.h 2019-10-22 12:36:39.999366086 +0200
|
||||||
@@ -205,7 +205,7 @@ class nsIPresShell : public nsStubDocume
|
@@ -257,7 +257,7 @@ class PresShell final : public nsStubDoc
|
||||||
* to the same aSize value. AllocateFrame is infallible and will abort
|
* to the same aSize value. AllocateFrame is infallible and will abort
|
||||||
* on out-of-memory.
|
* on out-of-memory.
|
||||||
*/
|
*/
|
||||||
- void* AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) {
|
- void* AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) {
|
||||||
+ void* __attribute__((optimize("no-lifetime-dse"))) 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);
|
#define FRAME_ID(classname, ...) \
|
||||||
RecordAlloc(result);
|
static_assert(size_t(nsQueryFrame::FrameIID::classname##_id) == \
|
||||||
return result;
|
size_t(eArenaObjectID_##classname), \
|
||||||
|
Loading…
Reference in New Issue
Block a user