From 816a052bf4c112885b0e722787bba5bff61f290d Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 27 Apr 2017 13:10:48 +0200 Subject: [PATCH 1/4] Fixed rhbz-1354671.patch --- firefox.spec | 4 ++-- rhbz-1354671.patch | 16 ++++++---------- 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); --- From b4944e8d657f340a088825cd375812c8b7f9f622 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 27 Apr 2017 13:21:10 +0200 Subject: [PATCH 2/4] Fixed previous commit - use patch only on aarch64 --- firefox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firefox.spec b/firefox.spec index fb6aec7..ffac162 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 -#TEMP %ifarch aarch64 +%ifarch aarch64 %patch226 -p1 -b .1354671 -#%endif +%endif %patch227 -p1 -b .rh1400293 %patch229 -p1 -b .nss-version From 2520c54d201500fdc96d512806e17e83915752aa Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Fri, 5 May 2017 14:49:43 +0200 Subject: [PATCH 3/4] Update to 53.0.2 --- firefox.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/firefox.spec b/firefox.spec index ffac162..1f88a4e 100644 --- a/firefox.spec +++ b/firefox.spec @@ -109,14 +109,15 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 53.0 -Release: 4%{?pre_tag}%{?dist} +Version: 53.0.2 +Release: 1%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet +ExcludeArch: armv7hl ppc64le aarch64 ppc64 Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20170418.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20170505.tar.xz %endif Source10: firefox-mozconfig Source12: firefox-redhat-default-prefs.js @@ -861,6 +862,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri May 5 2017 Jan Horak - 53.0.2-1 +- Update to 53.0.2 + * Thu Apr 27 2017 Jan Horak - 53.0-4 - Added patch from rhbz#1400293 From 62b4fd4c7d987031b12a7f77b464f066b4d8f076 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Fri, 5 May 2017 15:36:10 +0200 Subject: [PATCH 4/4] Updates sources, excluding a lot of arches in previous commit because of the major build issues on them. --- .gitignore | 2 ++ firefox.spec | 1 + sources | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1b32ed8..c6f2930 100644 --- a/.gitignore +++ b/.gitignore @@ -228,3 +228,5 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-52.0-20170303.tar.xz /firefox-52.0.2.source.tar.xz /firefox-langpacks-52.0.2-20170329.tar.xz +/firefox-53.0.2.source.tar.xz +/firefox-langpacks-53.0.2-20170505.tar.xz diff --git a/firefox.spec b/firefox.spec index 1f88a4e..b226259 100644 --- a/firefox.spec +++ b/firefox.spec @@ -66,6 +66,7 @@ %endif %endif + # Build as a debug package? %define debug_build 0 diff --git a/sources b/sources index 33c0a6f..e464383 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (firefox-53.0.source.tar.xz) = 36ec810bab58e3d99478455a38427a5efbc74d6dd7d4bb93b700fd7429b9b89250efd0abe4609091483991802090c6373c8434dfc9ba64c79a778e51fd2a2886 -SHA512 (firefox-langpacks-53.0-20170418.tar.xz) = 5bb972e22953149b03e135be64664412ee2b2c0791eb6b26c506a170b2aa6ea2e31c77ae6971e393ac3952146855ad423e66c3be53258dcedd17b8932d16982b +SHA512 (firefox-53.0.2.source.tar.xz) = d56d563db7e1a0faa2de9315b71b479adb9109624d0958224ad2cee331dcbdb4f414380bd91f70ee0b3e543eca812c172eb2d6f6b5620f6dd6f61675f5ac69d8 +SHA512 (firefox-langpacks-53.0.2-20170505.tar.xz) = 2f1b903c7fb3f0165fe9b1160492595856c8e51d9a89fe4ab260baab050344bf7f372dfd51240f3d8fe36455724067f54253fc8aeae77f7c5363f7cb1e429f9a