From 36f15dbc57096ff29d24bf76ee503c0292520b7c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer 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 . * 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. --- tools/process-json-files.py | 59 +-------------------------------------------- 1 file changed, 1 insertion(+), 58 deletions(-) (limited to 'tools') diff --git a/tools/process-json-files.py b/tools/process-json-files.py index d449057..2407fa9 100644 --- a/tools/process-json-files.py +++ b/tools/process-json-files.py @@ -148,48 +148,6 @@ class Changes(RemoteSettings): return File(cls.OUTPUT_PATH, changes) -class SearchConfig(RemoteSettings): - JSON_PATHS = ( - RemoteSettings.DUMPS_PATH_ABSOLUTE / - 'main/search-config.json', - ) - SCHEMA_PATH = arguments.MAIN_PATH / \ - 'toolkit/components/search/schema/search-config-schema.json' - OUTPUT_PATH = JSON_PATHS[0] - - _DUCKDUCKGO_SEARCH_ENGINE_ID = 'ddg@search.mozilla.org' - - @classmethod - def should_drop_record(cls, search_engine): - return search_engine['webExtension']['id'] not in ( - cls._DUCKDUCKGO_SEARCH_ENGINE_ID, 'wikipedia@search.mozilla.org') - - @classmethod - def process_record(cls, search_engine): - [search_engine.pop(key, None) - for key in ['extraParams', 'telemetryId']] - - general_specifier = {} - for specifier in search_engine['appliesTo'].copy(): - if 'application' in specifier: - if 'distributions' in specifier['application']: - search_engine['appliesTo'].remove(specifier) - continue - specifier['application'].pop('extraParams', None) - - if 'included' in specifier and 'everywhere' in specifier[ - 'included'] and specifier['included']['everywhere']: - general_specifier = specifier - - if not general_specifier: - general_specifier = {'included': {'everywhere': True}} - search_engine['appliesTo'].insert(0, general_specifier) - if search_engine['webExtension']['id'] == cls._DUCKDUCKGO_SEARCH_ENGINE_ID: - general_specifier['default'] = 'yes' - - return search_engine - - class SearchConfigV2(RemoteSettings): JSON_PATHS = ( RemoteSettings.DUMPS_PATH_ABSOLUTE / @@ -224,20 +182,6 @@ class SearchConfigV2(RemoteSettings): return record -class SearchConfigOverrides(RemoteSettings): - JSON_PATHS = ( - RemoteSettings.DUMPS_PATH_ABSOLUTE / - 'main/search-config-overrides.json', - ) - SCHEMA_PATH = arguments.MAIN_PATH / \ - 'toolkit/components/search/schema/search-config-overrides-schema.json' - OUTPUT_PATH = JSON_PATHS[0] - - @classmethod - def should_drop_record(cls, record): - return True - - class SearchConfigOverridesV2(RemoteSettings): JSON_PATHS = ( RemoteSettings.DUMPS_PATH_ABSOLUTE / @@ -295,8 +239,7 @@ class TopSites(RemoteSettings): # To reflect the latest timestamps, Changes class should always come after # all other RemoteSettings subclasses -processors = (SearchConfig, SearchConfigOverrides, - SearchConfigV2, SearchConfigOverridesV2, +processors = (SearchConfigV2, SearchConfigOverridesV2, Changes) for processor in processors: -- cgit v1.2.3