summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Horak <jhorak@redhat.com>2017-04-27 13:10:48 +0200
committerJan Horak <jhorak@redhat.com>2017-04-27 13:10:48 +0200
commit816a052bf4c112885b0e722787bba5bff61f290d (patch)
tree5f13ae0e4a1d1384fca4655da339364d40a07d10
parentAdded patch for rhbz#1400293 - kai nss patch which removes workaround patch, ... (diff)
downloadlibrewolf-fedora-ff-816a052bf4c112885b0e722787bba5bff61f290d.tar.gz
librewolf-fedora-ff-816a052bf4c112885b0e722787bba5bff61f290d.tar.bz2
librewolf-fedora-ff-816a052bf4c112885b0e722787bba5bff61f290d.zip
Fixed rhbz-1354671.patch
-rw-r--r--firefox.spec4
-rw-r--r--rhbz-1354671.patch16
2 files changed, 8 insertions, 12 deletions
diff --git a/firefox.spec b/firefox.spec
index ffac162..fb6aec7 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -321,9 +321,9 @@ cd %{tarballdir}
%patch224 -p1 -b .1170092
%patch225 -p1 -b .1005640-accept-lang
#ARM run-time patch
-%ifarch aarch64
+#TEMP %ifarch aarch64
%patch226 -p1 -b .1354671
-%endif
+#%endif
%patch227 -p1 -b .rh1400293
%patch229 -p1 -b .nss-version
diff --git a/rhbz-1354671.patch b/rhbz-1354671.patch
index 7164e3d..6ee89b7 100644
--- a/rhbz-1354671.patch
+++ b/rhbz-1354671.patch
@@ -1,16 +1,12 @@
-@@ -, +, @@
----
- layout/base/nsIPresShell.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
---- a/layout/base/nsIPresShell.h
-+++ a/layout/base/nsIPresShell.h
-@@ -224,7 +224,7 @@ public:
- * to the same aSize value. AllocateFrame returns zero-filled memory.
- * AllocateFrame is infallible and will abort on out-of-memory.
+diff -up firefox-53.0/layout/base/nsIPresShell.h.1354671 firefox-53.0/layout/base/nsIPresShell.h
+--- firefox-53.0/layout/base/nsIPresShell.h.1354671 2017-04-27 13:07:43.808653320 +0200
++++ firefox-53.0/layout/base/nsIPresShell.h 2017-04-27 13:09:40.404427641 +0200
+@@ -212,7 +212,7 @@ public:
+ * 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);
---
bgstack15