From 9f22f883e125a62e619276930e098bbac25bf6f3 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sat, 27 Mar 2021 18:12:14 +0100
Subject: extra/firefox: adapted some patches to firefox 87

---
 extra/firefox/PKGBUILD                 |  4 ++--
 extra/firefox/mozconfig-i686.patch     | 22 +++++++++++-----------
 extra/firefox/mozconfig-pentium4.patch | 22 +++++++++++-----------
 3 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'extra/firefox')

diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
index c643df9b..03ae45d7 100644
--- a/extra/firefox/PKGBUILD
+++ b/extra/firefox/PKGBUILD
@@ -4,7 +4,7 @@
 # set correct compiler and toochain tools
 if [ "${CARCH}" = "pentium4" ]; then
 	source+=('mozconfig-pentium4.patch')
-	sha256sums+=('dd49547b516936fe372f6f63c94e62dd975021ad97bcf31e98551ecff9890aed')
+	sha256sums+=('feff56a60ab5b96982f950e5ced76516256564b68976c6cc5ed13e284d0f4b36')
 eval "$(
   declare -f prepare | \
     sed '
@@ -14,7 +14,7 @@ eval "$(
 fi
 if [ "${CARCH}" = "i686" ]; then
 	source+=('mozconfig-i686.patch')
-	sha256sums+=('e2d8018e537dc6b49fed6bd29909a9c97fb0401c2926a0eeda850eebfb766f23')
+	sha256sums+=('06e51017d43369fefdc65a6321b07d3fd18802449b56a167767eefd5e88e65a8')
 eval "$(
   declare -f prepare | \
     sed '
diff --git a/extra/firefox/mozconfig-i686.patch b/extra/firefox/mozconfig-i686.patch
index 73b4434b..8d1fa667 100644
--- a/extra/firefox/mozconfig-i686.patch
+++ b/extra/firefox/mozconfig-i686.patch
@@ -1,7 +1,7 @@
 diff -rauN a/mozconfig b/mozconfig
---- a/mozconfig	2021-02-07 09:37:39.668372717 +0100
-+++ b/mozconfig	2021-02-07 09:38:10.241622176 +0100
-@@ -5,14 +5,15 @@
+--- a/mozconfig	2021-03-27 17:15:18.957711830 +0100
++++ b/mozconfig	2021-03-27 17:18:01.431035465 +0100
+@@ -5,8 +5,8 @@
  ac_add_options --enable-release
  ac_add_options --enable-hardening
  ac_add_options --enable-optimize
@@ -10,17 +10,17 @@ diff -rauN a/mozconfig b/mozconfig
 +ac_add_options --disable-rust-simd
 +ac_add_options --enable-linker=bfd
  ac_add_options --disable-elf-hack
--export CC='clang --target=x86_64-unknown-linux-gnu'
--export CXX='clang++ --target=x86_64-unknown-linux-gnu'
--export AR=llvm-ar
--export NM=llvm-nm
--export RANLIB=llvm-ranlib
+ 
+ # Branding
+@@ -35,3 +35,11 @@
+ ac_add_options --enable-crashreporter
+ ac_add_options --disable-updater
+ ac_add_options --disable-tests
++
++# pentium4 specific options
 +ac_add_options --disable-lto
 +export CC=gcc
 +export CXX=g++
 +export AR=gcc-ar
 +export NM=gcc-nm
 +export RANLIB=gcc-ranlib
- 
- # Branding
- ac_add_options --enable-official-branding
diff --git a/extra/firefox/mozconfig-pentium4.patch b/extra/firefox/mozconfig-pentium4.patch
index 885c51af..03965a7a 100644
--- a/extra/firefox/mozconfig-pentium4.patch
+++ b/extra/firefox/mozconfig-pentium4.patch
@@ -1,24 +1,24 @@
 diff -rauN a/mozconfig b/mozconfig
---- a/mozconfig	2020-08-02 13:46:05.333926656 +0200
-+++ b/mozconfig	2020-08-02 14:17:41.724611141 +0200
-@@ -5,13 +5,14 @@
+--- a/mozconfig	2021-03-27 17:15:18.957711830 +0100
++++ b/mozconfig	2021-03-27 17:17:07.357711058 +0100
+@@ -6,7 +6,7 @@
  ac_add_options --enable-hardening
  ac_add_options --enable-optimize
  ac_add_options --enable-rust-simd
 -ac_add_options --enable-linker=lld
 +ac_add_options --enable-linker=bfd
  ac_add_options --disable-elf-hack
--export CC='clang --target=x86_64-unknown-linux-gnu'
--export CXX='clang++ --target=x86_64-unknown-linux-gnu'
--export AR=llvm-ar
--export NM=llvm-nm
--export RANLIB=llvm-ranlib
+ 
+ # Branding
+@@ -35,3 +35,11 @@
+ ac_add_options --enable-crashreporter
+ ac_add_options --disable-updater
+ ac_add_options --disable-tests
++
++# pentium4 specific options
 +ac_add_options --disable-lto
 +export CC=gcc
 +export CXX=g++
 +export AR=gcc-ar
 +export NM=gcc-nm
 +export RANLIB=gcc-ranlib
- 
- # Branding
- ac_add_options --enable-official-branding
-- 
cgit v1.2.3-70-g09d2