diff --git a/assets/patches.txt b/assets/patches.txt index 34af6b1..bb101f6 100644 --- a/assets/patches.txt +++ b/assets/patches.txt @@ -4,6 +4,7 @@ patches/bootstrap-without-vcs.patch patches/context-menu.patch patches/custom-ubo-assets-bootstrap-location.patch patches/disable-data-reporting-at-compile-time.patch +patches/faster-package-multi-locale.patch patches/hide-passwordmgr.patch patches/librewolf-pref-pane.patch patches/mozilla_dirs.patch diff --git a/patches/faster-package-multi-locale.patch b/patches/faster-package-multi-locale.patch new file mode 100644 index 0000000..880d1c7 --- /dev/null +++ b/patches/faster-package-multi-locale.patch @@ -0,0 +1,91 @@ +diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py +--- a/python/mozbuild/mozbuild/mach_commands.py ++++ b/python/mozbuild/mozbuild/mach_commands.py +@@ -2468,11 +2468,11 @@ + @CommandArgument( + "--locales", + metavar="LOCALES", + nargs="+", + required=True, +- help='List of locales to package, including "en-US"', ++ help='List of locales to package, excluding "en-US"', + ) + @CommandArgument( + "--verbose", action="store_true", help="Log informative status messages." + ) + def package_l10n(command_context, verbose=False, locales=[]): +@@ -2484,55 +2484,36 @@ + "export BUILD_BACKENDS=FasterMake,RecursiveMake\n" + "in your mozconfig." + ) + return 1 + +- if "en-US" not in locales: +- command_context.log( +- logging.WARN, +- "package-multi-locale", +- {"locales": locales}, +- 'List of locales does not include default locale "en-US": ' +- '{locales}; adding "en-US"', +- ) +- locales.append("en-US") +- locales = list(sorted(locales)) ++ locales = list(filter(lambda locale: locale != "en-US", sorted(locales))) + + append_env = { + # We are only (re-)packaging, we don't want to (re-)build + # anything inside Gradle. + "GRADLE_INVOKED_WITHIN_MACH_BUILD": "1", + "MOZ_CHROME_MULTILOCALE": " ".join(locales), + } + +- for locale in locales: +- if locale == "en-US": +- command_context.log( +- logging.INFO, +- "package-multi-locale", +- {"locale": locale}, +- "Skipping default locale {locale}", +- ) +- continue +- +- command_context.log( +- logging.INFO, +- "package-multi-locale", +- {"locale": locale}, +- "Processing chrome Gecko resources for locale {locale}", +- ) +- command_context.run_process( +- [ +- mozpath.join(command_context.topsrcdir, "mach"), +- "build", +- "chrome-{}".format(locale), +- ], +- append_env=append_env, +- pass_thru=True, +- ensure_exit_code=True, +- cwd=mozpath.join(command_context.topsrcdir), +- ) ++ command_context.log( ++ logging.INFO, ++ "package-multi-locale", ++ {"locales": locales}, ++ "Processing chrome Gecko resources for locales {locales}", ++ ) ++ command_context.run_process( ++ [ ++ mozpath.join(command_context.topsrcdir, "mach"), ++ "build", ++ " ".join(map(lambda locale: "chrome-{}".format(locale), locales)), ++ ], ++ append_env=append_env, ++ pass_thru=True, ++ ensure_exit_code=True, ++ cwd=mozpath.join(command_context.topsrcdir), ++ ) + + if command_context.substs["MOZ_BUILD_APP"] == "mobile/android": + command_context.log( + logging.INFO, + "package-multi-locale", +