libre/iceweasel: 97.0, add missing i686 patch

Update according to changes from upstreams.
The source of patch for i686 is https://bugzilla.mozilla.org/show_bug.cgi?id=1729459#c21

4 files changed, 137 insertions, 20 deletions

diff --git a/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch b/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
index 07b7fda7c..f30777294 100644
--- a/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] Use remoting name for GDK application names
  2 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index ec8eb1ff1075..3da127bf1d1d 100644
+index ce001e93821f..3be817c5cbd5 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4323,11 +4323,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -4348,11 +4348,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.
@@ -26,7 +26,7 @@ index ec8eb1ff1075..3da127bf1d1d 100644
    // Initialize GTK here for splash.
  
 diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 7090bd2ef350..76bda087be72 100644
+index c8bbd9a373f5..a6a2186f20fb 100644
 --- a/widget/gtk/nsAppShell.cpp
 +++ b/widget/gtk/nsAppShell.cpp
 @@ -27,6 +27,8 @@
@@ -38,7 +38,7 @@ index 7090bd2ef350..76bda087be72 100644
  #include "ScreenHelperGTK.h"
  #include "HeadlessScreenHelper.h"
  #include "mozilla/widget/ScreenManager.h"
-@@ -256,13 +258,9 @@ nsresult nsAppShell::Init() {
+@@ -257,13 +259,9 @@ nsresult nsAppShell::Init() {
        // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
        //
        // Only bother doing this for the parent process, since it's the one
diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch
index 0adb0e06f..246b39331 100644
--- a/libre/iceweasel/9002-FSDG-preference-defaults.patch
+++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch
@@ -1,4 +1,4 @@
-From 0143513a7ec9760176d83bbab29369026e75d9b3 Mon Sep 17 00:00:00 2001
+From f3f1223d1a9bee16672c6b7ec07dc5816a5ea084 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Sun, 4 Apr 2021 13:09:05 +0300
 Subject: [PATCH 1/2] geolocation: Disable API and remove Google API URLs
@@ -24,10 +24,10 @@ default for now.
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index f9befc42b4..2d8f509a1a 100644
+index a9f8e6318f..81e40f6db4 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -4112,7 +4112,7 @@
+@@ -4884,7 +4884,7 @@
  # Is support for Navigator.geolocation enabled?
  - name: geo.enabled
    type: bool
@@ -37,10 +37,10 @@ index f9befc42b4..2d8f509a1a 100644
  
  # Time, in milliseconds, to wait for the location provider to spin up.
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
-index 6143558398..a393c4afcd 100644
+index fab5c7b41b..9805ea69c9 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -3706,7 +3706,7 @@ pref("network.psl.onUpdate_notify", false);
+@@ -3720,7 +3720,7 @@ pref("network.psl.onUpdate_notify", false);
  // All the Geolocation preferences are here.
  //
  #ifndef EARLY_BETA_OR_EARLIER
@@ -50,10 +50,10 @@ index 6143558398..a393c4afcd 100644
    // Use MLS on Nightly and early Beta.
    pref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
 -- 
-2.31.1
+2.35.1
 
 
-From 3442b524f614edad5461ceaa44a5c8640815765a Mon Sep 17 00:00:00 2001
+From bff69763d7833a187d663a443cca20f5bdd83acf Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Sun, 4 Apr 2021 13:49:05 +0300
 Subject: [PATCH 2/2] Disable banners and remove URLs for mobile apps on
@@ -64,16 +64,21 @@ Subject: [PATCH 2/2] Disable banners and remove URLs for mobile apps on
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index ef44a16daa..2feabdc67f 100644
+index 6bbc26eb86..8ea3186824 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -1756,15 +1756,15 @@ pref("browser.contentblocking.report.monitor.enabled", true);
+@@ -1877,7 +1877,7 @@ pref("browser.contentblocking.report.monitor.enabled", true);
  pref("browser.contentblocking.report.proxy.enabled", false);
  
  // Disable the mobile promotion by default.
 -pref("browser.contentblocking.report.show_mobile_app", true);
 +pref("browser.contentblocking.report.show_mobile_app", false);
  
+ // Avoid advertising in certain regions. Comma separated string of two letter ISO 3166-1 country codes.
+ // We're currently blocking all of Ukraine (ua), but would prefer to block just Crimea (ua-43). Currently, the Mozilla Location Service APIs used by Region.jsm only exposes the country, not the subdivision.
+@@ -1887,12 +1887,12 @@ pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,t
+ pref("browser.vpn_promo.enabled", true);
+ 
  // Enable the vpn card by default.
 -pref("browser.contentblocking.report.vpn.enabled", true);
 +pref("browser.contentblocking.report.vpn.enabled", false);
@@ -86,7 +91,7 @@ index ef44a16daa..2feabdc67f 100644
  pref("browser.contentblocking.report.vpn_sub_id", "sub_HrfCZF7VPHzZkA");
  
  pref("browser.contentblocking.report.monitor.url", "https://monitor.firefox.com/?entrypoint=protection_report_monitor&utm_source=about-protections");
-@@ -1775,12 +1775,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi
+@@ -1903,12 +1903,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi
  pref("browser.contentblocking.report.manage_devices.url", "https://accounts.firefox.com/settings/clients");
  pref("browser.contentblocking.report.endpoint_url", "https://monitor.firefox.com/user/breach-stats?includeResolved=true");
  pref("browser.contentblocking.report.proxy_extension.url", "https://fpn.firefox.com/browser?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-protections&utm_content=about-protections");
@@ -106,5 +111,5 @@ index ef44a16daa..2feabdc67f 100644
  // Protection Report's SUMO urls
  pref("browser.contentblocking.report.lockwise.how_it_works.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/password-manager-report");
 -- 
-2.31.1
+2.35.1
 
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 29a9db758..0228aeef5 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -47,7 +47,7 @@
 
 pkgname=iceweasel
 epoch=1
-pkgver=96.0.1
+pkgver=97.0
 pkgrel=1
 pkgrel+=.parabola1
 _brandingver=95.0-1
@@ -72,7 +72,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'hunspell-en_US: Spell checking, American English'
             'xdg-desktop-portal: Screensharing with Wayland')
 replaces=('firefox')
-options=(!emptydirs !makeflags !strip !lto)
+options=(!emptydirs !makeflags !strip !lto !debug)
 source=(https://archive.mozilla.org/pub/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.xz{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
         $pkgname.desktop)
@@ -86,14 +86,14 @@ source_armv7h=(build-arm-libopus.patch)
 source_i686=('avoid-libxul-OOM-python-check.patch'
              'rust-static-disable-network-test-on-static-libraries.patch'
              'firefox-93.0_x86_math_private_20211110.patch')
-sha256sums=('cb86f3cbd31960305dee7d7f3dc254c64fb0462e27ea624ee62f3682e99079ee'
+sha256sums=('6c8a7dcb47122d033383fd62a1bcaefff0290a6c23d057898e8ff9c72749df28'
             'SKIP'
-            '5ead90994f91bed3231c2661977c69fc276cfbe278a1ab904daa544c9455ff42'
+            '8de6c0ecc70d2763936be6df4b91a3d2e806765bf510f987d6f2ffa2377c3f01'
             '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')
 sha256sums+=('d1b9d98cea5356df97fc5c221830de1ced8f826cb39fac9427c407e3eae54c02'
              'SKIP'
              'a4e3c3869085cb282cb5a0fcb64e816c0415f25d4792a62c4f1d599d3111b23c'
-             'afeaeb6e9a6af901b57e25d85014e5c792efe4ff9dabb58663377f487b9d2887'
+             '7ca04f212120fcf6eab8ebad79e92666eb3ad59790b202232005aaeb48a01ea2'
              '39e3a5e1ad137e21f842a44d7e3bd24050292d2b41fe59b4e7c7dfed52a195dd'
              '9386f1c50506cd20ab6d212335d5e4417faeb2aea371dd46f2d107d171e80b83'
              'c93ce98e1cb64033079343ff1f3037fab6a3bc6d3eb5bc14c5edb70e2d45965d')
diff --git a/libre/iceweasel/firefox-93.0_x86_math_private_20211110.patch b/libre/iceweasel/firefox-93.0_x86_math_private_20211110.patch
new file mode 100644
index 000000000..bdc889061
--- /dev/null
+++ b/libre/iceweasel/firefox-93.0_x86_math_private_20211110.patch
@@ -0,0 +1,112 @@
+diff -w -ruN firefox-93.0.org/modules/fdlibm/src/math_private.h firefox-93.0/modules/fdlibm/src/math_private.h
+--- firefox-93.0.org/modules/fdlibm/src/math_private.h	2021-09-27 16:47:42.000000000 -0600
++++ firefox-93.0/modules/fdlibm/src/math_private.h	2021-11-10 17:39:03.495621830 -0600
+@@ -30,9 +30,13 @@
+  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+  */
+ 
++#ifdef __LP64__
+ typedef double      __double_t;
++#else
++typedef long double __double_t;
++#endif
+ typedef __double_t  double_t;
+-
++typedef float   __float_t;
+ /*
+  * The original fdlibm code used statements like:
+  *	n0 = ((*(int*)&one)>>29)^1;		* index of high word *
+@@ -630,6 +634,53 @@
+ 	return ((double)(x + 0x1.8p52) - 0x1.8p52);
+ }
+ 
++static inline float
++rnintf(__float_t x)
++{
++	/*
++	 * As for rnint(), except we could just call that to handle the
++	 * extra precision case, usually without losing efficiency.
++	 */
++	return ((float)(x + 0x1.8p23F) - 0x1.8p23F);
++}
++
++#ifdef LDBL_MANT_DIG
++/*
++ * The complications for extra precision are smaller for rnintl() since it
++ * can safely assume that the rounding precision has been increased from
++ * its default to FP_PE on x86.  We don't exploit that here to get small
++ * optimizations from limiting the rangle to double.  We just need it for
++ * the magic number to work with long doubles.  ld128 callers should use
++ * rnint() instead of this if possible.  ld80 callers should prefer
++ * rnintl() since for amd64 this avoids swapping the register set, while
++ * for i386 it makes no difference (assuming FP_PE), and for other arches
++ * it makes little difference.
++ */
++
++static inline long double
++rnintl(long double x)
++{
++  /* The WRAPPED__CONCAT() macro below is required for non-FreeBSD targets
++     which don't have a multi-level CONCAT macro implementation. On those
++     targets the hexadecimal floating-point values being created don't expand
++     properly resulting in code that cannot be compiled.
++
++     The extra level provided by this macro should not affect FreeBSD, should
++     this code be used there.
++
++     See the following for more details:
++
++       https://gcc.gnu.org/onlinedocs/gcc-3.0.1/cpp_3.html#SEC32
++       https://sources.debian.org/src/glibc/2.32-3/misc/sys/cdefs.h/
++       https://github.com/freebsd/freebsd-src/blob/main/sys/sys/cdefs.h
++  */
++	#define WRAPPED__CONCAT(x,y) __CONCAT(x,y)
++
++	return (x + WRAPPED__CONCAT(0x1.8p, LDBL_MANT_DIG) / 2 -
++		WRAPPED__CONCAT(0x1.8p, LDBL_MANT_DIG) / 2);
++}
++#endif /* LDBL_MANT_DIG */
++
+ /*
+  * irint() and i64rint() give the same result as casting to their integer
+  * return type provided their arg is a floating point integer.  They can
+@@ -646,6 +697,39 @@
+ #define	irint(x)	((int)(x))
+ #endif
+ 
++#define	i64rint(x)	((int64_t)(x))	/* only needed for ld128 so not opt. */
++
++#if defined(__i386__) && defined(__GNUCLIKE_ASM)
++static __inline int
++irintf(float x)
++{
++	int n;
++
++	__asm("fistl %0" : "=m" (n) : "t" (x));
++	return (n);
++}
++
++static __inline int
++irintd(double x)
++{
++	int n;
++
++	__asm("fistl %0" : "=m" (n) : "t" (x));
++	return (n);
++}
++#endif
++
++#if (defined(__amd64__) || defined(__i386__)) && defined(__GNUCLIKE_ASM)
++static __inline int
++irintl(long double x)
++{
++	int n;
++
++	__asm("fistl %0" : "=m" (n) : "t" (x));
++	return (n);
++}
++#endif
++
+ #ifdef DEBUG
+ #if defined(__amd64__) || defined(__i386__)
+ #define	breakpoint()	asm("int $3")