diff --git a/devel/electron34/Makefile.version b/devel/electron34/Makefile.version index 6de832240e36..007fa28f230d 100644 --- a/devel/electron34/Makefile.version +++ b/devel/electron34/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 34.3.2 +ELECTRON_VER= 34.3.3 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron34/distinfo b/devel/electron34/distinfo index 92837c171ba5..fb027d8fa2c4 100644 --- a/devel/electron34/distinfo +++ b/devel/electron34/distinfo @@ -1,25 +1,25 @@ -TIMESTAMP = 1741694502 +TIMESTAMP = 1742307254 SHA256 (electron/chromium-132.0.6834.210.tar.xz.0) = ede58a1501f175aaa6c92e47793b773ed10b31a43d600375cb40727c4ae677d5 SIZE (electron/chromium-132.0.6834.210.tar.xz.0) = 2000000000 SHA256 (electron/chromium-132.0.6834.210.tar.xz.1) = 6d080b3948ef1d63d08b8cc1390662a439e635b881561434787b8b67ea99b08d SIZE (electron/chromium-132.0.6834.210.tar.xz.1) = 2000000000 SHA256 (electron/chromium-132.0.6834.210.tar.xz.2) = 989e234492cf50454303ec6f490f9e20002aa16cd69915a3c09b6e06f668be82 SIZE (electron/chromium-132.0.6834.210.tar.xz.2) = 484148560 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-34.3.2.tar.xz) = f0fa33e22a0b00e5440fbc57517f7b303d43ca07c25e43f35e28f97c2ce12c83 -SIZE (electron/electron-yarn-cache-34.3.2.tar.xz) = 29062184 -SHA256 (electron/electron-electron-v34.3.2_GH0.tar.gz) = 2376ccfadd700973e62f4c7e3ef58d5e1613102aaf058e7812294e9e87c44685 -SIZE (electron/electron-electron-v34.3.2_GH0.tar.gz) = 14826088 +SHA256 (electron/electron-yarn-cache-34.3.3.tar.xz) = f0fa33e22a0b00e5440fbc57517f7b303d43ca07c25e43f35e28f97c2ce12c83 +SIZE (electron/electron-yarn-cache-34.3.3.tar.xz) = 29062184 +SHA256 (electron/electron-electron-v34.3.3_GH0.tar.gz) = 53c5405a35ab766d854cd41097ccd2ef49cf83a860a20acda54377fd8a8863e6 +SIZE (electron/electron-electron-v34.3.3_GH0.tar.gz) = 14830322 SHA256 (electron/nodejs-node-v20.18.3_GH0.tar.gz) = a2049a1607fbc5b9ec4336d9d04faeeb9b8efdc9ec853e8ddf7cf419be9dbb3d SIZE (electron/nodejs-node-v20.18.3_GH0.tar.gz) = 115601859 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/electron34/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron34/files/patch-electron_shell_browser_electron__browser__main__parts.cc index e354fea459ce..5f614fb15d4c 100644 --- a/devel/electron34/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron34/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,84 +1,84 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2025-03-10 00:01:50 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2025-03-12 08:26:33 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -76,7 +76,7 @@ #include "ui/wm/core/wm_state.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/environment.h" #include "chrome/browser/ui/views/dark_mode_manager_linux.h" #include "device/bluetooth/bluetooth_adapter_factory.h" @@ -129,7 +129,7 @@ namespace { namespace { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) class LinuxUiGetterImpl : public ui::LinuxUiGetter { public: LinuxUiGetterImpl() = default; @@ -209,7 +209,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() #if BUILDFLAG(IS_POSIX) HandleSIGCHLD(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) DetectOzonePlatform(); ui::OzonePlatform::PreEarlyInitialization(); #endif @@ -300,7 +300,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { // happen before the ResourceBundle is loaded if (locale.empty()) l10n_util::OverrideLocaleWithCocoaLocale(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // l10n_util::GetApplicationLocaleInternal uses g_get_language_names(), // which keys off of getenv("LC_ALL"). // We must set this env first to make ui::ResourceBundle accept the custom @@ -331,7 +331,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { ElectronBrowserClient::SetApplicationLocale(app_locale); fake_browser_process_->SetApplicationLocale(app_locale); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Reset to the original LC_ALL since we should not be changing it. if (!locale.empty()) { if (lc_all) -@@ -391,7 +391,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() { +@@ -388,7 +388,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() { } void ElectronBrowserMainParts::ToolkitInitialized() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* linux_ui = ui::GetDefaultLinuxUi(); CHECK(linux_ui); linux_ui_getter_ = std::make_unique(); -@@ -497,7 +497,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -494,7 +494,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo } void ElectronBrowserMainParts::PostCreateMainMessageLoop() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) std::string app_name = electron::Browser::Get()->GetName(); #endif #if BUILDFLAG(IS_LINUX) -@@ -509,7 +509,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -506,7 +506,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo if (!bluez::BluezDBusManager::IsInitialized()) bluez::DBusBluezManagerWrapperLinux::Initialize(); +#endif +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Set up crypt config. This needs to be done before anything starts the // network service, as the raw encryption key needs to be shared with the // network service for encrypted cookie storage. -@@ -610,7 +612,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -607,7 +609,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun(); #endif } diff --git a/devel/electron34/files/patch-electron_spec_api-process-spec.ts b/devel/electron34/files/patch-electron_spec_api-process-spec.ts index f507f90185b8..5f3e1bff2b35 100644 --- a/devel/electron34/files/patch-electron_spec_api-process-spec.ts +++ b/devel/electron34/files/patch-electron_spec_api-process-spec.ts @@ -1,20 +1,11 @@ ---- electron/spec/api-process-spec.ts.orig 2024-10-09 13:53:06 UTC +--- electron/spec/api-process-spec.ts.orig 2025-03-12 08:26:33 UTC +++ electron/spec/api-process-spec.ts -@@ -46,7 +46,7 @@ describe('process module', () => { +@@ -39,7 +39,7 @@ describe('process module', () => { it('resolves promise successfully with valid data', async () => { - const memoryInfo = await w.webContents.executeJavaScript('process.getProcessMemoryInfo()'); - expect(memoryInfo).to.be.an('object'); -- if (process.platform === 'linux' || process.platform === 'win32') { -+ if (process.platform === 'linux' || process.platform === 'win32' || process.platform === 'freebsd') { - expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0); - } - expect(memoryInfo.private).to.be.a('number').greaterThan(0); -@@ -145,7 +145,7 @@ describe('process module', () => { - it('resolves promise successfully with valid data', async () => { - const memoryInfo = await process.getProcessMemoryInfo(); + const memoryInfo = await invoke(() => process.getProcessMemoryInfo()); expect(memoryInfo).to.be.an('object'); - if (process.platform === 'linux' || process.platform === 'win32') { + if (process.platform === 'linux' || process.platform === 'win32' || process.platform === 'freebsd') { expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0); } expect(memoryInfo.private).to.be.a('number').greaterThan(0); diff --git a/devel/electron34/files/patch-electron_spec_api-utility-process-spec.ts b/devel/electron34/files/patch-electron_spec_api-utility-process-spec.ts index 3a6b1e7f2b0f..71141f6b8eda 100644 --- a/devel/electron34/files/patch-electron_spec_api-utility-process-spec.ts +++ b/devel/electron34/files/patch-electron_spec_api-utility-process-spec.ts @@ -1,20 +1,20 @@ ---- electron/spec/api-utility-process-spec.ts.orig 2025-03-10 00:01:50 UTC +--- electron/spec/api-utility-process-spec.ts.orig 2025-03-12 08:26:33 UTC +++ electron/spec/api-utility-process-spec.ts -@@ -455,7 +455,7 @@ describe('utilityProcess module', () => { +@@ -452,7 +452,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'); -@@ -492,7 +492,7 @@ describe('utilityProcess module', () => { +@@ -489,7 +489,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');