diff --git a/devel/electron40/Makefile.version b/devel/electron40/Makefile.version index 26397da09c4c..8179bb78d456 100644 --- a/devel/electron40/Makefile.version +++ b/devel/electron40/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 40.10.5 +ELECTRON_VER= 40.10.6 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron40/distinfo b/devel/electron40/distinfo index 9dbb882c6f74..7923eeac00c6 100644 --- a/devel/electron40/distinfo +++ b/devel/electron40/distinfo @@ -1,29 +1,29 @@ -TIMESTAMP = 1782276945 +TIMESTAMP = 1783194441 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.5-node-modules.tar.xz) = 37b35304d8c96fe56dc1ad11e4ad910d9a76e674262608b7fc014103ed281300 -SIZE (electron/electron40-40.10.5-node-modules.tar.xz) = 69034107 -SHA256 (electron/electron-electron-v40.10.5_GH0.tar.gz) = b302dd980cdda1e2425a543411d60fd8b1149950f4c0a41df425cd08c5e6d5ce -SIZE (electron/electron-electron-v40.10.5_GH0.tar.gz) = 17527824 +SHA256 (electron/electron40-40.10.6-node-modules.tar.xz) = 37b35304d8c96fe56dc1ad11e4ad910d9a76e674262608b7fc014103ed281300 +SIZE (electron/electron40-40.10.6-node-modules.tar.xz) = 69034107 +SHA256 (electron/electron-electron-v40.10.6_GH0.tar.gz) = 3ce775708e56c20754d66f0e167d24329f51bc84a2245315def26b12ee9375b2 +SIZE (electron/electron-electron-v40.10.6_GH0.tar.gz) = 17554486 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_ui_inspectable__web__contents.cc b/devel/electron40/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc index 528480b4eb22..2e8be01b7802 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-05-27 13:37:43 UTC +--- electron/shell/browser/ui/inspectable_web_contents.cc.orig 2026-06-29 20:21:48 UTC +++ electron/shell/browser/ui/inspectable_web_contents.cc -@@ -589,7 +589,7 @@ void InspectableWebContents::LoadCompleted() { +@@ -590,7 +590,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 = diff --git a/devel/electron40/files/patch-electron_spec_api-protocol-spec.ts b/devel/electron40/files/patch-electron_spec_api-protocol-spec.ts index 4395b7660ba9..b3579bdf2b8a 100644 --- a/devel/electron40/files/patch-electron_spec_api-protocol-spec.ts +++ b/devel/electron40/files/patch-electron_spec_api-protocol-spec.ts @@ -1,11 +1,11 @@ ---- electron/spec/api-protocol-spec.ts.orig 2026-05-08 13:55:13 UTC +--- electron/spec/api-protocol-spec.ts.orig 2026-06-29 20:21:48 UTC +++ electron/spec/api-protocol-spec.ts -@@ -2056,7 +2056,7 @@ describe('protocol module', () => { +@@ -2095,7 +2095,7 @@ describe('protocol module', () => { // TODO(nornagon): this test doesn't pass on Linux currently, investigate. // test is also flaky on CI on macOS so it is currently disabled there as well. - ifit(process.platform !== 'linux' && (!process.env.CI || process.platform !== 'darwin'))('is fast', async () => { + ifit((process.platform !== 'linux' && process.platform !== 'freebsd') && (!process.env.CI || process.platform !== 'darwin'))('is fast', async () => { // 128 MB of spaces. const chunk = new Uint8Array(128 * 1024 * 1024); chunk.fill(' '.charCodeAt(0)); diff --git a/devel/electron40/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/devel/electron40/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index 1b1efcef8aaf..bb6c2180210e 100644 --- a/devel/electron40/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/devel/electron40/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2026-06-24 04:59:03 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2026-07-04 19:50:28 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2854,7 +2854,7 @@ std::unique_ptr GLES2Decoder::Create( +@@ -3006,7 +3006,7 @@ std::unique_ptr GLES2Decoder::Create( } // Allow linux to run fuzzers. -#if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique(client, command_buffer_service, outputter, group); #else diff --git a/devel/electron40/files/patch-mojo_core_channel.cc b/devel/electron40/files/patch-mojo_core_channel.cc index b332b4ff13e3..b43f7296f777 100644 --- a/devel/electron40/files/patch-mojo_core_channel.cc +++ b/devel/electron40/files/patch-mojo_core_channel.cc @@ -1,32 +1,32 @@ ---- mojo/core/channel.cc.orig 2026-01-07 00:52:53 UTC +--- mojo/core/channel.cc.orig 2026-07-04 19:50:28 UTC +++ mojo/core/channel.cc @@ -81,7 +81,11 @@ const size_t kMaxAttachedHandles = 253; const size_t kMaxAttachedHandles = 253; #endif // BUILDFLAG(IS_FUCHSIA) +#if defined(__i386__) && defined(OS_FREEBSD) +const size_t kChannelMessageAlignment = 4; +#else static_assert(alignof(std::max_align_t) >= kChannelMessageAlignment, ""); +#endif Channel::AlignedBuffer MakeAlignedBuffer(size_t size) { // Generic allocators (such as malloc) return a pointer that is suitably // aligned for storing any type of object with a fundamental alignment @@ -274,7 +278,7 @@ bool ShouldRecordSubsampledHistograms() { } // namespace #if BUILDFLAG(IS_ANDROID) || \ - (BUILDFLAG(IS_LINUX) && defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)) + ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)) namespace { -@@ -1309,7 +1313,7 @@ bool Channel::OnControlMessage(Message::MessageType me +@@ -1314,7 +1318,7 @@ bool Channel::OnControlMessage(Message::MessageType me } // Currently only CrOs, Linux, and Android support upgrades. -#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)) +#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) // static MOJO_SYSTEM_IMPL_EXPORT bool Channel::SupportsChannelUpgrade() { return false; diff --git a/devel/electron40/files/patch-mojo_core_channel__posix.cc b/devel/electron40/files/patch-mojo_core_channel__posix.cc index d0084b11c3f0..c9cd5fed3709 100644 --- a/devel/electron40/files/patch-mojo_core_channel__posix.cc +++ b/devel/electron40/files/patch-mojo_core_channel__posix.cc @@ -1,16 +1,16 @@ ---- mojo/core/channel_posix.cc.orig 2026-01-07 00:52:53 UTC +--- mojo/core/channel_posix.cc.orig 2026-07-04 19:50:28 UTC +++ mojo/core/channel_posix.cc -@@ -594,6 +594,13 @@ void Channel::OfferChannelUpgrade() { +@@ -601,6 +601,13 @@ void Channel::OfferChannelUpgrade() { } static_cast(this)->OfferSharedMemUpgrade(); } +#elif BUILDFLAG(IS_BSD) +// static +bool Channel::SupportsChannelUpgrade() { + return false; +} +void Channel::OfferChannelUpgrade() { +} #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID)