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/moz-configure-changes.patch | |
| 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/moz-configure-changes.patch')
| -rw-r--r-- | data/patches/moz-configure-changes.patch | 35 |
1 files changed, 30 insertions, 5 deletions
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") |