diff --git a/devel/electron31/Makefile.version b/devel/electron31/Makefile.version index eb712f1d2bbf..a375cbc91bf9 100644 --- a/devel/electron31/Makefile.version +++ b/devel/electron31/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 31.7.0 +ELECTRON_VER= 31.7.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron31/distinfo b/devel/electron31/distinfo index ffdacc7f71f8..56e8534c6f0e 100644 --- a/devel/electron31/distinfo +++ b/devel/electron31/distinfo @@ -1,25 +1,25 @@ -TIMESTAMP = 1728765622 +TIMESTAMP = 1729238331 SHA256 (electron/chromium-126.0.6478.234.tar.xz.0) = 5940007a2cc926c0eac498ab5121727f903a60b87c7b5a5216921c4ee1028d07 SIZE (electron/chromium-126.0.6478.234.tar.xz.0) = 2000000000 SHA256 (electron/chromium-126.0.6478.234.tar.xz.1) = 977c9af967876a9a362038dea652c4be55a71a9758cb1c538bfc8a5a0ee27962 SIZE (electron/chromium-126.0.6478.234.tar.xz.1) = 303263696 SHA256 (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = dcfaea4d353d1df3d4ac2d245ea7e32ad177d4bea1351f363714c9c22ca5c4f8 SIZE (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = 9761601 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-31.7.0.tar.xz) = 8eaf83154d3d57c59a3faed240d8e60c23bc2eeb8e4758ce82ec4437aed7ea2f -SIZE (electron/electron-yarn-cache-31.7.0.tar.xz) = 30506748 -SHA256 (electron/electron-electron-v31.7.0_GH0.tar.gz) = 0ddf9ba380b0e17bcbea41f024e5344a9c46c132e428d9e1aa188cf1ffd2f047 -SIZE (electron/electron-electron-v31.7.0_GH0.tar.gz) = 13858254 +SHA256 (electron/electron-yarn-cache-31.7.1.tar.xz) = 8eaf83154d3d57c59a3faed240d8e60c23bc2eeb8e4758ce82ec4437aed7ea2f +SIZE (electron/electron-yarn-cache-31.7.1.tar.xz) = 30506748 +SHA256 (electron/electron-electron-v31.7.1_GH0.tar.gz) = 4ed849ac60ad5f5e50e3a3ca1d26944b777b9bdfc6ef601aeeec6df43d92c46e +SIZE (electron/electron-electron-v31.7.1_GH0.tar.gz) = 13866295 SHA256 (electron/nodejs-node-v20.18.0_GH0.tar.gz) = 651bb82f6af18084070893559643759165ce050b5839f830d4cc098130d3ad89 SIZE (electron/nodejs-node-v20.18.0_GH0.tar.gz) = 115526827 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646 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 diff --git a/devel/electron31/files/patch-electron_shell_browser_electron__browser__main__parts__posix.cc b/devel/electron31/files/patch-electron_shell_browser_electron__browser__main__parts__posix.cc index 37f52e6f9b94..48379aa498ec 100644 --- a/devel/electron31/files/patch-electron_shell_browser_electron__browser__main__parts__posix.cc +++ b/devel/electron31/files/patch-electron_shell_browser_electron__browser__main__parts__posix.cc @@ -1,19 +1,19 @@ ---- electron/shell/browser/electron_browser_main_parts_posix.cc.orig 2022-08-03 15:31:32 UTC +--- electron/shell/browser/electron_browser_main_parts_posix.cc.orig 2024-10-16 13:04:26 UTC +++ electron/shell/browser/electron_browser_main_parts_posix.cc -@@ -198,12 +198,16 @@ void ElectronBrowserMainParts::InstallShutdownSignalHa +@@ -209,12 +209,16 @@ void ElectronBrowserMainParts::InstallShutdownSignalHa g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; +#if defined(OS_BSD) + const size_t kShutdownDetectorThreadStackSize = 0; +#else #if !defined(ADDRESS_SANITIZER) const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; #else // ASan instrumentation bloats the stack frames, so we need to increase the // stack size to avoid hitting the guard page. const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; +#endif #endif ShutdownDetector* detector = new ShutdownDetector( g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner); diff --git a/devel/electron31/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc b/devel/electron31/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc index 9da2f0fe3de1..a0623cc055bc 100644 --- a/devel/electron31/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc +++ b/devel/electron31/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc @@ -1,11 +1,11 @@ ---- electron/shell/browser/ui/inspectable_web_contents.cc.orig 2024-10-09 13:53:12 UTC +--- electron/shell/browser/ui/inspectable_web_contents.cc.orig 2024-10-16 13:04:26 UTC +++ electron/shell/browser/ui/inspectable_web_contents.cc -@@ -558,7 +558,7 @@ void InspectableWebContents::LoadCompleted() { +@@ -556,7 +556,7 @@ void InspectableWebContents::LoadCompleted() { prefs.FindString("currentDockState"); base::RemoveChars(*current_dock_state, "\"", &dock_state_); } -#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/electron31/files/patch-electron_spec_api-utility-process-spec.ts b/devel/electron31/files/patch-electron_spec_api-utility-process-spec.ts index 9e881e0ff9df..957299e29bbc 100644 --- a/devel/electron31/files/patch-electron_spec_api-utility-process-spec.ts +++ b/devel/electron31/files/patch-electron_spec_api-utility-process-spec.ts @@ -1,20 +1,20 @@ ---- electron/spec/api-utility-process-spec.ts.orig 2024-10-09 13:53:12 UTC +--- electron/spec/api-utility-process-spec.ts.orig 2024-10-16 13:04:26 UTC +++ electron/spec/api-utility-process-spec.ts -@@ -408,7 +408,7 @@ describe('utilityProcess module', () => { +@@ -418,7 +418,7 @@ describe('utilityProcess module', () => { expect(output).to.include(result); }); - ifit(process.platform !== 'linux')('can access exposed main process modules from the utility process', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('can access exposed main process modules from the utility process', async () => { const message = 'Message from utility process'; const child = utilityProcess.fork(path.join(fixturesPath, 'expose-main-process-module.js')); await once(child, 'spawn'); -@@ -445,7 +445,7 @@ describe('utilityProcess module', () => { +@@ -455,7 +455,7 @@ describe('utilityProcess module', () => { await closeWindow(w); }); - ifit(process.platform === 'linux')('allows executing a setuid binary with child_process', async () => { + ifit(process.platform === 'linux' || process.platform === 'freebsd')('allows executing a setuid binary with child_process', async () => { const child = utilityProcess.fork(path.join(fixturesPath, 'suid.js')); await once(child, 'spawn'); const [data] = await once(child, 'message');