From 71fbbe358df123103f665dd5393ddcc4d915deb1 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 28 Jul 2020 18:24:14 +0100
Subject: drop 1238661 patch, no longer applies, patched file not shipped
 anymore

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

(limited to 'firefox.spec')

diff --git a/firefox.spec b/firefox.spec
index 2da2b38..8365550 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -177,7 +177,6 @@ Patch227:        firefox-locale-debug.patch
 # Upstream patches
 Patch402:        mozilla-1196777.patch
 Patch412:        mozilla-1337988.patch
-Patch415:        Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 Patch417:        bug1375074-save-restore-x28.patch
 Patch422:        mozilla-1580174-webrtc-popup.patch
 
@@ -382,9 +381,6 @@ This package contains results of tests executed during build.
 %patch227 -p1 -b .locale-debug
 
 %patch402 -p1 -b .1196777
-%ifarch %{arm}
-%patch415 -p1 -b .1238661
-%endif
 
 
 # Wayland specific upstream patches
-- 
cgit 


From 6dc06e9cbfaa9e0ce124861a172002fccf87c6e7 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 28 Jul 2020 18:33:44 +0100
Subject: move --enable-av1 to firefox-mozconfig now it doesn't need
 conditionals

---
 firefox.spec | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'firefox.spec')

diff --git a/firefox.spec b/firefox.spec
index 8365550..ef3d3d3 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -483,13 +483,6 @@ echo "ac_add_options --enable-address-sanitizer" >> .mozconfig
 echo "ac_add_options --disable-jemalloc" >> .mozconfig
 %endif
 
-# We don't have recent nasm on Fedora 30...time to update to Fedora 31.
-%if 0%{?fedora} < 31
-echo "ac_add_options --disable-av1" >> .mozconfig
-%else
-echo "ac_add_options --enable-av1" >> .mozconfig
-%endif
-
 # api keys full path
 echo "ac_add_options --with-mozilla-api-keyfile=`pwd`/mozilla-api-key" >> .mozconfig
 # It seems that the api key we have is for the safe browsing only
-- 
cgit 


From 5a73516eddc11a43365e2f5e8a68c6ad25830b76 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 28 Jul 2020 18:40:36 +0100
Subject: Build webrtc on aarch64/armv7, fixes rhbz #1858433

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

(limited to 'firefox.spec')

diff --git a/firefox.spec b/firefox.spec
index ef3d3d3..53b025a 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -448,10 +448,6 @@ echo "ac_add_options --disable-debug" >> .mozconfig
 echo "ac_add_options --disable-jemalloc" >> .mozconfig
 %endif
 
-%ifnarch %{ix86} x86_64 ppc64le
-echo "ac_add_options --disable-webrtc" >> .mozconfig
-%endif
-
 %if !%{enable_mozilla_crashreporter}
 echo "ac_add_options --disable-crashreporter" >> .mozconfig
 %endif
-- 
cgit