extra/firefox: redone patching for 111.0

4 files changed, 27 insertions, 43 deletions

diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
index 7fb06ccb..3a18b1aa 100644
--- a/extra/firefox/PKGBUILD
+++ b/extra/firefox/PKGBUILD
@@ -5,6 +5,7 @@
 if [ "${CARCH}" = "pentium4" ]; then
 	source+=('mozconfig-pentium4.patch')
 	sha256sums+=('c8b5376c4ee3f7dec4c9fe2b81434df4e2f5dd7caa99c8bf4371aec3c32233af')
+	b2sums+=('6d1f48b81a430ca39e8ea8de6ffc44010c18344b0f3b1d282f7f6d6e124823f2152267c593c1d86f049a0d8a80591b20e27b3e7c2ca29f6b29b68ef4333e4828')
 eval "$(
   declare -f prepare | \
     sed '
@@ -15,6 +16,7 @@ fi
 if [ "${CARCH}" = "i686" ]; then
 	source+=('mozconfig-i686.patch')
 	sha256sums+=('a0e274593c8d3587c4a669e22c480997cce24789f1dff78fb0da0f1d43083d68')
+	b2sums+=('7f6a89042ab4a4c7c6727056029d0e20411fa63c6b857a0a75c95c0544e81bea565d8cb0daba0c775861d45486ca9ab5375ec564ed567bd330f72a5e1d657ea3')
 eval "$(
   declare -f prepare | \
     sed '
@@ -132,6 +134,7 @@ eval "$(
 # see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757
 source+=('rust-static-disable-network-test-on-static-libraries.patch')
 sha256sums+=('10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041')
+b2sums+=('009789d3bb93ba418929019135804fc3de7de161e5be8efba7fc75646fbde395720be5b7a7d3f5d1671f459fdd2944dd14aca306bbf1c975436d4f7765d62d15')
 eval "$(
   declare -f prepare | \
     sed '
@@ -152,6 +155,7 @@ eval "$(
 # readelf: Error: Unable to seek to 0x801db328 for section headers
 source+=('avoid-libxul-OOM-python-check.patch')
 sha256sums+=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353')
+b2sums+=('97035e44cd1deae7bb2422c81eec7294feb51f43f460b4d7ddba083e1d8a48d265a36ca43cf1d9dee49b01ee6df0c76e0f6916cc73cb7ad9caa1c235a59da0e4')
 eval "$(
   declare -f prepare | \
     sed '
@@ -213,12 +217,13 @@ eval "$(
 # typedef __float_t   float_t;
 # /usr/include/math.h:169:21: note: previous declaration as ?typedef long double float_t?
 # typedef long double float_t;
-source+=('firefox-106.0.1-fdlibm.patch')
-sha256sums+=('ddc0945f2414828668dd922b6b8203f7fb54d7b1f0aac3e18299bccb5c2facab')
+source+=('firefox-111.0.1-fdlibm.patch')
+sha256sums+=('c127120a600fca5a4de76ba6fdf50d7c06afc7913046299315e173e03c3e93e0')
+b2sums+=('44e421ac15c829e1a03dfdcc727fe01e4194e67ea96a1c85ebc79148e2567b074f90428de34230282d64d8fce9916500703357de8f65b5ee866933e57fe40e46')
 eval "$(
   declare -f prepare | \
     sed '
-      $ i patch -p1 -i "$srcdir/firefox-106.0.1-fdlibm.patch"
+      $ i patch -p1 -i "$srcdir/firefox-111.0.1-fdlibm.patch"
     '
 )"
 
@@ -233,19 +238,10 @@ eval "$(
     '
 )"
 
-# disable AVX2 the brutal way
-source+=('simd_avx2.patch')
-sha256sums+=('e68f8a9858f14a75813df608510e1f8143fd6eb1fcf233df8239d16d935e80f8')
-eval "$(
-  declare -f prepare | \
-    sed '
-      $ i patch -p1 -i "$srcdir/simd_avx2.patch"
-    '
-)"
-
 # from Voidlinux, enable atomics in JIT for i686
 source+=('fix-i686-build-moz-1792159.patch')
 sha256sums+=('2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06')
+b2sums+=('d20ce3eff595f85df86eaa0dfb665fc356f8987117a771f76adc4ac12046a7e82b0af182fa99f87ea1362a5026c9d0216c7b714649fef0c7294c61c8e8f4d790')
 eval "$(
   declare -f prepare | \
     sed '
diff --git a/extra/firefox/firefox-106.0.1-fdlibm.patch b/extra/firefox/firefox-106.0.1-fdlibm.patch
deleted file mode 100644
index 5a15d2b3..00000000
--- a/extra/firefox/firefox-106.0.1-fdlibm.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -rauN firefox-106.0.1/modules/fdlibm/src/math_private.h firefox-106.0.1-fdlibm-patches/modules/fdlibm/src/math_private.h
---- firefox-106.0.1/modules/fdlibm/src/math_private.h	2022-10-19 21:20:25.000000000 +0200
-+++ firefox-106.0.1-fdlibm-patches/modules/fdlibm/src/math_private.h	2022-10-24 20:43:41.469291933 +0200
-@@ -30,10 +30,14 @@
-  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
-  */
- 
-+#if defined __FLT_EVAL_METHOD__ && (__FLT_EVAL_METHOD__ == 2)
-+typedef long double __double_t;
-+#else
- typedef double      __double_t;
-+#endif
- typedef __double_t  double_t;
- typedef float       __float_t;
--typedef __float_t   float_t;
-+/*typedef __float_t   float_t;*/
- 
- /*
-  * The original fdlibm code used statements like:
diff --git a/extra/firefox/firefox-111.0.1-fdlibm.patch b/extra/firefox/firefox-111.0.1-fdlibm.patch
new file mode 100644
index 00000000..4f600df4
--- /dev/null
+++ b/extra/firefox/firefox-111.0.1-fdlibm.patch
@@ -0,0 +1,18 @@
+diff -rauN firefox-111.0.1/modules/fdlibm/src/math_private.h firefox-111.0.1-fdlibm-patch/modules/fdlibm/src/math_private.h
+--- firefox-111.0.1/modules/fdlibm/src/math_private.h	2023-03-21 14:16:09.000000000 +0100
++++ firefox-111.0.1-fdlibm-patch/modules/fdlibm/src/math_private.h	2023-04-07 15:42:21.149010898 +0200
+@@ -30,9 +30,13 @@
+  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+  */
+ 
++#if defined __FLT_EVAL_METHOD__ && (__FLT_EVAL_METHOD__ == 2)
++typedef long double __double_t;
++#else
+ typedef double      __double_t;
++#endif
+ typedef __double_t  double_t;
+-typedef float       __float_t;
++/*typedef float       __float_t;*/
+ 
+ /*
+  * The original fdlibm code used statements like:
diff --git a/extra/firefox/simd_avx2.patch b/extra/firefox/simd_avx2.patch
deleted file mode 100644
index ee94a034..00000000
--- a/extra/firefox/simd_avx2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rauN a/mozglue/misc/SIMD_avx2.cpp b/mozglue/misc/SIMD_avx2.cpp
---- a/mozglue/misc/SIMD_avx2.cpp	2022-10-24 18:34:51.028779452 +0200
-+++ b/mozglue/misc/SIMD_avx2.cpp	2022-10-24 18:35:07.818868490 +0200
-@@ -8,6 +8,7 @@
- #include "mozilla/SSE.h"
- #include "mozilla/Assertions.h"
- 
-+#undef MOZILLA_MAY_SUPPORT_AVX2
- #ifdef MOZILLA_MAY_SUPPORT_AVX2
- 
- #  include <cstring>