From 36f15dbc57096ff29d24bf76ee503c0292520b7c Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim@guixotic.coop>
Date: Fri, 12 Sep 2025 21:22:28 +0900
Subject: Update to 140.2.0-1.

The settings patches needed adjusting because of changes introduced in
<https://bugzilla.mozilla.org/show_bug.cgi?id=1893068>.

* makeicecat: Update FFMINOR and SOURCEBALL_CHECKSUM.
Update patching for moved files on no longer existing patterns.
Do not set MOZ_APP_VENDOR/MOZ_APP_UA_NAME/MOZ_APP_PROFILE, as confvars, which now
fails the build. Delete obsolete variables, or those already set to
the correct value in browser/moz.configure.
Do not patch (and break) translation data.
* data/patches/icecat-preferences.patch: Adjust for changes.
* data/patches/hide-firefox-view-button.patch: Update patch.
* data/patches/hide-submit-feedback-menu-item.patch: Likewise.
* data/patches/icecat-about-dialog.patch: Likewise.
* data/patches/moz-configure-changes.patch: Likewise. Set
MOZILLA_OFFICIAL to False by default, which disables telemetry.
* tools/process-json-files.py (SearchConfig)
(SearchConfigOverrides): Delete classes.
(processors): De-register them.
* data/patches/fix-install.patch: New file.
---
 data/patches/icecat-preferences.patch | 96 ++++++++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 31 deletions(-)

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

diff --git a/data/patches/icecat-preferences.patch b/data/patches/icecat-preferences.patch
index f8f00cd..5b3b24f 100644
--- a/data/patches/icecat-preferences.patch
+++ b/data/patches/icecat-preferences.patch
@@ -1,6 +1,63 @@
+diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
+index ec44a3b1a354..e469b754d93d 100644
+--- a/browser/base/content/appmenu-viewcache.inc.xhtml
++++ b/browser/base/content/appmenu-viewcache.inc.xhtml
+@@ -139,6 +139,9 @@
+                      key="key_preferencesCmdMac"
+ #endif
+                      />
++      <toolbarbutton id="appMenu-icecatsettings-button"
++                     class="subviewbutton"
++                     data-l10n-id="appmenuitem-icecat-settings"/>
+       <toolbarbutton id="appMenu-more-button2"
+                      class="subviewbutton subviewbutton-nav"
+                      data-l10n-id="appmenuitem-more-tools"
+diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
+index 01bca4ecb0de..7c755439d1d5 100644
+--- a/browser/base/content/browser-menubar.inc
++++ b/browser/base/content/browser-menubar.inc
+@@ -116,6 +116,8 @@
+                           />
+ #endif
+ #endif
++              <menuitem id="menu_icecat_preferences"
++	          data-l10n-id="appmenuitem-icecat-settings"/>
+               </menupopup>
+             </menu>
+ 
+diff --git a/browser/base/content/browser-menubar.js b/browser/base/content/browser-menubar.js
+index 61ae54a0884c..6d4c315427bc 100644
+--- a/browser/base/content/browser-menubar.js
++++ b/browser/base/content/browser-menubar.js
+@@ -16,6 +16,9 @@ document.addEventListener(
+         case "menu_preferences":
+           openPreferences(undefined);
+           break;
++        case "menu_icecat_preferences":
++          openPreferences("privacy-icecatPreferences");
++          break;
+ 
+         // == view-menu ==
+         case "menu_pageStyleNoStyle":
+diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
+index 689205034d9d..a80bbcfe2926 100644
+--- a/browser/components/customizableui/content/panelUI.js
++++ b/browser/components/customizableui/content/panelUI.js
+@@ -379,6 +379,9 @@ const PanelUI = {
+       case "appMenu-settings-button":
+         openPreferences();
+         break;
++      case "appMenu-icecatsettings-button":
++        openPreferences("privacy-icecatPreferences");
++        break;
+       case "appMenu-more-button2":
+         this.showMoreToolsPanel(target);
+         break;
+diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml
+index 28e325c938de..fb7e669e07f6 100644
 --- a/browser/components/preferences/privacy.inc.xhtml
 +++ b/browser/components/preferences/privacy.inc.xhtml
-@@ -705,6 +705,83 @@
+@@ -691,6 +691,83 @@
    </hbox>
  </groupbox>
  
@@ -84,11 +141,13 @@
  <hbox id="permissionsCategory"
        class="subcategory"
        hidden="true"
+diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js
+index 5722057a0665..3d825f40fa3b 100644
 --- 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" },
+@@ -156,6 +156,16 @@ Preferences.addAll([
+   { id: "browser.urlbar.suggest.quicksuggest.sponsored", type: "bool" },
+   { id: "browser.urlbar.quicksuggest.dataCollection.enabled", type: "bool" },
  
 +  // IceCat-specific
 +  { id: "javascript.enabled", type: "bool" },
@@ -103,7 +162,7 @@
    // History
    { id: "places.history.enabled", type: "bool" },
    { id: "browser.formfill.enable", type: "bool" },
-@@ -1177,6 +1187,24 @@
+@@ -1150,6 +1160,24 @@ var gPrivacyPane = {
      setSyncFromPrefListener("enableOCSP", () => this.readEnableOCSP());
      setSyncToPrefListener("enableOCSP", () => this.writeEnableOCSP());
  
@@ -128,7 +187,7 @@
      if (AlertsServiceDND) {
        let notificationsDoNotDisturbBox = document.getElementById(
          "notificationsDoNotDisturbBox"
-@@ -1290,6 +1318,62 @@
+@@ -1259,6 +1287,62 @@ var gPrivacyPane = {
      SiteDataManager.updateSites();
    },
  
@@ -191,28 +250,3 @@
    // CONTENT BLOCKING
  
    /**
---- a/browser/base/content/appmenu-viewcache.inc.xhtml
-+++ b/browser/base/content/appmenu-viewcache.inc.xhtml
-@@ -126,6 +126,10 @@
-                      key="key_preferencesCmdMac"
- #endif
-                      />
-+      <toolbarbutton id="appMenu-icecatsettings-button"
-+                     class="subviewbutton"
-+                     data-l10n-id="appmenuitem-icecat-settings"
-+                     oncommand="switchToTabHavingURI('about:preferences#privacy-icecatPreferences', true)"/>
-       <toolbarbutton id="appMenu-more-button2"
-                      class="subviewbutton subviewbutton-nav"
-                      data-l10n-id="appmenuitem-more-tools"
---- a/browser/base/content/browser-menubar.inc
-+++ b/browser/base/content/browser-menubar.inc
-@@ -127,6 +127,9 @@
-                           />
- #endif
- #endif
-+              <menuitem id="menu_icecat_preferences"
-+	          oncommand="switchToTabHavingURI('about:preferences#privacy-icecatPreferences', true)"
-+	          data-l10n-id="appmenuitem-icecat-settings"/>
-               </menupopup>
-             </menu>
- 
-- 
cgit v1.2.3