mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 148.0.7765.0 * chore: bump chromium in DEPS to 148.0.7766.0 * fix(patch-conflict): update packed_resources dep name after upstream rename Upstream renamed //chrome:packed_resources_integrity_header to //chrome:packed_resources. Updated the patch to guard the new dependency name with !is_electron_build while preserving the same intent. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7714543 Co-Authored-By: Claude <noreply@anthropic.com> * fix(patch-conflict): update code_cache_host_impl.cc for upstream includes and TODO Upstream added #include <stdint.h> and a TODO comment in code_cache_host_impl.cc which conflicted with the Electron code cache custom schemes patch. Resolved by keeping both upstream additions and the Electron ProcessLockURLIsCodeCacheScheme function. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7615151 Co-Authored-By: Claude <noreply@anthropic.com> * chore: update patch hunk headers Co-Authored-By: Claude <noreply@anthropic.com> * 7700837: update RecordContentToVisibleTimeRequest from mojom to native struct Upstream typemapped RecordContentToVisibleTimeRequest from a Mojo struct to a native C++ struct. Updated OSR virtual method signatures from blink::mojom::RecordContentToVisibleTimeRequestPtr to std::optional<blink::RecordContentToVisibleTimeRequest> and blink::RecordContentToVisibleTimeRequest to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7700837 Co-Authored-By: Claude <noreply@anthropic.com> * 7714579: update WebString::FromASCII to FromUTF8 Upstream renamed blink::WebString::FromASCII to FromAscii. Updated Electron's usage to FromUTF8 which is equivalent for ASCII scheme strings and avoids a dependency on the renamed method. Also fixed blink::String::FromUTF8 to use the String constructor directly. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7714579 Co-Authored-By: Claude <noreply@anthropic.com> * 7696480: add stream_info dep after StreamInfo extraction Upstream extracted extensions::StreamInfo from PdfViewerStreamManager to a standalone class in extensions/browser/mime_handler/stream_info.h. Added the new target as a dependency since Electron's streams_private and pdf_viewer_private APIs use PdfViewerStreamManager which now depends on the separate StreamInfo target. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7696480 Co-Authored-By: Claude <noreply@anthropic.com> * chore: bump chromium in DEPS to 148.0.7768.0 * fix(patch-conflict): update PiP patch for new toggle_mute_button in overlay window Upstream added a toggle_mute_button to the live caption dialog controls in VideoOverlayWindowViews::SetLiveCaptionDialogVisibility. Extended the existing #if 0 guard to include the new button handling since Electron disables live caption dialog functionality. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7682308 Co-Authored-By: Claude <noreply@anthropic.com> * fix(patch-conflict): update packed_resource_integrity patch after upstream dep removal Upstream removed the deps += [ "//chrome:packed_resources" ] line from the if (!is_win) block in chrome/browser/BUILD.gn. The Electron patch no longer needs to guard this dep with !is_electron_build in this location since the dep was already relocated by an earlier upstream CL. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7714543 Co-Authored-By: Claude <noreply@anthropic.com> * fix(patch-conflict): update WebSocket throttling revert for DisconnectWebSocketOnBFCache guard Upstream added a DisconnectWebSocketOnBFCacheEnabled() runtime feature check that wraps the WebSocket BFCache feature registration. Updated the Electron revert patch to place the kAllowAggressiveThrottlingWithWebSocket ternary inside the new conditional guard. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7698838 Co-Authored-By: Claude <noreply@anthropic.com> * fix(patch-conflict): update SCContentSharingPicker patch for upstream native picker refactor Upstream added is_native_picker and filter_ based native picker session validation to ScreenCaptureKitDeviceMac. Electron's patch uses its own native picker approach (active_streams_ counter + direct SCContentSharingPicker API), so marked the new upstream parameters as [[maybe_unused]] and kept Electron's implementation. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7713560 Co-Authored-By: Claude <noreply@anthropic.com> * chore: update patch hunk headers Co-Authored-By: Claude <noreply@anthropic.com> * 7708800: update StartDragging signature to use RenderFrameHost Upstream refactored StartDragging to take a RenderFrameHost& instead of separate source_origin and source_rwh parameters. Updated OffScreenWebContentsView to match the new signature and derive the RenderWidgetHostImpl from the RenderFrameHost internally. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7708800 Co-Authored-By: Claude <noreply@anthropic.com> * 7682308: add toggle_mute_button to chromium_src build sources Upstream added a ToggleMuteButton to the PiP overlay window controls. Added the new toggle_mute_button.cc/h source files to Electron's chromium_src/BUILD.gn to resolve linker errors. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7682308 Co-Authored-By: Claude <noreply@anthropic.com> * chore: update patches after main rebase * fixup! 7708800: update StartDragging signature to use RenderFrameHost fix linting * 7705541: [trap-handler] Track individual Wasm memories | https://chromium-review.googlesource.com/c/v8/v8/+/7705541 Moved the SetUpWebAssemblyTrapHandler() call to before the V8 isolate is created * fixup! fix utility process tests --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
211 lines
6.4 KiB
Python
211 lines
6.4 KiB
Python
gclient_gn_args_from = 'src'
|
|
|
|
vars = {
|
|
'chromium_version':
|
|
'148.0.7768.0',
|
|
'node_version':
|
|
'v24.14.1',
|
|
'nan_version':
|
|
'675cefebca42410733da8a454c8d9391fcebfbc2',
|
|
'squirrel.mac_version':
|
|
'0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',
|
|
'reactiveobjc_version':
|
|
'74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76',
|
|
'mantle_version':
|
|
'2a8e2123a3931038179ee06105c9e6ec336b12ea',
|
|
'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',
|
|
|
|
# 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(["node", ".yarn/releases/yarn-4.12.0.cjs", "install", "--immutable"]);',
|
|
],
|
|
},
|
|
{
|
|
'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',
|
|
]
|