libre/iceweasel: 120.0.parabola1

Update python-zstandard patch, tested it works.

1 files changed, 40 insertions, 14 deletions

diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch
index 30950e7a8..b13653a81 100644
--- a/libre/iceweasel/9002-FSDG-preference-defaults.patch
+++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch
@@ -134,9 +134,9 @@ Subject: [PATCH 3/5] FSDG: Remove some references to AMO
 
 [1] https://labs.parabola.nu/issues/2409#note-4
 ---
- browser/app/profile/firefox.js | 12 ++++++------
- mobile/android/app/mobile.js   |  8 ++++----
- modules/libpref/init/all.js    |  8 ++++----
+ browser/app/profile/firefox.js        | 12 ++++++------
+ mobile/android/app/geckoview-prefs.js |  8 ++++----
+ modules/libpref/init/all.js           |  8 ++++----
  3 files changed, 14 insertions(+), 14 deletions(-)
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -162,24 +162,25 @@ index 801816dc41..9c2562ff23 100644
  
  // The URL for the privacy policy related to recommended extensions.
  pref("extensions.recommendations.privacyPolicyUrl", "https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_content=privacy-policy-link#addons");
-diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
-index 7364651c6e..d18e18a95b 100644
---- a/mobile/android/app/mobile.js
-+++ b/mobile/android/app/mobile.js
-@@ -106,10 +106,10 @@ pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla
+diff --git a/mobile/android/app/geckoview-prefs.js b/mobile/android/app/geckoview-prefs.js
+index c1983abc2b..35c24e5d43 100644
+--- a/mobile/android/app/geckoview-prefs.js
++++ b/mobile/android/app/geckoview-prefs.js
+@@ -228,11 +228,11 @@ pref("extensions.experiments.enabled", false);
+ // Support credit cards in GV autocomplete API (bug 1691819)
+ pref("extensions.formautofill.addresses.capture.enabled", true);
  
- /* preferences for the Get Add-ons pane */
- pref("extensions.getAddons.cache.enabled", true);
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
 -pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/collections/4757633/mob/?page=1&collection_sort=-popularity");
++pref("extensions.getAddons.browseAddons", "");
+ pref("extensions.getAddons.cache.enabled", true);
 -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v4/addons/search/?guid=%IDS%&lang=%LOCALE%");
 -pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v4/addons/language-tools/?app=android&type=language&appversion=%VERSION%");
-+pref("extensions.getAddons.search.browseURL", "");
-+pref("extensions.getAddons.browseAddons", "");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
 +pref("extensions.getAddons.get.url", "");
 +pref("extensions.getAddons.langpacks.url", "");
++pref("extensions.getAddons.search.browseURL", "");
  
- /* Don't let XPIProvider install distribution add-ons; we do our own thing on mobile. */
+ // 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
@@ -329,4 +330,29 @@ index f58075204d..a2ffbec390 100644
 2.42.0
 
 
+From e0f27816208ff4371f9de3e2a9190f1a26a4a2f8 Mon Sep 17 00:00:00 2001
+From: grizzlyuser <grizzlyuser@protonmail.com>
+Date: Fri, 17 Nov 2023 20:52:18 +0100
+Subject: [PATCH] FSDG: Put a fuse, to blow up when upstream switches to
+ search-config-v2
+
+process-json-files.py will probably need rework.
+---
+ modules/libpref/init/all.js | 2 ++
+ 1 file changed, 2 insertions(+)
 
+diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
+index 86bfe71247..af91481d2d 100644
+--- a/modules/libpref/init/all.js
++++ b/modules/libpref/init/all.js
+@@ -3462,6 +3462,8 @@ pref("browser.search.removeEngineInfobar.enabled", true);
+ // Enables a new search configuration style with no functional changes for the
+ // user. This is solely intended as a rollout button - it will go away once the
+ // new configuration has been rolled out.
++//
++// Extra comment, so the patch fails to apply as soon as the line below is changed upstream.
+ pref("browser.search.newSearchConfig.enabled", false);
+ 
+ // GMPInstallManager prefs
+-- 
+2.42.1