diff options
author | Maxim Cournoyer <maxim@guixotic.coop> | 2025-09-12 21:22:28 +0900 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2025-09-15 00:02:18 -0400 |
commit | 36f15dbc57096ff29d24bf76ee503c0292520b7c (patch) | |
tree | 084605d448a67da51b5b75fcdde9128bf133c137 /data/patches | |
parent | ba161be3de71bb556be951ac4dbb81c807f68770 (diff) | |
download | gnuzilla-36f15dbc57096ff29d24bf76ee503c0292520b7c.tar.gz |
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.
Diffstat (limited to 'data/patches')
-rw-r--r-- | data/patches/hide-firefox-view-button.patch | 18 | ||||
-rw-r--r-- | data/patches/hide-submit-feedback-menu-item.patch | 12 | ||||
-rw-r--r-- | data/patches/icecat-about-dialog.patch | 23 | ||||
-rw-r--r-- | data/patches/icecat-preferences.patch | 96 | ||||
-rw-r--r-- | data/patches/moz-configure-changes.patch | 35 |
5 files changed, 123 insertions, 61 deletions
diff --git a/data/patches/hide-firefox-view-button.patch b/data/patches/hide-firefox-view-button.patch index ef24a34..52bad1c 100644 --- a/data/patches/hide-firefox-view-button.patch +++ b/data/patches/hide-firefox-view-button.patch @@ -1,10 +1,10 @@ ---- a/browser/base/content/navigator-toolbox.inc.xhtml -+++ b/browser/base/content/navigator-toolbox.inc.xhtml -@@ -43,6 +43,7 @@ - oncommand="FirefoxViewHandler.openTab();" - onmousedown="FirefoxViewHandler.openToolbarMouseEvent(event);" - cui-areatype="toolbar" -+ hidden="true" - removable="true"/> +--- a/browser/base/content/navigator-toolbox.inc.xhtml 2025-08-12 02:31:44.000000000 +0900 ++++ b/browser/base/content/navigator-toolbox.inc.xhtml 2025-08-26 21:10:15.709368257 +0900 +@@ -41,6 +41,7 @@ + role="button" + aria-pressed="false" + cui-areatype="toolbar" ++ hidden="true" + removable="true"/> - <tabs id="tabbrowser-tabs" + <tabs id="tabbrowser-tabs" diff --git a/data/patches/hide-submit-feedback-menu-item.patch b/data/patches/hide-submit-feedback-menu-item.patch index 402ba31..5278da7 100644 --- a/data/patches/hide-submit-feedback-menu-item.patch +++ b/data/patches/hide-submit-feedback-menu-item.patch @@ -1,10 +1,10 @@ ---- a/browser/base/content/browser-menubar.inc -+++ b/browser/base/content/browser-menubar.inc -@@ -465,6 +465,7 @@ - hidden="true" - appmenu-data-l10n-id="menu-report-broken-site"/> +--- a/browser/base/content/browser-menubar.inc 2025-08-26 21:16:57.929903122 +0900 ++++ b/browser/base/content/browser-menubar.inc 2025-08-26 21:17:09.257918204 +0900 +@@ -431,6 +431,7 @@ + disabled="true" + appmenu-data-l10n-id="appmenuitem-report-broken-site"/> <menuitem id="feedbackPage" + hidden="true" - oncommand="openFeedbackPage()" data-l10n-id="menu-help-share-ideas" appmenu-data-l10n-id="appmenu-help-share-ideas"/> + <menuitem id="helpSafeMode" diff --git a/data/patches/icecat-about-dialog.patch b/data/patches/icecat-about-dialog.patch index c7e77b0..87dc835 100644 --- a/data/patches/icecat-about-dialog.patch +++ b/data/patches/icecat-about-dialog.patch @@ -1,16 +1,16 @@ ---- a/browser/base/content/aboutDialog.xhtml -+++ b/browser/base/content/aboutDialog.xhtml -@@ -148,7 +148,6 @@ +--- a/browser/base/content/aboutDialog.xhtml 2025-08-26 21:23:08.866394736 +0900 ++++ b/browser/base/content/aboutDialog.xhtml 2025-08-26 21:23:19.986408921 +0900 +@@ -139,7 +139,6 @@ <hbox pack="center"> <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/> - <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"/> -- <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"/> + <label is="text-link" class="bottom-link" href="https://www.mozilla.org/about/legal/terms/firefox/" data-l10n-id="bottom-links-terms"/> +- <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-id="bottom-links-privacy"/> </hbox> <description id="trademark" data-l10n-id="trademarkInfo"></description> </vbox> ---- a/browser/base/content/aboutDialog.css -+++ b/browser/base/content/aboutDialog.css -@@ -38,10 +38,9 @@ +--- a/browser/base/content/aboutDialog.css 2025-08-26 21:26:43.618669160 +0900 ++++ b/browser/base/content/aboutDialog.css 2025-08-26 21:31:54.207067616 +0900 +@@ -32,10 +32,9 @@ #rightBox { background-image: url("chrome://branding/content/about-wordmark.svg"); background-repeat: no-repeat; @@ -19,6 +19,9 @@ padding-top: 38px; - margin-top: 20px; + margin-top: 60px; - } - + /* We don't want this box to contribute arbitrarily to the intrinsic size of + * the dialog, so set the width to a reasonable size, but let it flex to take + * all available space. */ +--- a/browser/base/content/aboutDialog.css ++++ b/browser/base/content/aboutDialog.css #rightBox:-moz-locale-dir(rtl) { 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> - diff --git a/data/patches/moz-configure-changes.patch b/data/patches/moz-configure-changes.patch index 6f0525e..9711a2f 100644 --- a/data/patches/moz-configure-changes.patch +++ b/data/patches/moz-configure-changes.patch @@ -1,18 +1,43 @@ +diff --git a/browser/moz.configure b/browser/moz.configure +index e8b401a7dfb2..d5b3117ce3d8 100644 --- a/browser/moz.configure +++ b/browser/moz.configure -@@ -5,11 +5,11 @@ +@@ -5,16 +5,19 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. imply_option("MOZ_PLACES", True) -imply_option("MOZ_SERVICES_HEALTHREPORT", True) -+imply_option("MOZ_SERVICES_HEALTHREPORT", False) - imply_option("MOZ_SERVICES_SYNC", True) +-imply_option("MOZ_SERVICES_SYNC", True) -imply_option("MOZ_DEDICATED_PROFILES", True) -imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True) -imply_option("MOZ_NORMANDY", True) ++imply_option("MOZ_SERVICES_HEALTHREPORT", False) ++ # Disabling MOZ_SERVICES_SYNC would break runtime javascript, ++ # see <https://bugzilla.mozilla.org/show_bug.cgi?id=1816969>. ++imply_option("MOZ_SERVICES_SYNC", True) +imply_option("MOZ_DEDICATED_PROFILES", False) +imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False) +imply_option("MOZ_NORMANDY", False) + imply_option("MOZ_PROFILE_MIGRATOR", True) + + +-imply_option("MOZ_APP_VENDOR", "Mozilla") ++imply_option("MOZ_APP_VENDOR", "GNU") + imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") ++imply_option("MOZ_APP_PROFILE", "mozilla/icecat") + # Include the DevTools client, not just the server (which is the default) + imply_option("MOZ_DEVTOOLS", "all") + imply_option("BROWSER_CHROME_URL", "chrome://browser/content/browser.xhtml") +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 193272588caa..da8a729548c8 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -991,7 +991,7 @@ set_config("MOZ_BUILD_APP", build_project) + set_define("MOZ_BUILD_APP", build_project) + + +-option(env="MOZILLA_OFFICIAL", help="Build an official release") ++option(env="MOZILLA_OFFICIAL", help="Build an official release", default=False) + - with only_when(target_has_linux_kernel & compile_environment): - option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper") + @depends("MOZILLA_OFFICIAL") |