libre/iceweasel: 121.0.parabola1

Usual updates according to upstream changes. search-config-v2.json needs
to be patched later, it seems to be unused currently. So just skip it in
patch-json-files.py for now.

1 files changed, 37 insertions, 21 deletions

diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch
index b13653a81..770b1f85b 100644
--- a/libre/iceweasel/9002-FSDG-preference-defaults.patch
+++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch
@@ -18,7 +18,6 @@ possible while keeping the SW stack 100% free, release builds don't have
 any valid geolocation provider, so let's disable geolocation API by
 default for now.
 ---
- modules/libpref/init/StaticPrefList.yaml | 2 +-
  modules/libpref/init/all.js              | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
@@ -36,18 +35,18 @@ index 5632486c69..b977858e04 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 a366fdaeb8..c9d67004a2 100644
+index af04cba691..514f750a23 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -3125,7 +3125,7 @@ pref("network.psl.onUpdate_notify", false);
+@@ -3094,7 +3094,7 @@ pref("network.psl.onUpdate_notify", false);
+ 
  // All the Geolocation preferences are here.
  //
- #ifndef EARLY_BETA_OR_EARLIER
--  pref("geo.provider.network.url", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%");
-+  pref("geo.provider.network.url", "");
- #else
-   // Use MLS on Nightly and early Beta.
-   pref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
+-pref("geo.provider.network.url", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%");
++pref("geo.provider.network.url", "");
+ 
+ // Timeout to wait before sending the location request.
+ pref("geo.provider.network.timeToWaitBeforeSending", 5000);
 -- 
 2.41.0
 
@@ -183,25 +182,25 @@ index c1983abc2b..35c24e5d43 100644
  // Don't let XPIProvider install distribution add-ons; we do our own thing on mobile
  pref("extensions.installDistroAddons", false);
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
-index c9d67004a2..e14f539172 100644
+index 514f750a23..abbf229223 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -1851,11 +1851,11 @@ pref("services.settings.poll_interval", 86400); // 24H
- // other channels always report events.
- pref("services.common.uptake.sampleRate", 1);   // 1%
- 
--pref("extensions.abuseReport.enabled", true);
-+pref("extensions.abuseReport.enabled", false);
- // Allow AMO to handoff reports to the Firefox integrated dialog.
- pref("extensions.abuseReport.amWebAPI.enabled", true);
+@@ -1851,11 +1851,11 @@ pref("services.common.uptake.sampleRate", 1);   // 1%
+ pref("extensions.abuseReport.enabled", false);
+ // Whether abuse report originated from AMO should use the Firefox integrated dialog.
+ pref("extensions.abuseReport.amWebAPI.enabled", false);
 -pref("extensions.abuseReport.url", "https://services.addons.mozilla.org/api/v4/abuse/report/addon/");
 -pref("extensions.abuseReport.amoDetailsURL", "https://services.addons.mozilla.org/api/v4/addons/addon/");
 +pref("extensions.abuseReport.url", "");
 +pref("extensions.abuseReport.amoDetailsURL", "");
+ // Whether Firefox integrated abuse reporting feature should be opening the new abuse report form hosted on AMO.
+ pref("extensions.abuseReport.amoFormEnabled", false);
+-pref("extensions.abuseReport.amoFormURL", "https://addons.mozilla.org/%LOCALE%/%APP%/feedback/addon/%addonID%/");
++pref("extensions.abuseReport.amoFormURL", "");
  
  // Blocklist preferences
  pref("extensions.blocklist.enabled", true);
-@@ -3193,7 +3193,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true);
+@@ -3158,7 +3158,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true);
  // Whether to allow the inline options browser in HTML about:addons page.
  pref("extensions.htmlaboutaddons.inline-options.enabled", true);
  // Show recommendations on the extension and theme list views.
@@ -210,6 +209,23 @@ index c9d67004a2..e14f539172 100644
  
  // The URL for the privacy policy related to recommended add-ons.
  pref("extensions.recommendations.privacyPolicyUrl", "");
+diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
+index 1f1b1cbd3e..7ea9d82cdf 100644
+--- a/browser/app/profile/firefox.js
++++ b/browser/app/profile/firefox.js
+@@ -22,9 +22,9 @@
+ pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindowMac.xhtml");
+ 
+ // Set add-ons abuse report related prefs specific to Firefox Desktop.
+-pref("extensions.abuseReport.enabled", true);
+-pref("extensions.abuseReport.amWebAPI.enabled", true);
+-pref("extensions.abuseReport.amoFormEnabled", true);
++pref("extensions.abuseReport.enabled", false);
++pref("extensions.abuseReport.amWebAPI.enabled", false);
++pref("extensions.abuseReport.amoFormEnabled", false);
+ 
+ // Enables some extra Extension System Logging (can reduce performance)
+ pref("extensions.logging.enabled", false);
 -- 
 2.41.0
 
@@ -248,7 +264,7 @@ index 9c2562ff23..7577fbe008 100644
  
  // Disable add-ons that are not installed by the user in all scopes by default.
  // See the SCOPE constants in AddonManager.jsm for values to use here.
-@@ -1518,8 +1518,8 @@ pref("prompts.defaultModalType", 3);
+@@ -1603,8 +1603,8 @@ pref("prompts.defaultModalType", 3);
  
  pref("browser.topsites.useRemoteSetting", true);
  // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile)
@@ -258,7 +274,7 @@ index 9c2562ff23..7577fbe008 100644
 +pref("browser.topsites.contile.endpoint", "");
  
  // Whether to enable the Share-of-Voice feature for Sponsored Topsites via Contile.
- #if defined(EARLY_BETA_OR_EARLIER)
+ pref("browser.topsites.contile.sov.enabled", true);
 -- 
 2.41.0