mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
* chore: bump chromium in DEPS to 136.0.7052.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch https://chromium-review.googlesource.com/c/chromium/src/+/6318359 patch applied manually due to context shear * chore: update preconnect_manager.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6318420 patch applied manually due to context shear * chore: e patches all * chore: bump chromium to 136.0.7053.1 * chore: update fix_remove_profiles_from_spellcheck_service.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6326575 patch applied manually due to context shear * chore: e patches all * chore: revert removal of v8 API used by Node.js * devtools: Remove DevToolsUIBindings::SendJsonRequest() | https://chromium-review.googlesource.com/c/chromium/src/+/6326236 * 6244461: Merge //content/common/user_agent.cc into //components/embedder_support:user_agent | https://chromium-review.googlesource.com/c/chromium/src/+/6244461 * 6313744: Migrate views::Background factory methods to ColorVariant | https://chromium-review.googlesource.com/c/chromium/src/+/6313744 * 6314545: Remove multiple argument support from base::ToString() | https://chromium-review.googlesource.com/c/chromium/src/+/6314545 * 6317362: [Extensions] Inline MessagingDelegate::CreateReceiverForTab() | https://chromium-review.googlesource.com/c/chromium/src/+/6317362 * 6308998: Add SettingAccess structured metrics event for DevTools | https://chromium-review.googlesource.com/c/chromium/src/+/6308998 * 6295214: Remove redundant state field in per-extension preferences | https://chromium-review.googlesource.com/c/chromium/src/+/6295214 NB: this change is copied from the upstream change to extensions/shell/browser/shell_extension_loader.cc * fix: ui/ linter error This is showing up in an eslint build step in Electron: > /__w/electron/electron/src/out/Default/gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts > 77:23 error This assertion is unnecessary since the receiver accepts the original type of the expression @typescript-eslint/no-unnecessary-type-assertion > > ✖ 1 problem (1 error, 0 warnings) > 1 error and 0 warnings potentially fixable with the `--fix` option. However, removing the assertion causes a typescript build failure: > gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts:77:23 - error TS2345: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. > Type 'null' is not assignable to type 'HTMLElement'. > > 77 items.indexOf(this.querySelector<HTMLElement>(':focus')); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ So I think the two different steps may be picking up typescript definitions. This patch should be removed after the issue is tracked down and fixed in a followup task. * fix: -Wnonnull warning Fixes this warning: > 2025-03-07T01:05:01.8637705Z ../../third_party/electron_node/src/debug_utils.cc(257,12): error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] > 2025-03-07T01:05:01.8638267Z 257 | return nullptr; > 2025-03-07T01:05:01.8638481Z | ^~~~~~~ > 2025-03-07T01:05:01.8638700Z 1 error generated. Not sure why this warning was never triggered before; `git blame` indicates this code hasn't changed in ages: > c40a8273ef2 (Michaël Zasso 2024-05-10 09:50:20 +0200 255) #endif // DEBUG > 8e2d33f1562 (Anna Henningsen 2018-06-07 16:54:29 +0200 256) } > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 257) return nullptr; > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 258) } Presumably this is failing in this Chromium roll due to a clang version bump. We should remove this patch after upstreaming it. * docs: add upstream pr link for Node patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com>
214 lines
6.5 KiB
Python
214 lines
6.5 KiB
Python
gclient_gn_args_from = 'src'
|
|
|
|
vars = {
|
|
'chromium_version':
|
|
'136.0.7053.1',
|
|
'node_version':
|
|
'v22.14.0',
|
|
'nan_version':
|
|
'e14bdcd1f72d62bca1d541b66da43130384ec213',
|
|
'squirrel.mac_version':
|
|
'0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',
|
|
'reactiveobjc_version':
|
|
'74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76',
|
|
'mantle_version':
|
|
'78d3966b3c331292ea29ec38661b25df0a245948',
|
|
'engflow_reclient_configs_version':
|
|
'955335c30a752e9ef7bff375baab5e0819b6c00d',
|
|
|
|
'pyyaml_version': '3.12',
|
|
|
|
'chromium_git': 'https://chromium.googlesource.com',
|
|
'electron_git': 'https://github.com/electron',
|
|
'nodejs_git': 'https://github.com/nodejs',
|
|
'yaml_git': 'https://github.com/yaml',
|
|
'squirrel_git': 'https://github.com/Squirrel',
|
|
'reactiveobjc_git': 'https://github.com/ReactiveCocoa',
|
|
'mantle_git': 'https://github.com/Mantle',
|
|
'engflow_git': 'https://github.com/EngFlow',
|
|
|
|
# The path of the sysroots.json file.
|
|
'sysroots_json_path': 'electron/script/sysroots.json',
|
|
|
|
# KEEP IN SYNC WITH utils.js FILE
|
|
'yarn_version': '1.15.2',
|
|
|
|
# To be able to build clean Chromium from sources.
|
|
'apply_patches': True,
|
|
|
|
# To use an mtime cache for patched files to speed up builds.
|
|
'use_mtime_cache': True,
|
|
|
|
# To allow in-house builds to checkout those manually.
|
|
'checkout_chromium': True,
|
|
'checkout_node': True,
|
|
'checkout_nan': True,
|
|
'checkout_pgo_profiles': True,
|
|
|
|
# It's only needed to parse the native tests configurations.
|
|
'checkout_pyyaml': False,
|
|
|
|
# Can be used to disable the sysroot hooks.
|
|
'install_sysroot': True,
|
|
|
|
'use_rts': False,
|
|
|
|
'mac_xcode_version': 'default',
|
|
|
|
'generate_location_tags': False,
|
|
|
|
# To allow running hooks without parsing the DEPS tree
|
|
'process_deps': True,
|
|
|
|
'checkout_nacl':
|
|
False,
|
|
'checkout_openxr':
|
|
False,
|
|
'build_with_chromium':
|
|
True,
|
|
'checkout_android':
|
|
False,
|
|
'checkout_android_native_support':
|
|
False,
|
|
'checkout_clang_tidy':
|
|
True,
|
|
}
|
|
|
|
deps = {
|
|
'src': {
|
|
'url': (Var("chromium_git")) + '/chromium/src.git@' + (Var("chromium_version")),
|
|
'condition': 'checkout_chromium and process_deps',
|
|
},
|
|
'src/third_party/nan': {
|
|
'url': (Var("nodejs_git")) + '/nan.git@' + (Var("nan_version")),
|
|
'condition': 'checkout_nan and process_deps',
|
|
},
|
|
'src/third_party/electron_node': {
|
|
'url': (Var("nodejs_git")) + '/node.git@' + (Var("node_version")),
|
|
'condition': 'checkout_node and process_deps',
|
|
},
|
|
'src/third_party/pyyaml': {
|
|
'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
|
|
'condition': 'checkout_pyyaml and process_deps',
|
|
},
|
|
'src/third_party/squirrel.mac': {
|
|
'url': Var("squirrel_git") + '/Squirrel.Mac.git@' + Var("squirrel.mac_version"),
|
|
'condition': 'process_deps',
|
|
},
|
|
'src/third_party/squirrel.mac/vendor/ReactiveObjC': {
|
|
'url': Var("reactiveobjc_git") + '/ReactiveObjC.git@' + Var("reactiveobjc_version"),
|
|
'condition': 'process_deps'
|
|
},
|
|
'src/third_party/squirrel.mac/vendor/Mantle': {
|
|
'url': Var("mantle_git") + '/Mantle.git@' + Var("mantle_version"),
|
|
'condition': 'process_deps',
|
|
},
|
|
'src/third_party/engflow-reclient-configs': {
|
|
'url': Var("engflow_git") + '/reclient-configs.git@' + Var("engflow_reclient_configs_version"),
|
|
'condition': 'process_deps'
|
|
}
|
|
}
|
|
|
|
pre_deps_hooks = [
|
|
{
|
|
'name': 'generate_mtime_cache',
|
|
'condition': '(checkout_chromium and apply_patches and use_mtime_cache) and process_deps',
|
|
'pattern': 'src/electron',
|
|
'action': [
|
|
'python3',
|
|
'src/electron/script/patches-mtime-cache.py',
|
|
'generate',
|
|
'--cache-file',
|
|
'src/electron/patches/mtime-cache.json',
|
|
'--patches-config',
|
|
'src/electron/patches/config.json',
|
|
],
|
|
},
|
|
]
|
|
|
|
hooks = [
|
|
{
|
|
'name': 'patch_chromium',
|
|
'condition': '(checkout_chromium and apply_patches) and process_deps',
|
|
'pattern': 'src/electron',
|
|
'action': [
|
|
'python3',
|
|
'src/electron/script/apply_all_patches.py',
|
|
'src/electron/patches/config.json',
|
|
],
|
|
},
|
|
{
|
|
'name': 'apply_mtime_cache',
|
|
'condition': '(checkout_chromium and apply_patches and use_mtime_cache) and process_deps',
|
|
'pattern': 'src/electron',
|
|
'action': [
|
|
'python3',
|
|
'src/electron/script/patches-mtime-cache.py',
|
|
'apply',
|
|
'--cache-file',
|
|
'src/electron/patches/mtime-cache.json',
|
|
],
|
|
},
|
|
{
|
|
'name': 'electron_npm_deps',
|
|
'pattern': 'src/electron/package.json',
|
|
'action': [
|
|
'python3',
|
|
'-c',
|
|
'import os, subprocess; os.chdir(os.path.join("src", "electron")); subprocess.check_call(["python3", "script/lib/npx.py", "yarn@' + (Var("yarn_version")) + '", "install", "--frozen-lockfile"]);',
|
|
],
|
|
},
|
|
{
|
|
'name': 'sysroot_arm',
|
|
'pattern': '.',
|
|
'condition': 'install_sysroot and checkout_linux and checkout_arm',
|
|
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
'--sysroots-json-path=' + Var('sysroots_json_path'),
|
|
'--arch=arm'],
|
|
},
|
|
{
|
|
'name': 'sysroot_arm64',
|
|
'pattern': '.',
|
|
'condition': 'install_sysroot and checkout_linux and checkout_arm64',
|
|
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
'--sysroots-json-path=' + Var('sysroots_json_path'),
|
|
'--arch=arm64'],
|
|
},
|
|
{
|
|
'name': 'sysroot_x86',
|
|
'pattern': '.',
|
|
'condition': 'install_sysroot and checkout_linux and (checkout_x86 or checkout_x64)',
|
|
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
'--sysroots-json-path=' + Var('sysroots_json_path'),
|
|
'--arch=x86'],
|
|
},
|
|
{
|
|
'name': 'sysroot_mips',
|
|
'pattern': '.',
|
|
'condition': 'install_sysroot and checkout_linux and checkout_mips',
|
|
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
'--sysroots-json-path=' + Var('sysroots_json_path'),
|
|
'--arch=mips'],
|
|
},
|
|
{
|
|
'name': 'sysroot_mips64',
|
|
'pattern': '.',
|
|
'condition': 'install_sysroot and checkout_linux and checkout_mips64',
|
|
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
'--sysroots-json-path=' + Var('sysroots_json_path'),
|
|
'--arch=mips64el'],
|
|
},
|
|
{
|
|
'name': 'sysroot_x64',
|
|
'pattern': '.',
|
|
'condition': 'install_sysroot and checkout_linux and checkout_x64',
|
|
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
'--sysroots-json-path=' + Var('sysroots_json_path'),
|
|
'--arch=x64'],
|
|
},
|
|
]
|
|
|
|
recursedeps = [
|
|
'src',
|
|
]
|