git: 72a57991c679 - main - devel/electron36: update to 36.7.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Aug 2025 00:33:23 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=72a57991c6796a5cf3f37c27a8cc2a11467e5577
commit 72a57991c6796a5cf3f37c27a8cc2a11467e5577
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2025-08-08 00:31:58 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-08-08 00:33:13 +0000
devel/electron36: update to 36.7.4
Changelog: https://github.com/electron/electron/releases/tag/v36.7.4
Reported by: GitHub (watch releases)
---
devel/electron36/Makefile | 1 -
devel/electron36/Makefile.version | 2 +-
devel/electron36/distinfo | 10 +++---
...ell_browser_api_electron__api__web__contents.cc | 10 +++---
...electron_shell_browser_native__window__views.cc | 42 +++++++++++-----------
...-electron_shell_browser_native__window__views.h | 4 +--
6 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/devel/electron36/Makefile b/devel/electron36/Makefile
index bdf22268987e..b11673660f2e 100644
--- a/devel/electron36/Makefile
+++ b/devel/electron36/Makefile
@@ -1,7 +1,6 @@
PORTNAME= electron
DISTVERSIONPREFIX= v
DISTVERSION= ${ELECTRON_VER}
-PORTREVISION= 1
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= devel
diff --git a/devel/electron36/Makefile.version b/devel/electron36/Makefile.version
index 07c121dfeac8..fb17a0a2f9f9 100644
--- a/devel/electron36/Makefile.version
+++ b/devel/electron36/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 36.7.3
+ELECTRON_VER= 36.7.4
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron36/distinfo b/devel/electron36/distinfo
index 7656f8e6cef4..5d98556f1094 100644
--- a/devel/electron36/distinfo
+++ b/devel/electron36/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1753303703
+TIMESTAMP = 1754576667
SHA256 (electron/chromium-136.0.7103.177.tar.xz.0) = 75e7a4c47e9a958aae70a026c8d005c07b76b02bf315071f209070fddaaa7665
SIZE (electron/chromium-136.0.7103.177.tar.xz.0) = 2000000000
SHA256 (electron/chromium-136.0.7103.177.tar.xz.1) = a86bdf58829129e0ef42a1bc6e5864701fba4572456631660c04c20e6d5bcee3
@@ -7,10 +7,10 @@ SHA256 (electron/chromium-136.0.7103.177.tar.xz.2) = 81a0db12277369bfae95002de9b
SIZE (electron/chromium-136.0.7103.177.tar.xz.2) = 248456988
SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-36.7.3.tar.xz) = 156bcfdc1d2066a4e3639d76851884f446942aa05a371cbf4b6f43381fed497b
-SIZE (electron/electron-yarn-cache-36.7.3.tar.xz) = 30485132
-SHA256 (electron/electron-electron-v36.7.3_GH0.tar.gz) = 0437086a10a07e157114f162209debaca4ed2ce635ce5475e82cef303d0719c3
-SIZE (electron/electron-electron-v36.7.3_GH0.tar.gz) = 15812876
+SHA256 (electron/electron-yarn-cache-36.7.4.tar.xz) = 156bcfdc1d2066a4e3639d76851884f446942aa05a371cbf4b6f43381fed497b
+SIZE (electron/electron-yarn-cache-36.7.4.tar.xz) = 30485132
+SHA256 (electron/electron-electron-v36.7.4_GH0.tar.gz) = b74b61605174ece9149f63afbf250962c7b81f08bed4c61993ccf4523846cd0a
+SIZE (electron/electron-electron-v36.7.4_GH0.tar.gz) = 15816094
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/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index a8f025d7e547..2f405c1ab390 100644
--- a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron36/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-06-16 21:48:02 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-08-05 14:34:17 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));
-@@ -2672,13 +2672,13 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2680,13 +2680,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);
-@@ -3355,7 +3355,7 @@ void WebContents::Focus() {
+@@ -3369,7 +3369,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
-@@ -4236,7 +4236,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -4250,7 +4250,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
}
#endif
diff --git a/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc
index 07903bc01387..e1af6770df51 100644
--- a/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron36/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:50:49 UTC
+--- electron/shell/browser/native_window_views.cc.orig 2025-08-05 14:34:17 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"
-@@ -281,7 +281,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -284,7 +284,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";
-@@ -306,7 +306,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -309,7 +309,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);
-@@ -428,7 +428,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -432,7 +432,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);
-@@ -464,7 +464,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us
+@@ -468,7 +468,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();
-@@ -525,7 +525,7 @@ void NativeWindowViews::Show() {
+@@ -529,7 +529,7 @@ void NativeWindowViews::Show() {
NotifyWindowShow();
@@ -54,7 +54,7 @@
if (global_menu_bar_)
global_menu_bar_->OnWindowMapped();
-@@ -541,7 +541,7 @@ void NativeWindowViews::ShowInactive() {
+@@ -545,7 +545,7 @@ void NativeWindowViews::ShowInactive() {
NotifyWindowShow();
@@ -63,7 +63,7 @@
if (global_menu_bar_)
global_menu_bar_->OnWindowMapped();
-@@ -560,7 +560,7 @@ void NativeWindowViews::Hide() {
+@@ -564,7 +564,7 @@ void NativeWindowViews::Hide() {
NotifyWindowHide();
@@ -72,7 +72,7 @@
if (global_menu_bar_)
global_menu_bar_->OnWindowUnmapped();
#endif
-@@ -591,7 +591,7 @@ bool NativeWindowViews::IsEnabled() const {
+@@ -595,7 +595,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();
-@@ -841,7 +841,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -829,7 +829,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_) {
-@@ -1099,7 +1099,7 @@ bool NativeWindowViews::IsClosable() const {
+@@ -1087,7 +1087,7 @@ bool NativeWindowViews::IsClosable() const {
return false;
}
return !(info.fState & MFS_DISABLED);
@@ -99,7 +99,7 @@
return true;
#endif
}
-@@ -1139,7 +1139,7 @@ void NativeWindowViews::Center() {
+@@ -1127,7 +1127,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();
-@@ -1363,7 +1363,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
+@@ -1346,7 +1346,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();
-@@ -1419,7 +1419,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow*
+@@ -1402,7 +1402,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(
-@@ -1465,7 +1465,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1448,7 +1448,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);
}
-@@ -1559,7 +1559,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
+@@ -1570,7 +1570,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
if (const auto* view_native_widget = widget()->native_widget_private())
return view_native_widget->IsVisibleOnAllWorkspaces();
@@ -144,7 +144,7 @@
if (x11_util::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.
-@@ -1582,7 +1582,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1593,7 +1593,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
#if BUILDFLAG(IS_WIN)
window_handle =
reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
@@ -153,7 +153,7 @@
window_handle = static_cast<uint32_t>(accelerated_widget);
#endif
aura::WindowTreeHost* const host =
-@@ -1680,7 +1680,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1691,7 +1691,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
SendMessage(hwnd, WM_SETICON, ICON_BIG,
reinterpret_cast<LPARAM>(app_icon_.get()));
}
@@ -162,7 +162,7 @@
void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
GetAcceleratedWidget());
-@@ -1776,7 +1776,7 @@ bool NativeWindowViews::CanMinimize() const {
+@@ -1797,7 +1797,7 @@ bool NativeWindowViews::CanMinimize() const {
bool NativeWindowViews::CanMinimize() const {
#if BUILDFLAG(IS_WIN)
return minimizable_;
@@ -171,7 +171,7 @@
return true;
#endif
}
-@@ -1832,7 +1832,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1853,7 +1853,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)
-@@ -1851,7 +1851,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1872,7 +1872,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
// Alt+Click should not toggle menu bar.
root_view_.ResetAltState();
diff --git a/devel/electron36/files/patch-electron_shell_browser_native__window__views.h b/devel/electron36/files/patch-electron_shell_browser_native__window__views.h
index d8a0e7419221..526891ca8ac4 100644
--- a/devel/electron36/files/patch-electron_shell_browser_native__window__views.h
+++ b/devel/electron36/files/patch-electron_shell_browser_native__window__views.h
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.h.orig 2025-06-25 22:07:23 UTC
+--- electron/shell/browser/native_window_views.h.orig 2025-08-05 14:34:17 UTC
+++ electron/shell/browser/native_window_views.h
@@ -25,7 +25,7 @@ namespace electron {
@@ -18,7 +18,7 @@
void SetIcon(const gfx::ImageSkia& icon);
#endif
-@@ -248,7 +248,7 @@ class NativeWindowViews : public NativeWindow,
+@@ -249,7 +249,7 @@ class NativeWindowViews : public NativeWindow,
// events from resizing the window.
extensions::SizeConstraints old_size_constraints_;