diff --git a/devel/electron40/Makefile.version b/devel/electron40/Makefile.version index 08c499055349..4c0b3f9deb0a 100644 --- a/devel/electron40/Makefile.version +++ b/devel/electron40/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 40.10.0 +ELECTRON_VER= 40.10.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron40/distinfo b/devel/electron40/distinfo index 97451cfeafdd..8585a5b79490 100644 --- a/devel/electron40/distinfo +++ b/devel/electron40/distinfo @@ -1,29 +1,29 @@ -TIMESTAMP = 1778490992 +TIMESTAMP = 1779345033 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.0-node-modules.tar.xz) = 3e0231cb2e5bf812eacdcd28c0b9c6cdff62e499b245585d5f4ad54141c85e05 -SIZE (electron/electron40-40.10.0-node-modules.tar.xz) = 68768407 -SHA256 (electron/electron-electron-v40.10.0_GH0.tar.gz) = fa1dcd716ee3c2ad0a28d6d49d7cbff4b5ecfde7d6508163628b87e48516ef3f -SIZE (electron/electron-electron-v40.10.0_GH0.tar.gz) = 17327416 +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/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_spec_api-web-contents-spec.ts b/devel/electron40/files/patch-electron_spec_api-web-contents-spec.ts index 57234c1710f2..65bbda465c9f 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-08 13:55:13 UTC +--- electron/spec/api-web-contents-spec.ts.orig 2026-05-19 04:23:29 UTC +++ electron/spec/api-web-contents-spec.ts -@@ -1260,7 +1260,7 @@ describe('webContents module', () => { +@@ -1255,7 +1255,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 }); -@@ -3050,7 +3050,7 @@ describe('webContents module', () => { +@@ -3045,7 +3045,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(` diff --git a/devel/electron40/files/patch-electron_spec_index.js b/devel/electron40/files/patch-electron_spec_index.js new file mode 100644 index 000000000000..4489cfa70216 --- /dev/null +++ b/devel/electron40/files/patch-electron_spec_index.js @@ -0,0 +1,11 @@ +--- electron/spec/index.js.orig 2026-05-21 06:44:58 UTC ++++ electron/spec/index.js +@@ -176,7 +176,7 @@ async function killOrphanedElectronProcesses(suiteName + try { + // On Linux, skip any process that is a descendant of the current + // Electron instance (GPU, renderer, zygote, crashpad, etc.). +- if (process.platform === 'linux' && isDescendantOfCurrentProcess(pid)) continue; ++ if ((process.platform === 'linux' || process.platform === 'freebsd') && isDescendantOfCurrentProcess(pid)) continue; + process.kill(pid, 'SIGKILL'); + killed++; + } catch { diff --git a/devel/electron40/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/devel/electron40/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index ba6bb0dcdb58..4f2eeba1b346 100644 --- a/devel/electron40/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/devel/electron40/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,29 +1,29 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2026-01-07 00:52:53 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2026-05-21 06:44:31 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -51,7 +51,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif @@ -357,7 +357,7 @@ DesktopWindowTreeHostPlatform::CreateDragDropClient() DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr drag_drop_client = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::make_unique(window(), drag_handler); #else std::make_unique(window(), drag_handler); -@@ -1188,7 +1188,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1196,7 +1196,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) // static DesktopWindowTreeHost* DesktopWindowTreeHost::Create( internal::NativeWidgetDelegate* native_widget_delegate,