diff --git a/devel/electron40/Makefile.version b/devel/electron40/Makefile.version index 4c0b3f9deb0a..039d6be723ad 100644 --- a/devel/electron40/Makefile.version +++ b/devel/electron40/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 40.10.1 +ELECTRON_VER= 40.10.2 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron40/distinfo b/devel/electron40/distinfo index 8585a5b79490..984e74021396 100644 --- a/devel/electron40/distinfo +++ b/devel/electron40/distinfo @@ -1,29 +1,29 @@ -TIMESTAMP = 1779345033 +TIMESTAMP = 1779958798 SHA256 (electron/chromium-144.0.7559.236.tar.xz.0) = 21556e44d5f5e464a7603afc1e912127c4546d3c55d777055614b769247d2714 SIZE (electron/chromium-144.0.7559.236.tar.xz.0) = 2000000000 SHA256 (electron/chromium-144.0.7559.236.tar.xz.1) = 389e96ab80e7f3ea7a330060c51ed714f2277810b13bbd1d72bb9e6119dce3a2 SIZE (electron/chromium-144.0.7559.236.tar.xz.1) = 2000000000 SHA256 (electron/chromium-144.0.7559.236.tar.xz.2) = 3783608e8c802c5660a7c2ea12d9e16ae6f534eb739c155c0de4b42eca358c3e SIZE (electron/chromium-144.0.7559.236.tar.xz.2) = 309499476 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 SHA256 (electron/yarn-4.12.0.tgz) = bd58d06826ce9542c4cd904fe10bab7bc718ea2cc39a45d9fbd15f2edb45761c SIZE (electron/yarn-4.12.0.tgz) = 1056794 -SHA256 (electron/electron40-40.10.1-node-modules.tar.xz) = 3e0231cb2e5bf812eacdcd28c0b9c6cdff62e499b245585d5f4ad54141c85e05 -SIZE (electron/electron40-40.10.1-node-modules.tar.xz) = 68768407 -SHA256 (electron/electron-electron-v40.10.1_GH0.tar.gz) = 5b13c9de6aab2c74915a2c128e656fd4a31d148199748fd2583c837081935ff9 -SIZE (electron/electron-electron-v40.10.1_GH0.tar.gz) = 17396226 +SHA256 (electron/electron40-40.10.2-node-modules.tar.xz) = 3e0231cb2e5bf812eacdcd28c0b9c6cdff62e499b245585d5f4ad54141c85e05 +SIZE (electron/electron40-40.10.2-node-modules.tar.xz) = 68768407 +SHA256 (electron/electron-electron-v40.10.2_GH0.tar.gz) = 5fc0b9f12e37aa5d08a94a189624ee6331fd99071865b5e32f94f3f189bb441c +SIZE (electron/electron-electron-v40.10.2_GH0.tar.gz) = 17397951 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 SIZE (electron/nodejs-nan-675cefebca42410733da8a454c8d9391fcebfbc2_GH0.tar.gz) = 111323 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01 SIZE (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = 2112918 SHA256 (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 88e65f116c7a06fccedb43970fba63080a57a4e5dc29147d2cdfe1ee58dd0546 SIZE (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 1136238 SHA256 (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = a365df6d83e0be3cc000b70bd39734d80c28f0d9983ebe44698337a2ca464bb1 SIZE (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = 62962 SHA256 (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = c148f76220fc41a89ffeaf370c2cc175577be184688b12aa6fec5f8ac6c714c4 SIZE (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = 13014 SHA256 (electron/evanw-esbuild-v0.28.0_GH0.tar.gz) = 7aae83b197db3fd695e6f378d30fd6cbddeb93e4b1057b2c41d36ecb1dfebbc2 SIZE (electron/evanw-esbuild-v0.28.0_GH0.tar.gz) = 1993306 diff --git a/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 2ffd5e368e7f..119f8a7faef6 100644 --- a/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,77 +1,77 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2026-04-21 14:16:24 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2026-05-27 13:37:43 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -162,11 +162,11 @@ #include "ui/base/cocoa/defaults_utils.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/linux/linux_ui.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "ui/aura/window.h" #include "ui/gfx/font_render_params.h" #endif @@ -198,7 +198,7 @@ #include "content/public/browser/plugin_service.h" #endif -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) #include "chrome/browser/hang_monitor/hang_crash_dump.h" // nogncheck #endif @@ -572,7 +572,7 @@ std::optional GetCursorBlinkInterval( ui::TextInsertionCaretBlinkPeriodFromDefaults()); if (system_value) return *system_value; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (auto* native_theme = ui::NativeTheme::GetInstanceForNativeUi()) return native_theme->caret_blink_interval(); #elif BUILDFLAG(IS_WIN) @@ -944,7 +944,7 @@ void WebContents::InitWithSessionAndOptions( accept_languages.pop_back(); prefs->accept_languages = accept_languages; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2766,13 +2766,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2772,13 +2772,13 @@ void WebContents::ForcefullyCrashRenderer() { content::RenderProcessHost* rph = rwh->GetProcess(); if (rph) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. // Instead we send an explicit IPC to crash on the renderer's IO thread. rph->ForceCrash(); #else // Try to generate a crash report for the hung process. -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) CrashDumpHungChildProcess(rph->GetProcess().Handle()); #endif rph->Shutdown(content::RESULT_CODE_HUNG); -@@ -3454,7 +3454,7 @@ void WebContents::Focus() { +@@ -3460,7 +3460,7 @@ void WebContents::Focus() { void WebContents::Focus() { // Focusing on WebContents does not automatically focus the window on macOS // and Linux, do it manually to match the behavior on Windows. -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (owner_window()) owner_window()->Focus(true); #endif -@@ -4350,7 +4350,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4356,7 +4356,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void WebContents::GetDevToolsWindowWMClass(std::string* name, std::string* class_name) { *class_name = Browser::Get()->GetName(); diff --git a/devel/electron40/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc b/devel/electron40/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc index ae203e0b43f3..528480b4eb22 100644 --- a/devel/electron40/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc +++ b/devel/electron40/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc @@ -1,11 +1,11 @@ ---- electron/shell/browser/ui/inspectable_web_contents.cc.orig 2026-04-21 14:16:24 UTC +--- electron/shell/browser/ui/inspectable_web_contents.cc.orig 2026-05-27 13:37:43 UTC +++ electron/shell/browser/ui/inspectable_web_contents.cc -@@ -572,7 +572,7 @@ void InspectableWebContents::LoadCompleted() { - dock_state_ = "right"; +@@ -589,7 +589,7 @@ void InspectableWebContents::LoadCompleted() { + dock_state_ = "right"; + } } - } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* api_web_contents = api::WebContents::From(GetWebContents()); - if (api_web_contents) { - auto* win = + auto* api_web_contents = api::WebContents::From(GetWebContents()); + if (api_web_contents) { + auto* win = diff --git a/devel/electron40/files/patch-electron_spec_api-web-contents-spec.ts b/devel/electron40/files/patch-electron_spec_api-web-contents-spec.ts index 65bbda465c9f..f9838dd2c341 100644 --- a/devel/electron40/files/patch-electron_spec_api-web-contents-spec.ts +++ b/devel/electron40/files/patch-electron_spec_api-web-contents-spec.ts @@ -1,20 +1,20 @@ ---- electron/spec/api-web-contents-spec.ts.orig 2026-05-19 04:23:29 UTC +--- electron/spec/api-web-contents-spec.ts.orig 2026-05-27 13:37:43 UTC +++ electron/spec/api-web-contents-spec.ts -@@ -1255,7 +1255,7 @@ describe('webContents module', () => { +@@ -1271,7 +1271,7 @@ describe('webContents module', () => { // back to OpenFolder() which does a blocking DirectoryExists() on the UI // thread (pre-existing behavior). Workspace-gating is covered by the test // above. - ifit(process.platform !== 'linux')( + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')( 'reveals paths under a registered workspace folder without executing them', async () => { const w = new BrowserWindow({ show: false }); -@@ -3045,7 +3045,7 @@ describe('webContents module', () => { +@@ -3061,7 +3061,7 @@ describe('webContents module', () => { }); // TODO(codebytere): OOPIF printing is disabled on Linux at the moment due to crashes. - ifit(process.platform !== 'linux')('can print cross-origin iframes', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('can print cross-origin iframes', async () => { server = http.createServer((_, res) => { res.writeHead(200); res.end(`