git: 4dd49838bdec - 2025Q1 - devel/electron33: update to 33.4.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Mar 2025 09:44:30 UTC
The branch 2025Q1 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=4dd49838bdecb169945afa1813be8330246badb6 commit 4dd49838bdecb169945afa1813be8330246badb6 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2025-03-10 09:37:37 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2025-03-10 09:44:22 +0000 devel/electron33: update to 33.4.3 Changelog: - https://github.com/electron/electron/releases/tag/v33.4.1 - https://github.com/electron/electron/releases/tag/v33.4.2 - https://github.com/electron/electron/releases/tag/v33.4.3 Reported by: GitHub (watch releases) MFH: 2025Q1 Security: f4f3e001-402b-4d6d-8efa-ab11fcf8de2b Security: 6ba9e26e-c9c6-49f7-ae43-47e5864f0b66 (cherry picked from commit 45204c90a5b707dc96a1c178d593f82cec96b2bc) --- devel/electron33/Makefile | 2 +- devel/electron33/Makefile.version | 2 +- devel/electron33/distinfo | 14 ++++++------ .../files/patch-electron_script_spec-runner.js | 4 ++-- ...ell_browser_api_electron__api__web__contents.cc | 12 +++++----- ...hell_browser_api_electron__api__web__contents.h | 4 ++-- ...shell_browser_electron__browser__main__parts.cc | 14 ++++++------ ...ectron_shell_browser_javascript__environment.cc | 11 +++++++++ ...electron_shell_browser_native__window__views.cc | 26 +++++++++++----------- ...electron_shell_common_api_electron__bindings.cc | 4 ++-- .../patch-electron_spec_api-browser-window-spec.ts | 4 ++-- ...patch-electron_spec_api-utility-process-spec.ts | 6 ++--- ...third__party_electron__node_deps_cares_BUILD.gn | 4 ++-- .../files/patch-third__party_lzma__sdk_C_CpuArch.c | 15 ++++--------- 14 files changed, 63 insertions(+), 59 deletions(-) diff --git a/devel/electron33/Makefile b/devel/electron33/Makefile index 69ff2ccd6ce8..797675f7badc 100644 --- a/devel/electron33/Makefile +++ b/devel/electron33/Makefile @@ -222,7 +222,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER CHROMIUM_VER= 130.0.6723.191 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 20.18.1 +NODE_VER= 20.18.3 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER diff --git a/devel/electron33/Makefile.version b/devel/electron33/Makefile.version index a82073ea05cb..98f1871aea2c 100644 --- a/devel/electron33/Makefile.version +++ b/devel/electron33/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 33.4.0 +ELECTRON_VER= 33.4.3 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron33/distinfo b/devel/electron33/distinfo index 0281e8dd80f1..9d6222829a16 100644 --- a/devel/electron33/distinfo +++ b/devel/electron33/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1738909368 +TIMESTAMP = 1741441766 SHA256 (electron/chromium-130.0.6723.191.tar.xz.0) = 5d75efea5a8e43b99e7fd86e20835218a2b80115e55f261e31d7c3723ebe067a SIZE (electron/chromium-130.0.6723.191.tar.xz.0) = 2000000000 SHA256 (electron/chromium-130.0.6723.191.tar.xz.1) = adf26a3c24a77e0eb119ddb3932c0ee4f9127a1b7e63c7881047d482742d716a @@ -7,12 +7,12 @@ SHA256 (electron/chromium-130.0.6723.191.tar.xz.2) = 16a8c26a52ed95dae9a5a0d6960 SIZE (electron/chromium-130.0.6723.191.tar.xz.2) = 417583932 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-33.4.0.tar.xz) = fbfce89a9781eba6a8dc2582fcc979f2cb4adbd95c42a09f595c7dfa45a47fdf -SIZE (electron/electron-yarn-cache-33.4.0.tar.xz) = 32181868 -SHA256 (electron/electron-electron-v33.4.0_GH0.tar.gz) = 4e3aa5a1e31961c62f2b97c105e0a4ef1f3aeceec1f158dd35f3a04557b8dcf3 -SIZE (electron/electron-electron-v33.4.0_GH0.tar.gz) = 14706722 -SHA256 (electron/nodejs-node-v20.18.1_GH0.tar.gz) = e52a6d719db786fffdc7ac3dc623023803336d8ce7a1dd61d9f68bd851d2a921 -SIZE (electron/nodejs-node-v20.18.1_GH0.tar.gz) = 115585611 +SHA256 (electron/electron-yarn-cache-33.4.3.tar.xz) = fbfce89a9781eba6a8dc2582fcc979f2cb4adbd95c42a09f595c7dfa45a47fdf +SIZE (electron/electron-yarn-cache-33.4.3.tar.xz) = 32181868 +SHA256 (electron/electron-electron-v33.4.3_GH0.tar.gz) = 66fecb1b4420e7ade252027e44a32fdf0fe7267b91707b293b4fe991e2482c8a +SIZE (electron/electron-electron-v33.4.3_GH0.tar.gz) = 14847331 +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 diff --git a/devel/electron33/files/patch-electron_script_spec-runner.js b/devel/electron33/files/patch-electron_script_spec-runner.js index d96c16be320f..6576a68e4d55 100644 --- a/devel/electron33/files/patch-electron_script_spec-runner.js +++ b/devel/electron33/files/patch-electron_script_spec-runner.js @@ -1,6 +1,6 @@ ---- electron/script/spec-runner.js.orig 2025-01-22 18:19:12 UTC +--- electron/script/spec-runner.js.orig 2025-02-26 12:19:50 UTC +++ electron/script/spec-runner.js -@@ -197,7 +197,7 @@ async function runTestUsingElectron (specDir, testName +@@ -200,7 +200,7 @@ async function runTestUsingElectron (specDir, testName exe = path.resolve(BASE, utils.getElectronExec()); } const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)]; diff --git a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 918aa6f62a78..f923bb97e8dc 100644 --- a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2024-11-27 04:18:00 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-02-26 12:19:50 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -155,11 +155,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -23,7 +23,7 @@ #include "chrome/browser/hang_monitor/hang_crash_dump.h" // nogncheck #endif -@@ -515,7 +515,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval( +@@ -518,7 +518,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval( ui::TextInsertionCaretBlinkPeriodFromDefaults()); if (system_value) return *system_value; @@ -32,7 +32,7 @@ if (auto* linux_ui = ui::LinuxUi::instance()) return linux_ui->GetCursorBlinkInterval(); #elif BUILDFLAG(IS_WIN) -@@ -885,7 +885,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -888,7 +888,7 @@ void WebContents::InitWithSessionAndOptions( accept_languages.pop_back(); prefs->accept_languages = accept_languages; @@ -41,7 +41,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2667,13 +2667,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2678,13 +2678,13 @@ void WebContents::ForcefullyCrashRenderer() { content::RenderProcessHost* rph = rwh->GetProcess(); if (rph) { @@ -57,7 +57,7 @@ CrashDumpHungChildProcess(rph->GetProcess().Handle()); #endif rph->Shutdown(content::RESULT_CODE_HUNG); -@@ -3346,7 +3346,7 @@ void WebContents::Focus() { +@@ -3357,7 +3357,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. @@ -66,7 +66,7 @@ if (owner_window()) owner_window()->Focus(true); #endif -@@ -4222,7 +4222,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4233,7 +4233,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.h index ac277a65d9cd..d199bbc849f4 100644 --- a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-02-05 15:28:01 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-02-26 12:19:50 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -772,7 +772,7 @@ class WebContents final : public ExclusiveAccessContex +@@ -770,7 +770,7 @@ class WebContents final : public ExclusiveAccessContex #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC) ui::ImageModel GetDevToolsWindowIcon() override; #endif diff --git a/devel/electron33/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron33/files/patch-electron_shell_browser_electron__browser__main__parts.cc index 3fa5da967b43..e56067566439 100644 --- a/devel/electron33/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron33/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2024-10-22 02:29:46 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2025-02-26 12:19:50 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -76,7 +76,7 @@ #include "ui/wm/core/wm_state.h" @@ -27,7 +27,7 @@ DetectOzonePlatform(); ui::OzonePlatform::PreEarlyInitialization(); #endif -@@ -299,7 +299,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -300,7 +300,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { // happen before the ResourceBundle is loaded if (locale.empty()) l10n_util::OverrideLocaleWithCocoaLocale(); @@ -36,7 +36,7 @@ // 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 -@@ -330,7 +330,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -331,7 +331,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { ElectronBrowserClient::SetApplicationLocale(app_locale); fake_browser_process_->SetApplicationLocale(app_locale); @@ -45,7 +45,7 @@ // Reset to the original LC_ALL since we should not be changing it. if (!locale.empty()) { if (lc_all) -@@ -390,7 +390,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() { +@@ -391,7 +391,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() { } void ElectronBrowserMainParts::ToolkitInitialized() { @@ -54,7 +54,7 @@ auto* linux_ui = ui::GetDefaultLinuxUi(); CHECK(linux_ui); linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>(); -@@ -496,7 +496,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -497,7 +497,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo } void ElectronBrowserMainParts::PostCreateMainMessageLoop() { @@ -63,7 +63,7 @@ std::string app_name = electron::Browser::Get()->GetName(); #endif #if BUILDFLAG(IS_LINUX) -@@ -508,7 +508,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -509,7 +509,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo if (!bluez::BluezDBusManager::IsInitialized()) bluez::DBusBluezManagerWrapperLinux::Initialize(); @@ -73,7 +73,7 @@ // 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. -@@ -609,7 +611,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -610,7 +612,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron33/files/patch-electron_shell_browser_javascript__environment.cc b/devel/electron33/files/patch-electron_shell_browser_javascript__environment.cc new file mode 100644 index 000000000000..5d54f349d6d9 --- /dev/null +++ b/devel/electron33/files/patch-electron_shell_browser_javascript__environment.cc @@ -0,0 +1,11 @@ +--- electron/shell/browser/javascript_environment.cc.orig 2025-03-05 11:51:09 UTC ++++ electron/shell/browser/javascript_environment.cc +@@ -93,7 +93,7 @@ v8::Isolate* JavascriptEnvironment::Initialize(uv_loop + auto* cmd = base::CommandLine::ForCurrentProcess(); + // --js-flags. + std::string js_flags = "--no-freeze-flags-after-init "; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // See https://issues.chromium.org/issues/378017037 - fixed in M134. + js_flags.append("--nodecommit_pooled_pages "); + #endif diff --git a/devel/electron33/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron33/files/patch-electron_shell_browser_native__window__views.cc index 41003d1a94f6..498e1cc31c78 100644 --- a/devel/electron33/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron33/files/patch-electron_shell_browser_native__window__views.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2024-11-27 04:18:00 UTC +--- electron/shell/browser/native_window_views.cc.orig 2025-02-26 12:19:50 UTC +++ electron/shell/browser/native_window_views.cc @@ -49,7 +49,7 @@ #include "ui/wm/core/shadow_types.h" @@ -90,7 +90,7 @@ void NativeWindowViews::Maximize() { if (IsVisible()) { widget()->Maximize(); -@@ -781,7 +781,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -790,7 +790,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou } #endif @@ -99,7 +99,7 @@ // On Linux and Windows the minimum and maximum size should be updated with // window size when window is not resizable. if (!resizable_) { -@@ -1039,7 +1039,7 @@ bool NativeWindowViews::IsClosable() const { +@@ -1048,7 +1048,7 @@ bool NativeWindowViews::IsClosable() const { return false; } return !(info.fState & MFS_DISABLED); @@ -108,7 +108,7 @@ return true; #endif } -@@ -1079,7 +1079,7 @@ void NativeWindowViews::Center() { +@@ -1088,7 +1088,7 @@ void NativeWindowViews::Center() { // for now to avoid breaking API contract, but should consider the long // term plan for this aligning with upstream. void NativeWindowViews::Center() { @@ -117,7 +117,7 @@ auto display = display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeWindow()); gfx::Rect window_bounds_in_screen = display.work_area(); -@@ -1302,7 +1302,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men +@@ -1311,7 +1311,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men } void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) { @@ -126,7 +126,7 @@ // Remove global menu bar. if (global_menu_bar_ && menu_model == nullptr) { global_menu_bar_.reset(); -@@ -1357,7 +1357,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* +@@ -1366,7 +1366,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* void NativeWindowViews::SetParentWindow(NativeWindow* parent) { NativeWindow::SetParentWindow(parent); @@ -135,7 +135,7 @@ if (IsX11()) { auto* connection = x11::Connection::Get(); connection->SetProperty( -@@ -1403,7 +1403,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1412,7 +1412,7 @@ void NativeWindowViews::SetProgressBar(double progress NativeWindow::ProgressState state) { #if BUILDFLAG(IS_WIN) taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state); @@ -144,7 +144,7 @@ if (unity::IsRunning()) { unity::SetProgressFraction(progress); } -@@ -1474,7 +1474,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con +@@ -1483,7 +1483,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con } bool NativeWindowViews::IsVisibleOnAllWorkspaces() const { @@ -153,7 +153,7 @@ if (IsX11()) { // Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to // determine whether the current window is visible on all workspaces. -@@ -1497,7 +1497,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1506,7 +1506,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM #if BUILDFLAG(IS_WIN) window_handle = reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget); @@ -162,7 +162,7 @@ window_handle = static_cast<uint32_t>(accelerated_widget); #endif aura::WindowTreeHost* const host = -@@ -1595,7 +1595,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1604,7 +1604,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC SendMessage(hwnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(app_icon_.get())); } @@ -171,7 +171,7 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget( GetAcceleratedWidget()); -@@ -1691,7 +1691,7 @@ bool NativeWindowViews::CanMinimize() const { +@@ -1700,7 +1700,7 @@ bool NativeWindowViews::CanMinimize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -180,7 +180,7 @@ return true; #endif } -@@ -1747,7 +1747,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1756,7 +1756,7 @@ void NativeWindowViews::HandleKeyboardEvent( if (widget_destroyed_) return; @@ -189,7 +189,7 @@ if (event.windows_key_code == ui::VKEY_BROWSER_BACK) NotifyWindowExecuteAppCommand(kBrowserBackward); else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD) -@@ -1766,7 +1766,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1775,7 +1775,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron33/files/patch-electron_shell_common_api_electron__bindings.cc b/devel/electron33/files/patch-electron_shell_common_api_electron__bindings.cc index 40748364fcd4..1c8d9e37600b 100644 --- a/devel/electron33/files/patch-electron_shell_common_api_electron__bindings.cc +++ b/devel/electron33/files/patch-electron_shell_common_api_electron__bindings.cc @@ -1,6 +1,6 @@ ---- electron/shell/common/api/electron_bindings.cc.orig 2024-10-22 02:29:46 UTC +--- electron/shell/common/api/electron_bindings.cc.orig 2025-02-26 12:19:50 UTC +++ electron/shell/common/api/electron_bindings.cc -@@ -254,7 +254,7 @@ void ElectronBindings::DidReceiveMemoryDump( +@@ -253,7 +253,7 @@ void ElectronBindings::DidReceiveMemoryDump( if (target_pid == dump.pid()) { auto dict = gin_helper::Dictionary::CreateEmpty(isolate); const auto& osdump = dump.os_dump(); diff --git a/devel/electron33/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron33/files/patch-electron_spec_api-browser-window-spec.ts index 02bbad7c373a..8f708facec2e 100644 --- a/devel/electron33/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron33/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2025-01-22 18:19:12 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2025-02-26 12:19:50 UTC +++ electron/spec/api-browser-window-spec.ts @@ -69,7 +69,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -162,7 +162,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6570,7 +6570,7 @@ describe('BrowserWindow module', () => { +@@ -6571,7 +6571,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); diff --git a/devel/electron33/files/patch-electron_spec_api-utility-process-spec.ts b/devel/electron33/files/patch-electron_spec_api-utility-process-spec.ts index f656d69ed5d7..c26573f1b16b 100644 --- a/devel/electron33/files/patch-electron_spec_api-utility-process-spec.ts +++ b/devel/electron33/files/patch-electron_spec_api-utility-process-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-utility-process-spec.ts.orig 2024-11-27 04:18:00 UTC +--- electron/spec/api-utility-process-spec.ts.orig 2025-02-26 12:19:50 UTC +++ electron/spec/api-utility-process-spec.ts -@@ -453,7 +453,7 @@ describe('utilityProcess module', () => { +@@ -455,7 +455,7 @@ describe('utilityProcess module', () => { expect(output).to.include(result); }); @@ -9,7 +9,7 @@ const message = 'Message from utility process'; const child = utilityProcess.fork(path.join(fixturesPath, 'expose-main-process-module.js')); await once(child, 'spawn'); -@@ -490,7 +490,7 @@ describe('utilityProcess module', () => { +@@ -492,7 +492,7 @@ describe('utilityProcess module', () => { await closeWindow(w); }); diff --git a/devel/electron33/files/patch-third__party_electron__node_deps_cares_BUILD.gn b/devel/electron33/files/patch-third__party_electron__node_deps_cares_BUILD.gn index aaeadc0424b5..c42cc0b43a57 100644 --- a/devel/electron33/files/patch-third__party_electron__node_deps_cares_BUILD.gn +++ b/devel/electron33/files/patch-third__party_electron__node_deps_cares_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/electron_node/deps/cares/BUILD.gn.orig 2024-10-16 06:04:29 UTC +--- third_party/electron_node/deps/cares/BUILD.gn.orig 2025-03-05 11:48:39 UTC +++ third_party/electron_node/deps/cares/BUILD.gn -@@ -159,9 +159,14 @@ static_library("cares") { +@@ -172,9 +172,14 @@ static_library("cares") { defines += [ "HAVE_CONFIG_H" ] } diff --git a/devel/electron33/files/patch-third__party_lzma__sdk_C_CpuArch.c b/devel/electron33/files/patch-third__party_lzma__sdk_C_CpuArch.c index e5faa231f03f..2ff4e154026b 100644 --- a/devel/electron33/files/patch-third__party_lzma__sdk_C_CpuArch.c +++ b/devel/electron33/files/patch-third__party_lzma__sdk_C_CpuArch.c @@ -1,11 +1,11 @@ ---- third_party/lzma_sdk/C/CpuArch.c.orig 2022-09-04 11:56:14 UTC +--- third_party/lzma_sdk/C/CpuArch.c.orig 2025-03-08 14:05:07 UTC +++ third_party/lzma_sdk/C/CpuArch.c -@@ -412,12 +412,40 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP +@@ -854,6 +854,34 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; } BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; } +#elif defined(__OpenBSD__) - ++ +#include <sys/param.h> +#include <sys/sysctl.h> +#include <machine/cpu.h> @@ -32,13 +32,6 @@ +MY_HWCAP_CHECK_FUNC (SHA1) +MY_HWCAP_CHECK_FUNC (SHA2) +MY_HWCAP_CHECK_FUNC (AES) -+ - #else // __APPLE__ - - #include <sys/auxv.h> --#if !defined(ARMV8_OS_FUCHSIA) -+#if !defined(ARMV8_OS_FUCHSIA) && !defined(__FreeBSD__) - #define USE_HWCAP - #endif // !defined(ARMV8_OS_FUCHSIA) + #else // __APPLE__