diff options
| author | Hiroki Tagato <tagattie@FreeBSD.org> | 2026-06-03 10:57:39 +0000 |
|---|---|---|
| committer | Hiroki Tagato <tagattie@FreeBSD.org> | 2026-06-03 10:59:10 +0000 |
| commit | 1260d3115322dc3e274f13ab7ed186d6babe80fd (patch) | |
| tree | 75b21bc542c27d4d1b09a1cd5a121a5f73bde8e4 | |
| parent | 494fafd346c7b32beda8899dbd74cc6b4995347b (diff) | |
devel/electron42: Update to 42.3.2
Changelog:
- https://github.com/electron/electron/releases/tag/v42.3.1
- https://github.com/electron/electron/releases/tag/v42.3.2
Reported by: GitHub (watch releases)
29 files changed, 145 insertions, 102 deletions
diff --git a/devel/electron42/Makefile b/devel/electron42/Makefile index 1aff5693f6fe..2b366855e7d1 100644 --- a/devel/electron42/Makefile +++ b/devel/electron42/Makefile @@ -145,7 +145,8 @@ GN_ARGS+= clang_use_chrome_plugins=false \ extra_cxxflags="${CXXFLAGS} -I${LOCALBASE}/include/libepoll-shim ${PINCLUDES}" \ extra_ldflags="${LDFLAGS}" \ ffmpeg_branding="${FFMPEG_BRAND}" \ - override_electron_version="${ELECTRON_VER}" + override_electron_version="${ELECTRON_VER}" \ + v8_builtins_profiling_log_file="" # TODO: investigate building with these options: # use_system_minigbm @@ -222,7 +223,7 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER -CHROMIUM_VER= 148.0.7778.180 +CHROMIUM_VER= 148.0.7778.218 # See ${WRKSRC}/electron/DEPS for NODE_VER NODE_VER= 24.15.0 # See ${WRKSRC}/electron/DEPS for NAN_VER diff --git a/devel/electron42/Makefile.version b/devel/electron42/Makefile.version index a4a0a2d82ce0..2b192a6cedeb 100644 --- a/devel/electron42/Makefile.version +++ b/devel/electron42/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 42.3.0 +ELECTRON_VER= 42.3.2 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron42/distinfo b/devel/electron42/distinfo index fa4b0dc5ce62..64356d931530 100644 --- a/devel/electron42/distinfo +++ b/devel/electron42/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1780030430 -SHA256 (electron/chromium-148.0.7778.180-lite.tar.xz) = 739ef940601549d1a3ab0c81954e0cd4ef296bb631d22826e8c27abdb9d89b2b -SIZE (electron/chromium-148.0.7778.180-lite.tar.xz) = 1591971560 +TIMESTAMP = 1780427435 +SHA256 (electron/chromium-148.0.7778.218-lite.tar.xz) = 9ef5529ee99461ec74fca7582fbd9db81e88d702ff6c3d19d0db12944c0c0b35 +SIZE (electron/chromium-148.0.7778.218-lite.tar.xz) = 1593163700 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 SHA256 (electron/rust/crates/Inflector-0.11.4.crate) = fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3 @@ -337,10 +337,10 @@ SHA256 (electron/rust/crates/zerocopy-derive-0.7.35.crate) = fa4f8080344d4671fb4 SIZE (electron/rust/crates/zerocopy-derive-0.7.35.crate) = 37829 SHA256 (electron/yarn-4.12.0.tgz) = bd58d06826ce9542c4cd904fe10bab7bc718ea2cc39a45d9fbd15f2edb45761c SIZE (electron/yarn-4.12.0.tgz) = 1056794 -SHA256 (electron/electron42-42.3.0-node-modules.tar.xz) = e102aed0f760c44a06cc3ff83b021ad0948b1ef5ffa275fe305d1e720ada9d31 -SIZE (electron/electron42-42.3.0-node-modules.tar.xz) = 71041981 -SHA256 (electron/electron-electron-v42.3.0_GH0.tar.gz) = 3820ec73357209c53a7a56ca3ac58ed10a587f6fe2f9bf576ab6c3ef703f4512 -SIZE (electron/electron-electron-v42.3.0_GH0.tar.gz) = 18782866 +SHA256 (electron/electron42-42.3.2-node-modules.tar.xz) = e102aed0f760c44a06cc3ff83b021ad0948b1ef5ffa275fe305d1e720ada9d31 +SIZE (electron/electron42-42.3.2-node-modules.tar.xz) = 71041981 +SHA256 (electron/electron-electron-v42.3.2_GH0.tar.gz) = de837279aca38273391046e3780de350426db093d2f906b3f06faa7ce7a9077b +SIZE (electron/electron-electron-v42.3.2_GH0.tar.gz) = 18820240 SHA256 (electron/nodejs-node-v24.15.0_GH0.tar.gz) = 5cfb169b21878f50876e0c6a77db1a5e40d733960232682bebb5e267246a2e80 SIZE (electron/nodejs-node-v24.15.0_GH0.tar.gz) = 126716937 SHA256 (electron/nodejs-nan-675cefebca42410733da8a454c8d9391fcebfbc2_GH0.tar.gz) = 3983c68f19ed75dd37dc228eab385093ae2533132730f253f0c3d19ff10788e3 diff --git a/devel/electron42/files/packagejsons/package.json b/devel/electron42/files/packagejsons/package.json index 963b46fbaaac..973ba98b3bae 100644 --- a/devel/electron42/files/packagejsons/package.json +++ b/devel/electron42/files/packagejsons/package.json @@ -57,8 +57,8 @@ "generate-version-json": "node script/generate-version-json.js", "lint": "node ./script/lint.js && npm run lint:fmt && npm run lint:docs && npm run lint:chromium-roller", "lint:js": "node ./script/lint.js --js", - "lint:fmt": "oxfmt --check \"{lib,spec,script,build,default_app,npm}/**/*.{js,ts,mjs,cjs}\"", - "format": "oxfmt --write \"{lib,spec,script,build,default_app,npm}/**/*.{js,ts,mjs,cjs}\"", + "lint:fmt": "oxfmt --check \"{lib,spec,script,build,default_app,npm,typings}/**/*.{js,ts,mjs,cjs}\"", + "format": "oxfmt --write \"{lib,spec,script,build,default_app,npm,typings}/**/*.{js,ts,mjs,cjs}\"", "lint:clang-format": "python3 script/run-clang-format.py -r -c shell/ || (echo \"\\nCode not formatted correctly.\" && exit 1)", "lint:clang-tidy": "ts-node ./script/run-clang-tidy.ts", "lint:cpp": "node ./script/lint.js --cc", @@ -148,6 +148,7 @@ "packageManager": "yarn@4.12.0", "workspaces": [ ".github/workflows", + "script/pgo", "spec", "spec/fixtures/native-addon/*" ], diff --git a/devel/electron42/files/packagejsons/script/pgo/benchmark-app/package.json b/devel/electron42/files/packagejsons/script/pgo/benchmark-app/package.json new file mode 100644 index 000000000000..ca2fd6721d3e --- /dev/null +++ b/devel/electron42/files/packagejsons/script/pgo/benchmark-app/package.json @@ -0,0 +1,6 @@ +{ + "name": "electron-pgo-benchmark-runner", + "version": "1.0.0", + "main": "main.js", + "description": "Drives browser benchmarks against an instrumented Electron build to collect PGO profile data" +} diff --git a/devel/electron42/files/packagejsons/script/pgo/package.json b/devel/electron42/files/packagejsons/script/pgo/package.json new file mode 100644 index 000000000000..a9b546ed5df2 --- /dev/null +++ b/devel/electron42/files/packagejsons/script/pgo/package.json @@ -0,0 +1,9 @@ +{ + "name": "@electron-ci/pgo", + "version": "0.0.0-development", + "private": true, + "description": "PGO profile collection tooling (see README.md)", + "dependencies": { + "@electron/asar": "^4.0.1" + } +} diff --git a/devel/electron42/files/packagejsons/yarn.lock b/devel/electron42/files/packagejsons/yarn.lock index 6b3df72666f5..3e6f3d426183 100644 --- a/devel/electron42/files/packagejsons/yarn.lock +++ b/devel/electron42/files/packagejsons/yarn.lock @@ -643,6 +643,14 @@ __metadata: languageName: unknown linkType: soft +"@electron-ci/pgo@workspace:script/pgo": + version: 0.0.0-use.local + resolution: "@electron-ci/pgo@workspace:script/pgo" + dependencies: + "@electron/asar": "npm:^4.0.1" + languageName: unknown + linkType: soft + "@electron-ci/uv-dlopen@npm:*, @electron-ci/uv-dlopen@workspace:spec/fixtures/native-addon/uv-dlopen": version: 0.0.0-use.local resolution: "@electron-ci/uv-dlopen@workspace:spec/fixtures/native-addon/uv-dlopen" diff --git a/devel/electron42/files/patch-base_system_sys__info__freebsd.cc b/devel/electron42/files/patch-base_system_sys__info__freebsd.cc index 238cd9417269..637288800b63 100644 --- a/devel/electron42/files/patch-base_system_sys__info__freebsd.cc +++ b/devel/electron42/files/patch-base_system_sys__info__freebsd.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_freebsd.cc.orig 2026-03-13 16:54:03 UTC +--- base/system/sys_info_freebsd.cc.orig 2026-05-26 20:44:49 UTC +++ base/system/sys_info_freebsd.cc -@@ -10,21 +10,75 @@ +@@ -10,21 +10,73 @@ #include "base/notreached.h" #include "base/numerics/safe_conversions.h" @@ -42,7 +42,7 @@ +ByteSize SysInfo::AmountOfAvailablePhysicalMemoryImpl() { + int page_size, r = 0; -+ unsigned int pgfree, pginact, pgcache; ++ unsigned int pgfree, pginact; + size_t size = sizeof(page_size); + size_t szpg = sizeof(pgfree); + @@ -52,15 +52,13 @@ + r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0); + if (r == 0) + r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0); -+ if (r == 0) -+ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0); + + if (r == -1) { + NOTREACHED(); + return ByteSize(0); + } + -+ return ByteSize((pgfree + pginact + pgcache) * checked_cast<unsigned>(page_size)); ++ return ByteSize((pgfree + pginact) * checked_cast<unsigned>(page_size)); +} + // static @@ -80,7 +78,7 @@ uint64_t SysInfo::MaxSharedMemorySize() { size_t limit; size_t size = sizeof(limit); -@@ -32,6 +86,18 @@ uint64_t SysInfo::MaxSharedMemorySize() { +@@ -32,6 +84,18 @@ uint64_t SysInfo::MaxSharedMemorySize() { NOTREACHED(); } return static_cast<uint64_t>(limit); diff --git a/devel/electron42/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/devel/electron42/files/patch-chrome_browser_ui_views_frame_browser__view.cc index fdc3660fdff1..4bd5ef8edb41 100644 --- a/devel/electron42/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/devel/electron42/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2026-05-18 23:17:45 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2026-05-26 20:44:49 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2472,7 +2472,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2473,7 +2473,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra } void BrowserView::TabDraggingStatusChanged(bool is_dragging) { @@ -9,7 +9,7 @@ UpdateFastResizeForContentViews(is_dragging); if (!is_dragging) { -@@ -5994,7 +5994,7 @@ void BrowserView::MaybeShowSupervisedUserProfileSignIn +@@ -5996,7 +5996,7 @@ void BrowserView::MaybeShowSupervisedUserProfileSignIn } void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() { @@ -18,7 +18,7 @@ if (!ShouldShowAvatarToolbarIPH()) { return; } -@@ -6004,7 +6004,7 @@ void BrowserView::MaybeShowSignInBenefitsIPH() { +@@ -6006,7 +6006,7 @@ void BrowserView::MaybeShowSignInBenefitsIPH() { } void BrowserView::MaybeShowSignInBenefitsIPH() { diff --git a/devel/electron42/files/patch-components_password__manager_core_browser_features_password__features.cc b/devel/electron42/files/patch-components_password__manager_core_browser_features_password__features.cc index f08cc23d60a4..fd78b9b5b613 100644 --- a/devel/electron42/files/patch-components_password__manager_core_browser_features_password__features.cc +++ b/devel/electron42/files/patch-components_password__manager_core_browser_features_password__features.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2026-04-28 21:06:17 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2026-05-26 20:44:49 UTC +++ components/password_manager/core/browser/features/password_features.cc @@ -78,7 +78,7 @@ BASE_FEATURE(kClearUndecryptablePasswordsOnSync, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, @@ -9,7 +9,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -174,7 +174,7 @@ BASE_FEATURE(kPasswordCheckupPrototype, base::FEATURE_ +@@ -118,7 +118,7 @@ BASE_FEATURE(kFillOnAccountSelect, + BASE_FEATURE(kFillOnAccountSelect, + "fill-on-account-select", + // TODO(504600482): Disable the feature again upon fixing the bug. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -180,7 +180,7 @@ BASE_FEATURE(kPasswordCheckupPrototype, base::FEATURE_ BASE_FEATURE(kPasswordCheckupPrototype, base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl.cc index bbcef1048262..8b9fcf596a5f 100644 --- a/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl.cc +++ b/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.cc.orig 2025-04-22 20:15:27 UTC +--- content/browser/gpu/gpu_data_manager_impl.cc.orig 2026-05-26 20:44:49 UTC +++ content/browser/gpu/gpu_data_manager_impl.cc -@@ -412,7 +412,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( +@@ -427,7 +427,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( private_->OnDisplayMetricsChanged(display, changed_metrics); } diff --git a/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl.h index b21af0f38bba..37fedb470550 100644 --- a/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl.h +++ b/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.h.orig 2025-08-26 20:49:50 UTC +--- content/browser/gpu/gpu_data_manager_impl.h.orig 2026-05-26 20:44:49 UTC +++ content/browser/gpu/gpu_data_manager_impl.h -@@ -224,7 +224,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa +@@ -233,7 +233,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; diff --git a/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index 61a64a61af60..666f3fdc5a98 100644 --- a/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2026-03-13 16:54:03 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2026-05-26 20:44:49 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1720,7 +1720,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1747,7 +1747,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h index 3447413af457..05695d80a6fc 100644 --- a/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h +++ b/devel/electron42/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2025-10-21 20:19:54 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2026-05-26 20:44:49 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.h -@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -152,7 +152,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics); @@ -9,7 +9,7 @@ bool IsGpuMemoryBufferNV12Supported(); #endif // BUILDFLAG(IS_LINUX) -@@ -311,7 +311,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -315,7 +315,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; diff --git a/devel/electron42/files/patch-content_browser_gpu_gpu__process__host.cc b/devel/electron42/files/patch-content_browser_gpu_gpu__process__host.cc index bae8d3eea9e4..92cc9c3c31a4 100644 --- a/devel/electron42/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/devel/electron42/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2026-01-07 00:52:53 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2026-05-26 20:44:49 UTC +++ content/browser/gpu/gpu_process_host.cc @@ -282,6 +282,7 @@ static const char* const kSwitchNames[] = { switches::kDisableSkiaGraphite, @@ -8,7 +8,7 @@ switches::kProfilingAtStart, switches::kProfilingFile, switches::kProfilingFlush, -@@ -307,7 +308,7 @@ static const char* const kSwitchNames[] = { +@@ -306,7 +307,7 @@ static const char* const kSwitchNames[] = { switches::kEnableNativeGpuMemoryBuffers, switches::kRenderNodeOverride, #endif diff --git a/devel/electron42/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/devel/electron42/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index f8aec3025d0c..9f58f9f0c651 100644 --- a/devel/electron42/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/devel/electron42/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2026-05-12 08:53:52 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2026-06-02 11:14:29 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -129,7 +129,7 @@ +@@ -130,7 +130,7 @@ #include "ui/gfx/win/gdi_util.h" #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "ui/accessibility/platform/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -554,7 +554,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -555,7 +555,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ ui::BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1984,7 +1984,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -2003,7 +2003,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -3016,7 +3016,7 @@ bool RenderWidgetHostViewAura::NeedsMouseCapture() { +@@ -3046,7 +3046,7 @@ bool RenderWidgetHostViewAura::NeedsMouseCapture() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -3202,7 +3202,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -3256,7 +3256,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/devel/electron42/files/patch-electron_BUILD.gn b/devel/electron42/files/patch-electron_BUILD.gn index 31a7d1cc87d3..5522d7b45455 100644 --- a/devel/electron42/files/patch-electron_BUILD.gn +++ b/devel/electron42/files/patch-electron_BUILD.gn @@ -1,4 +1,4 @@ ---- electron/BUILD.gn.orig 2026-05-14 22:13:14 UTC +--- electron/BUILD.gn.orig 2026-06-02 04:24:22 UTC +++ electron/BUILD.gn @@ -583,7 +583,7 @@ source_set("electron_lib") { defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ] @@ -22,7 +22,7 @@ if (is_linux) { libs = [ "xshmfence" ] deps += [ -@@ -1284,7 +1290,7 @@ if (is_mac) { +@@ -1302,7 +1308,7 @@ if (is_mac) { ":electron_lib", ":electron_win32_resources", ":packed_resources", @@ -31,7 +31,7 @@ "//content:sandbox_helper_win", "//electron/buildflags", "//third_party/electron_node:libnode", -@@ -1311,7 +1317,7 @@ if (is_mac) { +@@ -1329,7 +1335,7 @@ if (is_mac) { public_deps = [ "//tools/v8_context_snapshot" ] } @@ -40,7 +40,7 @@ data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] } -@@ -1378,7 +1384,7 @@ if (is_mac) { +@@ -1396,7 +1402,7 @@ if (is_mac) { configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } @@ -49,7 +49,7 @@ deps += [ "//sandbox/linux:chrome_sandbox" ] } } -@@ -1499,7 +1505,9 @@ dist_zip("electron_dist_zip") { +@@ -1517,7 +1523,9 @@ dist_zip("electron_dist_zip") { ] } diff --git a/devel/electron42/files/patch-electron_script_pgo_collect-profile.js b/devel/electron42/files/patch-electron_script_pgo_collect-profile.js new file mode 100644 index 000000000000..e19e0b4936f9 --- /dev/null +++ b/devel/electron42/files/patch-electron_script_pgo_collect-profile.js @@ -0,0 +1,11 @@ +--- electron/script/pgo/collect-profile.js.orig 2026-06-02 11:33:02 UTC ++++ electron/script/pgo/collect-profile.js +@@ -71,7 +71,7 @@ function installTrustedCA(caCertPath) { + // network workload coverage degrades but collection still succeeds. + function installTrustedCA(caCertPath) { + try { +- if (process.platform === 'linux') { ++ if (process.platform === 'linux' || process.platform === 'freebsd') { + const nssDb = path.join(os.homedir(), '.pki', 'nssdb'); + if (!fs.existsSync(nssDb)) { + fs.mkdirSync(nssDb, { recursive: true }); diff --git a/devel/electron42/files/patch-electron_shell_browser_browser__linux.cc b/devel/electron42/files/patch-electron_shell_browser_browser__linux.cc index dd0aaec05c49..22949a6ba057 100644 --- a/devel/electron42/files/patch-electron_shell_browser_browser__linux.cc +++ b/devel/electron42/files/patch-electron_shell_browser_browser__linux.cc @@ -1,15 +1,15 @@ ---- electron/shell/browser/browser_linux.cc.orig 2026-05-26 16:24:13 UTC +--- electron/shell/browser/browser_linux.cc.orig 2026-06-02 04:24:22 UTC +++ electron/shell/browser/browser_linux.cc -@@ -7,7 +7,7 @@ - #include <fcntl.h> - #include <stdlib.h> - #include <string_view> +@@ -4,7 +4,7 @@ + + #include "shell/browser/browser.h" + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include <gio/gdesktopappinfo.h> #include <gio/gio.h> #include <gtk/gtk.h> - #endif -@@ -37,7 +37,7 @@ +@@ -32,7 +32,7 @@ #include "ui/gtk/gtk_compat.h" // nogncheck #include "ui/gtk/gtk_util.h" // nogncheck diff --git a/devel/electron42/files/patch-electron_spec_api-app-spec.ts b/devel/electron42/files/patch-electron_spec_api-app-spec.ts index 7c24abb87228..f75149749a05 100644 --- a/devel/electron42/files/patch-electron_spec_api-app-spec.ts +++ b/devel/electron42/files/patch-electron_spec_api-app-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-app-spec.ts.orig 2026-05-26 16:24:13 UTC +--- electron/spec/api-app-spec.ts.orig 2026-06-02 04:24:22 UTC +++ electron/spec/api-app-spec.ts -@@ -136,11 +136,11 @@ describe('app module', () => { +@@ -137,11 +137,11 @@ describe('app module', () => { }); describe('app.getPreferredSystemLanguages()', () => { @@ -14,7 +14,7 @@ const languages = app.getPreferredSystemLanguages(); if (languages.length) { expect(languages).to.not.include('C'); -@@ -219,7 +219,7 @@ describe('app module', () => { +@@ -220,7 +220,7 @@ describe('app module', () => { expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound'); }); @@ -23,7 +23,7 @@ const electronPath = process.execPath; const appPath = path.join(fixturesPath, 'api', 'singleton'); appProcess = cp.spawn(electronPath, [appPath]); -@@ -390,7 +390,7 @@ describe('app module', () => { +@@ -391,7 +391,7 @@ describe('app module', () => { }); // GitHub Actions macOS-13 runners used for x64 seem to have a problem with this test. @@ -32,7 +32,7 @@ const tempFiles = [ path.join(fixturesPath, 'foo.txt'), path.join(fixturesPath, 'bar.txt'), -@@ -519,7 +519,7 @@ describe('app module', () => { +@@ -520,7 +520,7 @@ describe('app module', () => { // let w = null // before(function () { @@ -41,7 +41,7 @@ // this.skip() // } // }) -@@ -632,7 +632,7 @@ describe('app module', () => { +@@ -633,7 +633,7 @@ describe('app module', () => { describe('app.badgeCount', () => { const platformIsNotSupported = @@ -50,7 +50,7 @@ const expectedBadgeCount = 42; -@@ -679,7 +679,7 @@ describe('app module', () => { +@@ -680,7 +680,7 @@ describe('app module', () => { }); ifdescribe( @@ -59,7 +59,7 @@ )('app.get/setLoginItemSettings API', function () { const isMac = process.platform === 'darwin'; const isWin = process.platform === 'win32'; -@@ -1096,7 +1096,7 @@ describe('app module', () => { +@@ -1097,7 +1097,7 @@ describe('app module', () => { }); }); @@ -68,7 +68,7 @@ it('is mutable', () => { const values = [false, true, false]; const setters: Array<(arg: boolean) => void> = [ -@@ -1366,7 +1366,7 @@ describe('app module', () => { +@@ -1367,7 +1367,7 @@ describe('app module', () => { }); }); @@ -77,7 +77,7 @@ let w: BrowserWindow; before(function () { -@@ -1509,7 +1509,7 @@ describe('app module', () => { +@@ -1510,7 +1510,7 @@ describe('app module', () => { describe('getApplicationNameForProtocol()', () => { // TODO: Linux CI doesn't have registered http & https handlers @@ -86,7 +86,7 @@ 'returns application names for common protocols', function () { // We can't expect particular app names here, but these protocols should -@@ -1526,7 +1526,7 @@ describe('app module', () => { +@@ -1527,7 +1527,7 @@ describe('app module', () => { expect(app.getApplicationNameForProtocol('bogus-protocol://')).to.equal(''); }); @@ -95,7 +95,7 @@ const desktopFileId = 'mock-browser.desktop'; const mockDisplayName = 'Mock Browser'; const mockScheme = 'mockproto'; -@@ -1576,7 +1576,7 @@ describe('app module', () => { +@@ -1577,7 +1577,7 @@ describe('app module', () => { let xdgBinDir: string; before(() => { @@ -104,7 +104,7 @@ return; } -@@ -1593,7 +1593,7 @@ describe('app module', () => { +@@ -1594,7 +1594,7 @@ describe('app module', () => { }); after(() => { @@ -113,7 +113,7 @@ fs.rmSync(xdgDir, { recursive: true, force: true }); } }); -@@ -1605,7 +1605,7 @@ describe('app module', () => { +@@ -1606,7 +1606,7 @@ describe('app module', () => { }); it('returns resolved promise with appPath, displayName and icon', async function () { @@ -122,7 +122,7 @@ const appInfo = await spawnProtocolInfoWithXdgMock(`${mockScheme}://`, xdgDataHome, xdgConfigHome); expect(appInfo.name).to.equal(mockDisplayName); expect(appInfo.path).to.equal('/usr/bin/true'); -@@ -1619,7 +1619,7 @@ describe('app module', () => { +@@ -1620,7 +1620,7 @@ describe('app module', () => { expect(appInfo.icon).not.to.be.undefined(); }); @@ -131,16 +131,16 @@ const pathLookupExecutable = 'mock-browser'; const pathLookupExecutablePath = path.join(xdgBinDir, pathLookupExecutable); const pathLookupDisplayName = 'Mock Browser PATH'; -@@ -1653,7 +1653,7 @@ describe('app module', () => { +@@ -1654,7 +1654,7 @@ describe('app module', () => { }); }); -- ifdescribe(process.platform === 'linux')('default protocol client APIs with mocked XDG settings', () => { -+ ifdescribe(process.platform === 'linux' || process.platform === 'freebsd')('default protocol client APIs with mocked XDG settings', () => { +- ifdescribe(process.platform === 'linux')('default protocol client APIs', () => { ++ ifdescribe(process.platform === 'linux' || process.platform === 'freebsd')('default protocol client APIs', () => { const protocol = 'electron-test-linux'; const desktopFileId = 'electron-test.desktop'; const protocolMimeType = `x-scheme-handler/${protocol}`; -@@ -1792,7 +1792,7 @@ describe('app module', () => { +@@ -1771,7 +1771,7 @@ describe('app module', () => { }); // FIXME Get these specs running on Linux CI @@ -149,7 +149,7 @@ const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico'); const sizes = { small: 16, -@@ -1874,7 +1874,7 @@ describe('app module', () => { +@@ -1853,7 +1853,7 @@ describe('app module', () => { expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0); } @@ -158,7 +158,7 @@ expect(entry.sandboxed).to.be.a('boolean'); } -@@ -1943,7 +1943,7 @@ describe('app module', () => { +@@ -1922,7 +1922,7 @@ describe('app module', () => { it('succeeds with complete GPUInfo', async () => { const completeInfo = await getGPUInfo('complete'); @@ -167,7 +167,7 @@ // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo); const basicInfo = await getGPUInfo('basic'); -@@ -1967,7 +1967,7 @@ describe('app module', () => { +@@ -1946,7 +1946,7 @@ describe('app module', () => { }); }); diff --git a/devel/electron42/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/devel/electron42/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index 180a84b2370e..350e28badec0 100644 --- a/devel/electron42/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/devel/electron42/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2026-04-28 21:06:17 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2026-05-26 20:44:49 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2857,7 +2857,7 @@ std::unique_ptr<GLES2Decoder> GLES2Decoder::Create( +@@ -2865,7 +2865,7 @@ std::unique_ptr<GLES2Decoder> GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/devel/electron42/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/devel/electron42/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc index 67267ad1dbf9..5f79f1ce6894 100644 --- a/devel/electron42/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/devel/electron42/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2026-04-28 21:06:17 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2026-05-26 20:44:49 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc @@ -55,7 +55,7 @@ #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h" #endif -@@ -118,7 +118,7 @@ const char* GmbTypeToString(gfx::GpuMemoryBufferType t +@@ -123,7 +123,7 @@ const char* GmbTypeToString(gfx::GpuMemoryBufferType t case gfx::IO_SURFACE_BUFFER: return "platform"; #endif @@ -18,7 +18,7 @@ case gfx::NATIVE_PIXMAP: return "platform"; #endif -@@ -139,7 +139,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -144,7 +144,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; @@ -27,7 +27,7 @@ return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; -@@ -316,7 +316,7 @@ SharedImageFactory::SharedImageFactory( +@@ -322,7 +322,7 @@ SharedImageFactory::SharedImageFactory( factories_.push_back(std::move(ozone_factory)); } @@ -36,7 +36,7 @@ if (gr_context_type_ == GrContextType::kVulkan #if BUILDFLAG(USE_WEBGPU_ON_VULKAN_VIA_GL_INTEROP) /* We support GL context for WebGPU gl-vulkan interop (on linux).*/ -@@ -1040,7 +1040,7 @@ void SharedImageFactory::LogGetFactoryFailed(gpu::Shar +@@ -1051,7 +1051,7 @@ void SharedImageFactory::LogGetFactoryFailed(gpu::Shar } #endif // BUILDFLAG(IS_ANDROID) diff --git a/devel/electron42/files/patch-gpu_vulkan_vulkan__image.h b/devel/electron42/files/patch-gpu_vulkan_vulkan__image.h index f9927e679258..46b244cc3355 100644 --- a/devel/electron42/files/patch-gpu_vulkan_vulkan__image.h +++ b/devel/electron42/files/patch-gpu_vulkan_vulkan__image.h @@ -1,4 +1,4 @@ ---- gpu/vulkan/vulkan_image.h.orig 2025-08-26 20:49:50 UTC +--- gpu/vulkan/vulkan_image.h.orig 2026-05-26 20:44:49 UTC +++ gpu/vulkan/vulkan_image.h @@ -86,7 +86,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageUsageFlags usage, @@ -9,7 +9,7 @@ static std::unique_ptr<VulkanImage> CreateWithExternalMemoryAndModifiers( VulkanDeviceQueue* device_queue, const gfx::Size& size, -@@ -198,7 +198,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { +@@ -210,7 +210,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageTiling image_tiling, uint32_t queue_family_index); diff --git a/devel/electron42/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc b/devel/electron42/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc index 06278f9df72a..fe5a12341fb2 100644 --- a/devel/electron42/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc +++ b/devel/electron42/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/gl_image_processor_backend.cc.orig 2026-04-28 21:06:17 UTC +--- media/gpu/chromeos/gl_image_processor_backend.cc.orig 2026-05-26 20:44:49 UTC +++ media/gpu/chromeos/gl_image_processor_backend.cc -@@ -27,6 +27,10 @@ +@@ -28,6 +28,10 @@ #include "ui/ozone/public/ozone_platform.h" #include "ui/ozone/public/surface_factory_ozone.h" diff --git a/devel/electron42/files/patch-services_device_public_cpp_device__features.cc b/devel/electron42/files/patch-services_device_public_cpp_device__features.cc index a9d516c085dd..eca309d059d6 100644 --- a/devel/electron42/files/patch-services_device_public_cpp_device__features.cc +++ b/devel/electron42/files/patch-services_device_public_cpp_device__features.cc @@ -1,6 +1,6 @@ ---- services/device/public/cpp/device_features.cc.orig 2026-04-28 21:06:17 UTC +--- services/device/public/cpp/device_features.cc.orig 2026-05-26 20:44:49 UTC +++ services/device/public/cpp/device_features.cc -@@ -135,11 +135,11 @@ BASE_FEATURE(kAutomaticUsbDetach, base::FEATURE_ENABLE +@@ -152,11 +152,11 @@ BASE_FEATURE(kAutomaticUsbDetach, base::FEATURE_ENABLE // a USB interface is busy. #if BUILDFLAG(IS_ANDROID) BASE_FEATURE(kAutomaticUsbDetach, base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/devel/electron42/files/patch-services_device_public_cpp_device__features.h b/devel/electron42/files/patch-services_device_public_cpp_device__features.h index 259723c650e2..386c6b5cd2ac 100644 --- a/devel/electron42/files/patch-services_device_public_cpp_device__features.h +++ b/devel/electron42/files/patch-services_device_public_cpp_device__features.h @@ -1,6 +1,6 @@ ---- services/device/public/cpp/device_features.h.orig 2026-04-28 21:06:17 UTC +--- services/device/public/cpp/device_features.h.orig 2026-05-26 20:44:49 UTC +++ services/device/public/cpp/device_features.h -@@ -54,11 +54,11 @@ DEVICE_FEATURES_EXPORT bool IsOsLevelGeolocationPermis +@@ -58,11 +58,11 @@ DEVICE_FEATURES_EXPORT bool IsOsLevelGeolocationPermis DEVICE_FEATURES_EXPORT bool IsOsLevelGeolocationPermissionSupportEnabled(); diff --git a/devel/electron42/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/devel/electron42/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index af5891b379ef..4cd92b7f0739 100644 --- a/devel/electron42/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/devel/electron42/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2026-05-12 08:53:52 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2026-06-02 11:14:29 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -415,7 +415,7 @@ name: "AIPromptAPILegacyParams", @@ -90,7 +90,7 @@ public: true, base_feature_status: "enabled", copied_from_base_feature_if: "overridden", -@@ -5996,7 +5996,7 @@ +@@ -6004,7 +6004,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -99,7 +99,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -6093,7 +6093,7 @@ +@@ -6101,7 +6101,7 @@ status: "experimental", origin_trial_feature_name: "UserMediaElement", public: true, @@ -108,7 +108,7 @@ base_feature_status: "enabled", copied_from_base_feature_if: "overridden", }, -@@ -6204,7 +6204,7 @@ +@@ -6212,7 +6212,7 @@ name: "WebAppInstallation", status: {"Android": "", "default": "test"}, origin_trial_feature_name: "WebAppInstallation", @@ -117,7 +117,7 @@ public: true, base_feature_status: "enabled", copied_from_base_feature_if: "overridden", -@@ -6218,7 +6218,7 @@ +@@ -6226,7 +6226,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", diff --git a/devel/electron42/files/patch-ui_views_controls_textfield_textfield.cc b/devel/electron42/files/patch-ui_views_controls_textfield_textfield.cc index 70d552d4c1be..430405f6b4f3 100644 --- a/devel/electron42/files/patch-ui_views_controls_textfield_textfield.cc +++ b/devel/electron42/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2026-04-28 21:06:17 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2026-05-26 20:44:49 UTC +++ ui/views/controls/textfield/textfield.cc @@ -88,7 +88,7 @@ #include "base/win/win_util.h" @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. if (auto* linux_ui = ui::LinuxUi::instance()) { if (IsTextEditCommandEnabled(linux_ui->GetTextEditCommandForEvent( -@@ -2092,7 +2092,7 @@ bool Textfield::ShouldDoLearning() { +@@ -2100,7 +2100,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(crbug.com/41452689): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2619,7 +2619,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2627,7 +2627,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } @@ -54,7 +54,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift) { return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; -@@ -2627,7 +2627,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2635,7 +2635,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: diff --git a/devel/electron42/files/patch-ui_views_controls_textfield_textfield.h b/devel/electron42/files/patch-ui_views_controls_textfield_textfield.h index 7a75d80a39f9..b48567c45f00 100644 --- a/devel/electron42/files/patch-ui_views_controls_textfield_textfield.h +++ b/devel/electron42/files/patch-ui_views_controls_textfield_textfield.h @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.h.orig 2026-04-28 21:06:17 UTC +--- ui/views/controls/textfield/textfield.h.orig 2026-05-26 20:44:49 UTC +++ ui/views/controls/textfield/textfield.h @@ -51,7 +51,7 @@ #include "ui/views/view_observer.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -483,7 +483,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -484,7 +484,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } |
