git: d074a8e368f4 - main - devel/electron42: Update to 42.8.1
Hiroki Tagato <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <6a758561.3f52f.323e7db9__35724.4445056253$1786086775$gmane$org@gitrepo.freebsd.org> |
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=d074a8e368f4269934e727a8769730e147f63e7a commit d074a8e368f4269934e727a8769730e147f63e7a Author: Hiroki Tagato <[email protected]> AuthorDate: 2026-08-07 07:11:32 +0000 Commit: Hiroki Tagato <[email protected]> CommitDate: 2026-08-07 07:12:25 +0000 devel/electron42: Update to 42.8.1 Changelog: https://github.com/electron/electron/releases/tag/v42.8.1 Reported by: GitHub (watch releases) --- devel/electron42/Makefile | 2 +- devel/electron42/Makefile.version | 2 +- devel/electron42/distinfo | 14 ++++---- ...ell_browser_api_electron__api__web__contents.cc | 8 ++--- ...electron_shell_browser_native__window__views.cc | 42 +++++++++++----------- .../patch-electron_spec_api-browser-window-spec.ts | 32 ++++++++--------- .../files/patch-electron_spec_api-protocol-spec.ts | 4 +-- 7 files changed, 52 insertions(+), 52 deletions(-) diff --git a/devel/electron42/Makefile b/devel/electron42/Makefile index e8a427a75501..e43bad012b6b 100644 --- a/devel/electron42/Makefile +++ b/devel/electron42/Makefile @@ -227,7 +227,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER CHROMIUM_VER= 148.0.7778.280 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 24.18.0 +NODE_VER= 24.18.1 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= 675cefebca42410733da8a454c8d9391fcebfbc2 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER diff --git a/devel/electron42/Makefile.version b/devel/electron42/Makefile.version index 3726b28e6daf..f00dbb3dc7c1 100644 --- a/devel/electron42/Makefile.version +++ b/devel/electron42/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 42.8.0 +ELECTRON_VER= 42.8.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron42/distinfo b/devel/electron42/distinfo index e7e19af0f658..ab9f34ac0bea 100644 --- a/devel/electron42/distinfo +++ b/devel/electron42/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1785315326 +TIMESTAMP = 1786019209 SHA256 (electron/chromium-148.0.7778.280.tar.xz.0) = cddbfeba5a50d950693590399df8df3a8ef5910eee367c76aec2541444c59dea SIZE (electron/chromium-148.0.7778.280.tar.xz.0) = 2000000000 SHA256 (electron/chromium-148.0.7778.280.tar.xz.1) = cd2f2c3740c05eb549878ab6c6571f7858456c2c56cf798e60ffbaf7e651429f @@ -341,12 +341,12 @@ SHA256 (electron/rust/crates/zerocopy-derive-0.7.35.crate) = fa4f8080344d4671fb4 SIZE (electron/rust/crates/zerocopy-derive-0.7.35.crate) = 37829 SHA256 (electron/yarn-4.12.0.tgz) = bd58d06826ce9542c4cd904fe10bab7bc718ea2cc39a45d9fbd15f2edb45761c SIZE (electron/yarn-4.12.0.tgz) = 1056794 -SHA256 (electron/electron42-42.8.0-node-modules.tar.xz) = 73224ef31205c29739c6d35f93129f0ab290bf714d59e1461fc675c070aac933 -SIZE (electron/electron42-42.8.0-node-modules.tar.xz) = 71097369 -SHA256 (electron/electron-electron-v42.8.0_GH0.tar.gz) = 2dda3cc0f2fddde862cf43b36c808e50fa86f6b2599ae8a11549189149700913 -SIZE (electron/electron-electron-v42.8.0_GH0.tar.gz) = 19396442 -SHA256 (electron/nodejs-node-v24.18.0_GH0.tar.gz) = e07dd419efe30a89b90d872a956d074f4197fd103781bc06e0fce99d0130ad01 -SIZE (electron/nodejs-node-v24.18.0_GH0.tar.gz) = 127522062 +SHA256 (electron/electron42-42.8.1-node-modules.tar.xz) = 73224ef31205c29739c6d35f93129f0ab290bf714d59e1461fc675c070aac933 +SIZE (electron/electron42-42.8.1-node-modules.tar.xz) = 71097369 +SHA256 (electron/electron-electron-v42.8.1_GH0.tar.gz) = 65ff10d9fd34dc92d4d2c39268eb96707e90a4b50b7dd1b3f5fe3598e4bdb228 +SIZE (electron/electron-electron-v42.8.1_GH0.tar.gz) = 19402246 +SHA256 (electron/nodejs-node-v24.18.1_GH0.tar.gz) = bb8065bf6b8b4a2da85dba16c1f69c0a3ad90c0481b33f1ab4c82e3d2bcc8c77 +SIZE (electron/nodejs-node-v24.18.1_GH0.tar.gz) = 127539215 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 diff --git a/devel/electron42/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron42/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index cfceb114e64b..b9f5c99b3836 100644 --- a/devel/electron42/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron42/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 2026-07-02 19:37:32 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2026-08-04 15:02:58 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -175,11 +175,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -41,7 +41,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -3005,13 +3005,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -3012,13 +3012,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); -@@ -3721,7 +3721,7 @@ void WebContents::Focus() { +@@ -3728,7 +3728,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 -@@ -4622,7 +4622,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4629,7 +4629,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron42/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron42/files/patch-electron_shell_browser_native__window__views.cc index e25742bba7ed..a60130f933cf 100644 --- a/devel/electron42/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron42/files/patch-electron_shell_browser_native__window__views.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2026-07-21 15:08:10 UTC +--- electron/shell/browser/native_window_views.cc.orig 2026-08-04 15:02:58 UTC +++ electron/shell/browser/native_window_views.cc @@ -58,7 +58,7 @@ #include "ui/wm/core/shadow_types.h" @@ -9,7 +9,7 @@ #include "base/notimplemented.h" #include "shell/browser/browser.h" #include "shell/browser/linux/unity_service.h" -@@ -291,7 +291,7 @@ NativeWindowViews::NativeWindowViews(const int32_t bas +@@ -300,7 +300,7 @@ NativeWindowViews::NativeWindowViews(const int32_t bas params.parent = parent->GetNativeWindow(); params.native_widget = new ElectronDesktopNativeWidgetAura{this, widget()}; @@ -18,7 +18,7 @@ // Set the WM_CLASS and XDG App ID to the same value // for best compatibility with both X11 and Wayland. const auto app_id = platform_util::GetXdgAppId(); -@@ -321,7 +321,7 @@ NativeWindowViews::NativeWindowViews(const int32_t bas +@@ -330,7 +330,7 @@ NativeWindowViews::NativeWindowViews(const int32_t bas std::string window_type; options.Get(options::kType, &window_type); @@ -27,7 +27,7 @@ // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set. if (options.ValueOrDefault(options::kDarkTheme, false)) SetGTKDarkThemeEnabled(true); -@@ -513,7 +513,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us +@@ -522,7 +522,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us } void NativeWindowViews::SetGTKDarkThemeEnabled(bool use_dark_theme) { @@ -36,7 +36,7 @@ if (x11_util::IsX11()) { const std::string color = use_dark_theme ? "dark" : "light"; auto* connection = x11::Connection::Get(); -@@ -574,7 +574,7 @@ void NativeWindowViews::Show() { +@@ -583,7 +583,7 @@ void NativeWindowViews::Show() { NotifyWindowShow(); @@ -45,7 +45,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -590,7 +590,7 @@ void NativeWindowViews::ShowInactive() { +@@ -599,7 +599,7 @@ void NativeWindowViews::ShowInactive() { NotifyWindowShow(); @@ -54,7 +54,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -609,7 +609,7 @@ void NativeWindowViews::Hide() { +@@ -618,7 +618,7 @@ void NativeWindowViews::Hide() { NotifyWindowHide(); @@ -63,7 +63,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowUnmapped(); #endif -@@ -640,7 +640,7 @@ bool NativeWindowViews::IsEnabled() const { +@@ -649,7 +649,7 @@ bool NativeWindowViews::IsEnabled() const { bool NativeWindowViews::IsEnabled() const { #if BUILDFLAG(IS_WIN) return ::IsWindowEnabled(GetAcceleratedWidget()); @@ -72,7 +72,7 @@ if (x11_util::IsX11()) return !event_disabler_.get(); NOTIMPLEMENTED(); -@@ -865,7 +865,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -874,7 +874,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou } #endif @@ -81,7 +81,7 @@ // On Linux and Windows the minimum and maximum size should be updated with // window size when window is not resizable. if (!CanResize()) { -@@ -920,7 +920,7 @@ void NativeWindowViews::SetContentSizeConstraints( +@@ -929,7 +929,7 @@ void NativeWindowViews::SetContentSizeConstraints( // of this to determine whether native widget has initialized. if (widget() && widget()->widget_delegate()) widget()->OnSizeConstraintsChanged(); @@ -90,7 +90,7 @@ if (resizable_) old_size_constraints_ = GetSizeConstraints(); #endif -@@ -1140,7 +1140,7 @@ bool NativeWindowViews::IsClosable() const { +@@ -1149,7 +1149,7 @@ bool NativeWindowViews::IsClosable() const { return false; } return !(info.fState & MFS_DISABLED); @@ -99,7 +99,7 @@ return true; #endif } -@@ -1280,7 +1280,7 @@ void NativeWindowViews::SetBackgroundColor(SkColor bac +@@ -1289,7 +1289,7 @@ void NativeWindowViews::SetBackgroundColor(SkColor bac InvalidateRect(GetAcceleratedWidget(), nullptr, 1); #endif @@ -108,7 +108,7 @@ // Widget and root view need to be transparent for CSD to draw shadow regions // and custom edges and corners. The web contents view will still be // painted with the true background color, which is cached in state. -@@ -1410,7 +1410,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men +@@ -1419,7 +1419,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men } void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) { @@ -117,7 +117,7 @@ // Remove global menu bar. if (global_menu_bar_ && menu_model == nullptr) { global_menu_bar_.reset(); -@@ -1466,7 +1466,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* +@@ -1475,7 +1475,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* void NativeWindowViews::SetParentWindow(NativeWindow* parent) { NativeWindow::SetParentWindow(parent); @@ -126,7 +126,7 @@ if (x11_util::IsX11()) { auto* connection = x11::Connection::Get(); connection->SetProperty( -@@ -1528,7 +1528,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1537,7 +1537,7 @@ void NativeWindowViews::SetProgressBar(double progress NativeWindow::ProgressState state) { #if BUILDFLAG(IS_WIN) taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state); @@ -135,7 +135,7 @@ if (unity::IsRunning()) { unity::SetProgressFraction(progress); } -@@ -1654,7 +1654,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1663,7 +1663,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM #if BUILDFLAG(IS_WIN) window_handle = reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget); @@ -144,7 +144,7 @@ window_handle = static_cast<uint32_t>(accelerated_widget); #endif aura::WindowTreeHost* const host = -@@ -1784,7 +1784,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1793,7 +1793,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC SendMessage(hwnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(app_icon_.get())); } @@ -153,7 +153,7 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget( GetAcceleratedWidget()); -@@ -1905,7 +1905,7 @@ bool NativeWindowViews::CanMinimize() const { +@@ -1914,7 +1914,7 @@ bool NativeWindowViews::CanMinimize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -162,7 +162,7 @@ return true; #endif } -@@ -1939,7 +1939,7 @@ std::unique_ptr<views::FrameView> NativeWindowViews::C +@@ -1948,7 +1948,7 @@ std::unique_ptr<views::FrameView> NativeWindowViews::C #endif } @@ -171,7 +171,7 @@ LinuxFrameLayout* NativeWindowViews::GetLinuxFrameLayout() { auto* ncv = widget()->non_client_view(); if (!ncv) -@@ -1959,7 +1959,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1968,7 +1968,7 @@ void NativeWindowViews::HandleKeyboardEvent( if (widget_destroyed_) return; @@ -180,7 +180,7 @@ if (event.windows_key_code == ui::VKEY_BROWSER_BACK) NotifyWindowExecuteAppCommand(kBrowserBackward); else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD) -@@ -1978,7 +1978,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1987,7 +1987,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron42/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron42/files/patch-electron_spec_api-browser-window-spec.ts index d3b8ae83cbbb..9e4ed528a8c9 100644 --- a/devel/electron42/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron42/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2026-07-21 15:08:10 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2026-08-04 15:02:58 UTC +++ electron/spec/api-browser-window-spec.ts @@ -100,7 +100,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -54,7 +54,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -2072,7 +2072,7 @@ describe('BrowserWindow module', () => { +@@ -2089,7 +2089,7 @@ describe('BrowserWindow module', () => { }); }); @@ -63,7 +63,7 @@ it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = once(w, 'maximize'); -@@ -2290,7 +2290,7 @@ describe('BrowserWindow module', () => { +@@ -2307,7 +2307,7 @@ describe('BrowserWindow module', () => { }); }); @@ -72,7 +72,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -3398,7 +3398,7 @@ describe('BrowserWindow module', () => { +@@ -3415,7 +3415,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.setOpacity(opacity)', () => { afterEach(closeAllWindows); @@ -81,7 +81,7 @@ it('make window with initial opacity', () => { const w = new BrowserWindow({ show: false, opacity: 0.5 }); expect(w.getOpacity()).to.equal(0.5); -@@ -3424,7 +3424,7 @@ describe('BrowserWindow module', () => { +@@ -3441,7 +3441,7 @@ describe('BrowserWindow module', () => { }); }); @@ -90,7 +90,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3664,7 +3664,7 @@ describe('BrowserWindow module', () => { +@@ -3681,7 +3681,7 @@ describe('BrowserWindow module', () => { expect(overlayRectPreMax.height).to.equal(size); // 'maximize' event is not emitted on Linux in CI. @@ -99,7 +99,7 @@ const maximize = once(w, 'maximize'); w.show(); w.maximize(); -@@ -3731,7 +3731,7 @@ describe('BrowserWindow module', () => { +@@ -3748,7 +3748,7 @@ describe('BrowserWindow module', () => { expect(preMaxHeight).to.equal(size); // 'maximize' event is not emitted on Linux in CI. @@ -108,7 +108,7 @@ const maximize = once(w, 'maximize'); w.show(); w.maximize(); -@@ -4663,7 +4663,7 @@ describe('BrowserWindow module', () => { +@@ -4680,7 +4680,7 @@ describe('BrowserWindow module', () => { expect(test.nodeTimers).to.equal(true); expect(test.nodeUrl).to.equal(true); @@ -117,7 +117,7 @@ expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -5179,7 +5179,7 @@ describe('BrowserWindow module', () => { +@@ -5196,7 +5196,7 @@ describe('BrowserWindow module', () => { }); }); @@ -126,7 +126,7 @@ afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); -@@ -5455,7 +5455,7 @@ describe('BrowserWindow module', () => { +@@ -5472,7 +5472,7 @@ describe('BrowserWindow module', () => { // TODO(zcbenz): // This test does not run on Linux CI. See: // https://github.com/electron/electron/issues/28699 @@ -135,7 +135,7 @@ 'should bring a minimized maximized window back to maximized state', async () => { const w = new BrowserWindow({}); -@@ -5473,7 +5473,7 @@ describe('BrowserWindow module', () => { +@@ -5490,7 +5490,7 @@ describe('BrowserWindow module', () => { } ); @@ -144,7 +144,7 @@ const w = new BrowserWindow({ show: false }); w.show(); -@@ -5496,7 +5496,7 @@ describe('BrowserWindow module', () => { +@@ -5513,7 +5513,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI @@ -153,7 +153,7 @@ afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -5533,7 +5533,7 @@ describe('BrowserWindow module', () => { +@@ -5550,7 +5550,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 @@ -162,7 +162,7 @@ const w = new BrowserWindow(); const minimize = once(w, 'minimize'); w.minimize(); -@@ -6031,7 +6031,7 @@ describe('BrowserWindow module', () => { +@@ -6048,7 +6048,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. @@ -171,7 +171,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -6272,7 +6272,7 @@ describe('BrowserWindow module', () => { +@@ -6289,7 +6289,7 @@ describe('BrowserWindow module', () => { }); }); @@ -180,7 +180,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -7590,7 +7590,7 @@ describe('BrowserWindow module', () => { +@@ -7607,7 +7607,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); diff --git a/devel/electron42/files/patch-electron_spec_api-protocol-spec.ts b/devel/electron42/files/patch-electron_spec_api-protocol-spec.ts index aaebe2123da5..4abbcd6201cc 100644 --- a/devel/electron42/files/patch-electron_spec_api-protocol-spec.ts +++ b/devel/electron42/files/patch-electron_spec_api-protocol-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-protocol-spec.ts.orig 2026-06-29 04:13:24 UTC +--- electron/spec/api-protocol-spec.ts.orig 2026-08-04 15:02:58 UTC +++ electron/spec/api-protocol-spec.ts -@@ -2095,7 +2095,7 @@ describe('protocol module', () => { +@@ -2178,7 +2178,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.