-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(accelerated_widget); @@ -162,7 +162,7 @@ window_handle = static_cast(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(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 +#include +#include @@ -32,13 +32,6 @@ +MY_HWCAP_CHECK_FUNC (SHA1) +MY_HWCAP_CHECK_FUNC (SHA2) +MY_HWCAP_CHECK_FUNC (AES) -+ - #else // __APPLE__ - - #include --#if !defined(ARMV8_OS_FUCHSIA) -+#if !defined(ARMV8_OS_FUCHSIA) && !defined(__FreeBSD__) - #define USE_HWCAP - #endif // !defined(ARMV8_OS_FUCHSIA) + #else // __APPLE__