From 7286181cbff5c4b98ed9246366a85ae1fbc8f54d Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Tue, 17 Jun 2025 12:23:06 -0400
Subject: Update to 128.12.0-1.

* data/patches/CVE-2024-11692.patch,
data/patches/CVE-2024-11693.patch,
data/patches/CVE-2024-11697.patch: Remove vestigial patches.
* data/patches/hide-firefox-view-button.patch: New file.
* data/patches/about-addons.patch,
data/patches/hide-protections-dashboard.patch,
data/patches/hide-submit-feedback-menu-item.patch,
data/patches/icecat-about-dialog.patch,
data/patches/icecat-preferences.patch,
data/patches/moz-configure-changes.patch: Adapt to version 128.
* data/settings.js: Add more IceCat-specific customizations.
* tools/process-json-files.py: Process more JSON files for search
engine configuration v2 and overrides, as needed for version 128.
* makeicecat: Update FFMAJOR, FFMINOR, SOURCEBALL_CHECKSUM, L10N_URL,
L10_CMP_URL, and L10N_CMP_REV.  Add L10N_REV.
(sort_inner_list): Ignore case when sorting inner lists.
(validate_env): Add check for Git.  Remove check for Mercurial.
(fetch_l10n): Update to reflect upstream changes.  Use Git instead of
Mercurial.  Fetch all locales in a single clone operation.
(configure, apply_batch_branding): Adapt to version 128.
---
 data/patches/icecat-preferences.patch | 39 ++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'data/patches/icecat-preferences.patch')

diff --git a/data/patches/icecat-preferences.patch b/data/patches/icecat-preferences.patch
index 1d5f655..f8f00cd 100644
--- a/data/patches/icecat-preferences.patch
+++ b/data/patches/icecat-preferences.patch
@@ -1,7 +1,7 @@
---- a/browser/components/preferences/privacy.inc.xhtml.orig	2021-08-17 15:38:19.838881866 -0400
-+++ b/browser/components/preferences/privacy.inc.xhtml	2021-08-17 15:39:01.382760058 -0400
-@@ -632,6 +632,83 @@
-          data-l10n-id="addressbar-suggestions-settings"/>
+--- a/browser/components/preferences/privacy.inc.xhtml
++++ b/browser/components/preferences/privacy.inc.xhtml
+@@ -705,6 +705,83 @@
+   </hbox>
  </groupbox>
  
 +<!-- IceCat-specific privacy group -->
@@ -84,18 +84,17 @@
  <hbox id="permissionsCategory"
        class="subcategory"
        hidden="true"
---- a/browser/components/preferences/privacy.js.orig	2021-08-17 15:39:19.662709308 -0400
-+++ b/browser/components/preferences/privacy.js	2021-08-17 16:10:17.129079115 -0400
-@@ -138,6 +138,17 @@
-   { id: "browser.urlbar.suggest.topsites", type: "bool" },
-   { id: "browser.urlbar.suggest.engines", type: "bool" },
+--- a/browser/components/preferences/privacy.js
++++ b/browser/components/preferences/privacy.js
+@@ -155,6 +155,16 @@
+   { id: PREF_URLBAR_QUICKSUGGEST_BLOCKLIST, type: "string" },
+   { id: PREF_URLBAR_WEATHER_USER_ENABLED, type: "bool" },
  
 +  // IceCat-specific
 +  { id: "javascript.enabled", type: "bool" },
 +  { id: "browser.display.use_document_fonts", type: "int" },
 +  { id: "extensions.update.enabled", type: "bool" },
 +  { id: "network.http.referer.spoofSource", type: "bool" },
-+  { id: "privacy.resistFingerprinting", type: "bool" },
 +  { id: "webgl.disabled", type: "bool" },
 +  { id: "network.captive-portal-service.enabled", type: "bool" },
 +  { id: "network.connectivity-service.enabled", type: "bool" },
@@ -104,7 +103,7 @@
    // History
    { id: "places.history.enabled", type: "bool" },
    { id: "browser.formfill.enable", type: "bool" },
-@@ -706,6 +716,24 @@
+@@ -1177,6 +1187,24 @@
      setSyncFromPrefListener("enableOCSP", () => this.readEnableOCSP());
      setSyncToPrefListener("enableOCSP", () => this.writeEnableOCSP());
  
@@ -129,7 +128,7 @@
      if (AlertsServiceDND) {
        let notificationsDoNotDisturbBox = document.getElementById(
          "notificationsDoNotDisturbBox"
-@@ -825,6 +850,62 @@
+@@ -1290,6 +1318,62 @@
      SiteDataManager.updateSites();
    },
  
@@ -192,13 +191,12 @@
    // CONTENT BLOCKING
  
    /**
-diff -ru icecat-91.13.0/browser/base/content/appmenu-viewcache.inc.xhtml icecat-91.13.0.orig/browser/base/content/appmenu-viewcache.inc.xhtml
---- icecat-91.13.0/browser/base/content/appmenu-viewcache.inc.xhtml	2022-08-30 20:57:37.511721105 -0400
-+++ icecat-91.13.0.orig/browser/base/content/appmenu-viewcache.inc.xhtml	2022-08-30 20:52:39.076545425 -0400
-@@ -336,6 +336,10 @@
+--- a/browser/base/content/appmenu-viewcache.inc.xhtml
++++ b/browser/base/content/appmenu-viewcache.inc.xhtml
+@@ -126,6 +126,10 @@
                       key="key_preferencesCmdMac"
  #endif
-                      oncommand="openPreferences()"/>
+                      />
 +      <toolbarbutton id="appMenu-icecatsettings-button"
 +                     class="subviewbutton"
 +                     data-l10n-id="appmenuitem-icecat-settings"
@@ -206,10 +204,9 @@ diff -ru icecat-91.13.0/browser/base/content/appmenu-viewcache.inc.xhtml icecat-
        <toolbarbutton id="appMenu-more-button2"
                       class="subviewbutton subviewbutton-nav"
                       data-l10n-id="appmenuitem-more-tools"
-diff -ru icecat-91.13.0.orig/browser/base/content/browser-menubar.inc icecat-91.13.0/browser/base/content/browser-menubar.inc
---- icecat-91.13.0.orig/browser/base/content/browser-menubar.inc	2022-08-30 21:06:25.143226477 -0400
-+++ icecat-91.13.0/browser/base/content/browser-menubar.inc	2022-08-30 21:06:10.103469430 -0400
-@@ -139,6 +139,9 @@
+--- a/browser/base/content/browser-menubar.inc
++++ b/browser/base/content/browser-menubar.inc
+@@ -127,6 +127,9 @@
                            />
  #endif
  #endif
-- 
cgit v1.2.3