From nobody Fri Aug 08 04:50:21 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bys655dSJz64B10; Fri, 08 Aug 2025 04:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bys655M4qz3SNd; Fri, 08 Aug 2025 04:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754628621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0AbT6pHJKr3RJc+lRhxELOlD2VV8K8FWaEympk/C5S0=; b=W215193jiZ3BZgFs231thrPyZMJBx9A73b0leCuKlu6ziiSYG7LA7P/Tg5dNYiQg+LfU1F 2HmbcM9SBM+2tbxH4mCbnW8SWxwb1LrXfZz616vXkVjjt0/PC8yRpGKPhU+LB2LK2x6xsM RLfUDk2AXGnXnB4BXvuf0kRSn2/0DYisHHZIJeHNESXWjcsFOWnrsrCcobR9URNinP77wF Bu38d+zrNi8b5ukvDOADk2DUtRMLscPxf7DMdZCMNj+hzNY5noubvwjr8JN3WNx7Lw+dDp cPbmUMIGc31n8nMWdamzvR8wG18ymCZALp6ABh5sQ4VjbXzZCAkNUvR414oG8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754628621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0AbT6pHJKr3RJc+lRhxELOlD2VV8K8FWaEympk/C5S0=; b=vuY3F0une49DLNTy1CoJCh0dzLJ3EjLKEe88/MLSWOv4jA694wgHzzgDaAHUQKklSJFCLz iAGGW75kLFx85IYQ8gOsbpxBkPoO9PQ3coPGszGylRBxDphP2GfmyRX3FqSlb5vYvgSLL4 FUYkbDlxjTpCa922QfR/Pqtp0RCyQC36pROcnONjho//xyw/4lIny9/wXwk4V8y1s5k6+x z2aIaoVl+5Jq4YJfU5g4bC42Un4woqoxbtSr2hX1ODWryH/DkDPyYfQ6j+DUpYgpQJ545f 8oAu5sutmTecvMr3Dd1BAsxZQ7ZepmjAGBbIoeHhprdTyQLaWwvsJ+05596V6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754628621; a=rsa-sha256; cv=none; b=ePUzac02PpZl5OUFSTHwTqWzbjnfiuJu1XKQyZyAbSyp55tF3WRJ94wO0+dmvj8td+1ukO cU5PE3Xm+yBF65PiwaaPYWYP8CVZvYudkpKyv0N5VfDK1G3oDrxQEEHiJ1AAAdVpIEV+El Kxtc/Dd+hTePC99vFjJ9pePcESvBuKi3xhZF3vaxjlIK3HUDekzA5m/d9WMArLlx9VTdut 4U/DwHJGyAcp3Cer5kE1RJTHlZ9wsup6/1RytXKTM/BxAi+OyiZu9fqfxeESgWtl2/Sd1d e2roZzYxWv/0u8arHOBLVGooBePNmp72onJBgBal7gMfpx6QgGqB0slK4hq3yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bys654t2Kz6F7; Fri, 08 Aug 2025 04:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5784oL84051400; Fri, 8 Aug 2025 04:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5784oLlZ051397; Fri, 8 Aug 2025 04:50:21 GMT (envelope-from git) Date: Fri, 8 Aug 2025 04:50:21 GMT Message-Id: <202508080450.5784oLlZ051397@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 25e306622a50 - main - devel/electron37: update to 37.2.6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25e306622a50095f6a24f88c4389fbee5ece21b7 Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=25e306622a50095f6a24f88c4389fbee5ece21b7 commit 25e306622a50095f6a24f88c4389fbee5ece21b7 Author: Hiroki Tagato AuthorDate: 2025-08-08 04:47:50 +0000 Commit: Hiroki Tagato CommitDate: 2025-08-08 04:50:15 +0000 devel/electron37: update to 37.2.6 Changelog: https://github.com/electron/electron/releases/tag/v37.2.6 Reported by: GitHub (watch releases) --- devel/electron37/Makefile | 3 +- devel/electron37/Makefile.version | 2 +- devel/electron37/distinfo | 14 ++++---- ...ell_browser_api_electron__api__web__contents.cc | 10 +++--- ...electron_shell_browser_native__window__views.cc | 40 +++++++++++----------- ...-electron_shell_browser_native__window__views.h | 4 +-- 6 files changed, 36 insertions(+), 37 deletions(-) diff --git a/devel/electron37/Makefile b/devel/electron37/Makefile index 2c3e2a707110..28de212fe821 100644 --- a/devel/electron37/Makefile +++ b/devel/electron37/Makefile @@ -1,7 +1,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER} -PORTREVISION= 1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= devel @@ -221,7 +220,7 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER -CHROMIUM_VER= 138.0.7204.168 +CHROMIUM_VER= 138.0.7204.185 # See ${WRKSRC}/electron/DEPS for NODE_VER NODE_VER= 22.17.1 # See ${WRKSRC}/electron/DEPS for NAN_VER diff --git a/devel/electron37/Makefile.version b/devel/electron37/Makefile.version index ae1731e1fe65..63bad097aa86 100644 --- a/devel/electron37/Makefile.version +++ b/devel/electron37/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 37.2.5 +ELECTRON_VER= 37.2.6 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron37/distinfo b/devel/electron37/distinfo index 5f269a1f7a85..c1986ed2ee06 100644 --- a/devel/electron37/distinfo +++ b/devel/electron37/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1754110996 -SHA256 (electron/chromium-138.0.7204.168.tar.xz) = 5aaa7070ae6378abffe781ad895a8faca34d768acc3f4a5f14015e72c67df882 -SIZE (electron/chromium-138.0.7204.168.tar.xz) = 7276724848 +TIMESTAMP = 1754602115 +SHA256 (electron/chromium-138.0.7204.185.tar.xz) = b788c781706cfe099413eb52a19718deb6a077e725af7474d064bde3fb13413b +SIZE (electron/chromium-138.0.7204.185.tar.xz) = 7274579784 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-37.2.5.tar.xz) = 156bcfdc1d2066a4e3639d76851884f446942aa05a371cbf4b6f43381fed497b -SIZE (electron/electron-yarn-cache-37.2.5.tar.xz) = 30485132 -SHA256 (electron/electron-electron-v37.2.5_GH0.tar.gz) = 384cac61cb8cfa4e3bdaea77654d13472b9f1cd43f64f12f03f512816420b608 -SIZE (electron/electron-electron-v37.2.5_GH0.tar.gz) = 15824577 +SHA256 (electron/electron-yarn-cache-37.2.6.tar.xz) = 156bcfdc1d2066a4e3639d76851884f446942aa05a371cbf4b6f43381fed497b +SIZE (electron/electron-yarn-cache-37.2.6.tar.xz) = 30485132 +SHA256 (electron/electron-electron-v37.2.6_GH0.tar.gz) = 00af33600a5ba24f3b3d737e878f6c7b4c41bd68d4dca51a8deb8ebab2de8a5c +SIZE (electron/electron-electron-v37.2.6_GH0.tar.gz) = 15830486 SHA256 (electron/nodejs-node-v22.17.1_GH0.tar.gz) = 7a1dbcd53b7152df5592624698f987fd626d9240c33d59dfef13812e4c168eb2 SIZE (electron/nodejs-node-v22.17.1_GH0.tar.gz) = 123061071 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb diff --git a/devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 680d1c3ed973..5ab6f85cd1cf 100644 --- a/devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron37/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 2025-07-02 10:12:01 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-08-06 01:20:29 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -160,11 +160,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -32,7 +32,7 @@ if (auto* linux_ui = ui::LinuxUi::instance()) return linux_ui->GetCursorBlinkInterval(); #elif BUILDFLAG(IS_WIN) -@@ -930,7 +930,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -931,7 +931,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)); -@@ -2673,13 +2673,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2681,13 +2681,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); -@@ -3356,7 +3356,7 @@ void WebContents::Focus() { +@@ -3370,7 +3370,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 -@@ -4225,7 +4225,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4239,7 +4239,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc index 9cfa655838e9..c241b765d7e0 100644 --- a/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2025-07-22 07:51:00 UTC +--- electron/shell/browser/native_window_views.cc.orig 2025-08-06 01:20:29 UTC +++ electron/shell/browser/native_window_views.cc @@ -51,7 +51,7 @@ #include "ui/wm/core/shadow_types.h" @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "shell/browser/browser.h" #include "shell/browser/linux/unity_service.h" -@@ -282,7 +282,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -285,7 +285,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: params.parent = parent->GetNativeWindow(); params.native_widget = new ElectronDesktopNativeWidgetAura(this); @@ -18,7 +18,7 @@ std::string name = Browser::Get()->GetName(); // Set WM_WINDOW_ROLE. params.wm_role_name = "browser-window"; -@@ -307,7 +307,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -310,7 +310,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: 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); -@@ -429,7 +429,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -433,7 +433,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: if (window) window->AddPreTargetHandler(this); @@ -36,7 +36,7 @@ // On linux after the widget is initialized we might have to force set the // bounds if the bounds are smaller than the current display SetBounds(gfx::Rect(GetPosition(), bounds.size()), false); -@@ -450,7 +450,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us +@@ -454,7 +454,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us } void NativeWindowViews::SetGTKDarkThemeEnabled(bool use_dark_theme) { @@ -45,7 +45,7 @@ if (x11_util::IsX11()) { const std::string color = use_dark_theme ? "dark" : "light"; auto* connection = x11::Connection::Get(); -@@ -511,7 +511,7 @@ void NativeWindowViews::Show() { +@@ -515,7 +515,7 @@ void NativeWindowViews::Show() { NotifyWindowShow(); @@ -54,7 +54,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -527,7 +527,7 @@ void NativeWindowViews::ShowInactive() { +@@ -531,7 +531,7 @@ void NativeWindowViews::ShowInactive() { NotifyWindowShow(); @@ -63,7 +63,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -546,7 +546,7 @@ void NativeWindowViews::Hide() { +@@ -550,7 +550,7 @@ void NativeWindowViews::Hide() { NotifyWindowHide(); @@ -72,7 +72,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowUnmapped(); #endif -@@ -577,7 +577,7 @@ bool NativeWindowViews::IsEnabled() const { +@@ -581,7 +581,7 @@ bool NativeWindowViews::IsEnabled() const { bool NativeWindowViews::IsEnabled() const { #if BUILDFLAG(IS_WIN) return ::IsWindowEnabled(GetAcceleratedWidget()); @@ -81,7 +81,7 @@ if (x11_util::IsX11()) return !event_disabler_.get(); NOTIMPLEMENTED(); -@@ -827,7 +827,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -815,7 +815,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou } #endif @@ -90,7 +90,7 @@ // On Linux and Windows the minimum and maximum size should be updated with // window size when window is not resizable. if (!resizable_) { -@@ -1084,7 +1084,7 @@ bool NativeWindowViews::IsClosable() const { +@@ -1072,7 +1072,7 @@ bool NativeWindowViews::IsClosable() const { return false; } return !(info.fState & MFS_DISABLED); @@ -99,7 +99,7 @@ return true; #endif } -@@ -1124,7 +1124,7 @@ void NativeWindowViews::Center() { +@@ -1112,7 +1112,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() { @@ -108,7 +108,7 @@ auto display = display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeWindow()); gfx::Rect window_bounds_in_screen = display.work_area(); -@@ -1349,7 +1349,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men +@@ -1332,7 +1332,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(); -@@ -1405,7 +1405,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* +@@ -1388,7 +1388,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( -@@ -1451,7 +1451,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1434,7 +1434,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); } -@@ -1549,7 +1549,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1560,7 +1560,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM #if BUILDFLAG(IS_WIN) window_handle = reinterpret_cast(accelerated_widget); @@ -144,7 +144,7 @@ window_handle = static_cast(accelerated_widget); #endif aura::WindowTreeHost* const host = -@@ -1647,7 +1647,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1658,7 +1658,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC SendMessage(hwnd, WM_SETICON, ICON_BIG, reinterpret_cast(app_icon_.get())); } @@ -153,7 +153,7 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget( GetAcceleratedWidget()); -@@ -1752,7 +1752,7 @@ bool NativeWindowViews::CanMinimize() const { +@@ -1773,7 +1773,7 @@ bool NativeWindowViews::CanMinimize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -162,7 +162,7 @@ return true; #endif } -@@ -1808,7 +1808,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1829,7 +1829,7 @@ void NativeWindowViews::HandleKeyboardEvent( if (widget_destroyed_) return; @@ -171,7 +171,7 @@ if (event.windows_key_code == ui::VKEY_BROWSER_BACK) NotifyWindowExecuteAppCommand(kBrowserBackward); else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD) -@@ -1827,7 +1827,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1848,7 +1848,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron37/files/patch-electron_shell_browser_native__window__views.h b/devel/electron37/files/patch-electron_shell_browser_native__window__views.h index 3cacc61bd239..47d4fb90893b 100644 --- a/devel/electron37/files/patch-electron_shell_browser_native__window__views.h +++ b/devel/electron37/files/patch-electron_shell_browser_native__window__views.h @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.h.orig 2025-07-02 10:12:01 UTC +--- electron/shell/browser/native_window_views.h.orig 2025-08-06 01:20:29 UTC +++ electron/shell/browser/native_window_views.h @@ -26,7 +26,7 @@ namespace electron { @@ -18,7 +18,7 @@ void SetIcon(const gfx::ImageSkia& icon); #endif -@@ -249,7 +249,7 @@ class NativeWindowViews : public NativeWindow, +@@ -250,7 +250,7 @@ class NativeWindowViews : public NativeWindow, // events from resizing the window. extensions::SizeConstraints old_size_constraints_;