[iceweasel]: i686

3 files changed, 35 insertions, 51 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 24d34f236..36236edf1 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -168,8 +168,7 @@ source_armv7h=(build-arm-libopus.patch)
 source_i686=(
   avoid-libxul-OOM-python-check.patch
   rust-static-disable-network-test-on-static-libraries.patch
-  firefox-106.0.1-fdlibm.patch
-  simd_avx2.patch
+  firefox-107.0-fdlibm.patch
   fix-i686-build-moz-1792159.patch
 )
 validpgpkeys=(
@@ -195,8 +194,7 @@ sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049'
 sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353'
                  '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041'
-                 'ddc0945f2414828668dd922b6b8203f7fb54d7b1f0aac3e18299bccb5c2facab'
-                 'e68f8a9858f14a75813df608510e1f8143fd6eb1fcf233df8239d16d935e80f8'
+                 '1c2015e9f59c2c3bc898e04c6c6d33523f835638fd314d24944a8063cbce79d8'
                  '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06')
 b2sums=('cab3d7e723c9927518a3acfbf8d0db7846074000933074309b9bea1dcc2e182b579a7a6b2763bafeaf813d9846c4539d6e73cf75734844f3207525aff7e5c8be'
         'SKIP'
@@ -215,8 +213,7 @@ b2sums+=('c2a2ead1b44c563583abb5cd3579e8f2724ea79e12aba1b315f201a09547d611b4a3c9
 b2sums_armv7h=('6e5980e56343a23bce4fcda58f6abc8f2debca0c278c87b09e53abb17ff15849c26e8df3bbff2388985f8fe5a4e9be9982c602ef7159546f0ae335fca1000a41')
 b2sums_i686=('97035e44cd1deae7bb2422c81eec7294feb51f43f460b4d7ddba083e1d8a48d265a36ca43cf1d9dee49b01ee6df0c76e0f6916cc73cb7ad9caa1c235a59da0e4'
              '009789d3bb93ba418929019135804fc3de7de161e5be8efba7fc75646fbde395720be5b7a7d3f5d1671f459fdd2944dd14aca306bbf1c975436d4f7765d62d15'
-             '4492e991d25c0603b8deb25484d891c1bfc70ec71dc63a76eb56189873a66a508a00a7f98edc295da18e017909a4591863e820c2041beea0c00724687f25867d'
-             '611454f7943cce37acee31234d887d9e58e3d1f4745e811968e42aea8ec5d655f0081a594a233e663db17c95b264083891562e12f098ac261d57a0ae1c3c1c3d'
+             'e4851eaa9030d9b8811f505f8f1569a41f8dc7cf586269108ebe370ac91896f69d36fc6d2e1937f427656fe4fca63031ca5e11d39a3667205a4b0a6f935cd548'
              'd20ce3eff595f85df86eaa0dfb665fc356f8987117a771f76adc4ac12046a7e82b0af182fa99f87ea1362a5026c9d0216c7b714649fef0c7294c61c8e8f4d790')
 
 
@@ -248,8 +245,6 @@ armv7h)
   ;;
 i686)
   _should_skip_pgo=1
-
-  echo "FIXME: v105 fails to build - v106 fails to build without --disable-webrtc"
   ;;
 esac
 
@@ -411,7 +406,7 @@ END
   aarch64|armv7h)
     # experimental/version-specific hacks #
 
-    # use GCC (not LLVM - gcc 12 failed to build v106)
+    # use GCC vs LLVM
     cat >> ../mozconfig <<EOF
 export CC=gcc
 export CXX=g++
@@ -467,7 +462,19 @@ EOF
     cat .mozconfig >> ../mozconfig
     ;;
   i686)
-    echo "FIXME: i686 iceweasel v>104 has known build failures"
+    # experimental/version-specific hacks #
+
+    # use GCC vs LLVM
+    cat >>../mozconfig <<END
+#export CC=gcc
+#export CXX=g++
+#export AR=gcc-ar
+#export NM=gcc-nm
+#export RANLIB=gcc-ranlib
+END
+
+
+    # upstream #
 
     export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE"
 #     export MOZ_MAKE_FLAGS=-j2
@@ -481,15 +488,8 @@ EOF
 #ac_add_options --enable-linker=bfd
 ac_add_options --disable-lto
 ac_add_options --disable-rust-simd
-#ac_add_options --enable-strip
 ac_add_options --disable-debug
 ac_add_options --disable-debug-symbols
-#export CC=gcc
-#export CXX=g++
-#export AR=gcc-ar
-#export NM=gcc-nm
-#export RANLIB=gcc-ranlib
-#export STRIP=strip
 END
 
     # FIXME GCC: /usr/lib/gcc/i686-pc-linux-gnu/12.1.0/include/xmmintrin.h:208:1: error: inlining failed in call to ‘always_inline’ ‘__m128 _mm_sqrt_ps(__m128)’: target specific option mismatch
@@ -512,13 +512,8 @@ END
     #        /build/iceweasel/src/firefox-96.0.1/modules/fdlibm/src/math_private.h:34:21:
     #          error: conflicting declaration ‘typedef __double_t double_t’
     #        /usr/include/math.h:156:21: note: previous declaration as ‘typedef long double double_t’
-    echo "applying firefox-106.0.1-fdlibm.patch"
-    patch -p1 -i "$srcdir/firefox-106.0.1-fdlibm.patch"
-
-    # disable AVX2 the brutal way
-    # mozglue/misc/SIMD_avx2.cpp:66:10: error: ‘_mm_cvtsi64_si128’ was not declared in this scope; did you mean ‘_mm_cvtsi64_si32’?
-    echo "applying simd_avx2.patch"
-    patch -p1 -i "$srcdir/simd_avx2.patch"
+    echo "applying firefox-107.0-fdlibm.patch"
+    patch -p1 -i "$srcdir/firefox-107.0-fdlibm.patch"
 
     # js/src/jit/shared/AtomicOperations-shared-jit.cpp:88:9: error: ‘AtomicCopyByteUnsynchronized’ was not declared in this scope; did you mean ‘AtomicMemcpyUpUnsynchronized’?
     echo "applying fix-i686-build-moz-1792159.patch"
@@ -737,9 +732,6 @@ build() {
   aarch64|armv7h)
     ;;
   i686)
-    # /usr/bin/ld.bfd: error: libxul.so(.debug_info) is too large (0x54c5369a bytes)
-#     options=( ${options[*]/\!strip/} )
-
     # avoid excessive debug symbols in rust leading to out-of-memory situations
     sed -i "s/debug_info = '\''2'\''/debug_info = '\''0'\''/" build/moz.configure/toolchain.configure
     ;;
@@ -882,11 +874,6 @@ END
     # libxul.so cannot find it's libraries
     install -dm 755 "${pkgdir}/etc/ld.so.conf.d"
     echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf
-
-    # disable stripping in mozconfig.<arch> (insists to use llvm-strip which runs
-    # out of memory on libxul.so). Now 2.5 GB can be stripped to 166 MB, so we do
-    # that with the normal 'strip' from binutils after 'mach install'
-#    strip "$pkgdir/usr/lib/$pkgname/libxul.so"
     ;;
   x86_64)
     ;;
diff --git a/libre/iceweasel/firefox-106.0.1-fdlibm.patch b/libre/iceweasel/firefox-106.0.1-fdlibm.patch
deleted file mode 100644
index 5a15d2b3b..000000000
--- a/libre/iceweasel/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/libre/iceweasel/firefox-107.0-fdlibm.patch b/libre/iceweasel/firefox-107.0-fdlibm.patch
new file mode 100644
index 000000000..279c41772
--- /dev/null
+++ b/libre/iceweasel/firefox-107.0-fdlibm.patch
@@ -0,0 +1,16 @@
+diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h
+index 165260f00f..1fa2937cae 100644
+--- a/modules/fdlibm/src/math_private.h
++++ b/modules/fdlibm/src/math_private.h
+@@ -30,7 +30,11 @@
+  * 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;
+