git: 496e45c9b487 - main - devel/electron34: update to 34.4.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 29 Mar 2025 20:15:05 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=496e45c9b487e9ab030154768112707bc8839efa
commit 496e45c9b487e9ab030154768112707bc8839efa
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2025-03-29 20:06:54 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-03-29 20:14:56 +0000
devel/electron34: update to 34.4.1
Changelog:
- https://github.com/electron/electron/releases/tag/v34.3.4
- https://github.com/electron/electron/releases/tag/v34.4.0
- https://github.com/electron/electron/releases/tag/v34.4.1
Reported by: GitHub (watch releases)
Security: 964aa5da-f094-47fe-9ebd-2142f9157440
Security: 01a7e1e1-d249-4dd8-9a4a-ef95b5747afb
---
devel/electron34/Makefile.version | 2 +-
devel/electron34/distinfo | 10 +++++-----
...-electron_shell_browser_api_electron__api__app.cc | 20 ++++++++++----------
...shell_browser_api_electron__api__web__contents.cc | 14 +++++++-------
..._shell_browser_api_electron__api__web__contents.h | 4 ++--
...n_shell_browser_electron__browser__main__parts.cc | 4 ++--
..._browser_net_system__network__context__manager.cc | 4 ++--
.../patch-electron_shell_common_node__bindings.cc | 4 ++--
.../patch-electron_spec_api-desktop-capturer-spec.ts | 8 ++++----
.../patch-electron_spec_api-web-contents-spec.ts | 11 +++++++++++
.../files/patch-electron_spec_crash-spec.ts | 4 ++--
11 files changed, 48 insertions(+), 37 deletions(-)
diff --git a/devel/electron34/Makefile.version b/devel/electron34/Makefile.version
index 007fa28f230d..6d1ad3ba70ad 100644
--- a/devel/electron34/Makefile.version
+++ b/devel/electron34/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 34.3.3
+ELECTRON_VER= 34.4.1
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron34/distinfo b/devel/electron34/distinfo
index fb027d8fa2c4..4eef7bb54e29 100644
--- a/devel/electron34/distinfo
+++ b/devel/electron34/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1742307254
+TIMESTAMP = 1743155379
SHA256 (electron/chromium-132.0.6834.210.tar.xz.0) = ede58a1501f175aaa6c92e47793b773ed10b31a43d600375cb40727c4ae677d5
SIZE (electron/chromium-132.0.6834.210.tar.xz.0) = 2000000000
SHA256 (electron/chromium-132.0.6834.210.tar.xz.1) = 6d080b3948ef1d63d08b8cc1390662a439e635b881561434787b8b67ea99b08d
@@ -7,10 +7,10 @@ SHA256 (electron/chromium-132.0.6834.210.tar.xz.2) = 989e234492cf50454303ec6f490
SIZE (electron/chromium-132.0.6834.210.tar.xz.2) = 484148560
SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-34.3.3.tar.xz) = f0fa33e22a0b00e5440fbc57517f7b303d43ca07c25e43f35e28f97c2ce12c83
-SIZE (electron/electron-yarn-cache-34.3.3.tar.xz) = 29062184
-SHA256 (electron/electron-electron-v34.3.3_GH0.tar.gz) = 53c5405a35ab766d854cd41097ccd2ef49cf83a860a20acda54377fd8a8863e6
-SIZE (electron/electron-electron-v34.3.3_GH0.tar.gz) = 14830322
+SHA256 (electron/electron-yarn-cache-34.4.1.tar.xz) = f0fa33e22a0b00e5440fbc57517f7b303d43ca07c25e43f35e28f97c2ce12c83
+SIZE (electron/electron-yarn-cache-34.4.1.tar.xz) = 29062184
+SHA256 (electron/electron-electron-v34.4.1_GH0.tar.gz) = 692ef9a90b762c0e08f25e1b1b81df72cc4f0b77e1574df5a0312724da6c1192
+SIZE (electron/electron-electron-v34.4.1_GH0.tar.gz) = 14845210
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
diff --git a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__app.cc b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__app.cc
index 0a573b636fec..fd2f446359c1 100644
--- a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__app.cc
+++ b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__app.cc
@@ -1,7 +1,7 @@
---- electron/shell/browser/api/electron_api_app.cc.orig 2025-01-29 20:10:57 UTC
+--- electron/shell/browser/api/electron_api_app.cc.orig 2025-03-26 14:46:58 UTC
+++ electron/shell/browser/api/electron_api_app.cc
-@@ -93,7 +93,7 @@
- #include "shell/browser/ui/cocoa/electron_bundle_mover.h"
+@@ -96,7 +96,7 @@
+ #include "shell/common/process_util.h"
#endif
-#if BUILDFLAG(IS_LINUX)
@@ -9,7 +9,7 @@
#include "base/nix/scoped_xdg_activation_token_injector.h"
#include "base/nix/xdg_util.h"
#endif
-@@ -417,7 +417,7 @@ bool NotificationCallbackWrapper(
+@@ -420,7 +420,7 @@ bool NotificationCallbackWrapper(
base::CommandLine cmd,
const base::FilePath& cwd,
const std::vector<uint8_t> additional_data) {
@@ -18,7 +18,7 @@
// Set the global activation token sent as a command line switch by another
// electron app instance. This also removes the switch after use to prevent
// any side effects of leaving it in the command line after this point.
-@@ -603,7 +603,7 @@ void App::OnFinishLaunching(base::Value::Dict launch_i
+@@ -606,7 +606,7 @@ void App::OnFinishLaunching(base::Value::Dict launch_i
}
void App::OnFinishLaunching(base::Value::Dict launch_info) {
@@ -27,7 +27,7 @@
// Set the application name for audio streams shown in external
// applications. Only affects pulseaudio currently.
media::AudioManager::SetGlobalAppName(Browser::Get()->GetName());
-@@ -929,7 +929,7 @@ void App::SetDesktopName(const std::string& desktop_na
+@@ -947,7 +947,7 @@ void App::SetDesktopName(const std::string& desktop_na
}
void App::SetDesktopName(const std::string& desktop_name) {
@@ -36,7 +36,7 @@
auto env = base::Environment::Create();
env->SetVar("CHROME_DESKTOP", desktop_name);
#endif
-@@ -1033,7 +1033,7 @@ bool App::RequestSingleInstanceLock(gin::Arguments* ar
+@@ -1051,7 +1051,7 @@ bool App::RequestSingleInstanceLock(gin::Arguments* ar
base::BindRepeating(NotificationCallbackWrapper, cb));
#endif
@@ -45,7 +45,7 @@
// Read the xdg-activation token and set it in the command line for the
// duration of the notification in order to ensure this is propagated to an
// already running electron app instance if it exists.
-@@ -1328,7 +1328,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
+@@ -1346,7 +1346,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
pid_dict.Set("name", process_metric.second->name);
}
@@ -54,7 +54,7 @@
auto memory_info = process_metric.second->GetMemoryInfo();
auto memory_dict = gin_helper::Dictionary::CreateEmpty(isolate);
-@@ -1702,7 +1702,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1720,7 +1720,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
.SetMethod(
"removeAsDefaultProtocolClient",
base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
@@ -63,7 +63,7 @@
.SetMethod(
"getApplicationInfoForProtocol",
base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser))
-@@ -1760,7 +1760,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1778,7 +1778,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
.SetMethod("getJumpListSettings", &App::GetJumpListSettings)
.SetMethod("setJumpList", &App::SetJumpList)
#endif
diff --git a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index fc37c7c79d0c..4e641366d230 100644
--- a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron34/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-03-10 00:01:50 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-03-27 16:32:44 UTC
+++ electron/shell/browser/api/electron_api_web_contents.cc
@@ -156,11 +156,11 @@
#include "ui/base/cocoa/defaults_utils.h"
@@ -14,7 +14,7 @@
#include "ui/aura/window.h"
#include "ui/gfx/font_render_params.h"
#endif
-@@ -191,7 +191,7 @@
+@@ -192,7 +192,7 @@
#include "content/public/browser/plugin_service.h"
#endif
@@ -23,7 +23,7 @@
#include "chrome/browser/hang_monitor/hang_crash_dump.h" // nogncheck
#endif
-@@ -565,7 +565,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval(
+@@ -566,7 +566,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)
-@@ -934,7 +934,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -927,7 +927,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));
-@@ -2771,13 +2771,13 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2787,13 +2787,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);
-@@ -3450,7 +3450,7 @@ void WebContents::Focus() {
+@@ -3466,7 +3466,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
-@@ -4326,7 +4326,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -4335,7 +4335,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
}
#endif
diff --git a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.h
index 827c45f72f42..ac8da8ab6300 100644
--- a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.h
+++ b/devel/electron34/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-03-10 00:01:50 UTC
+--- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-03-26 14:46:58 UTC
+++ electron/shell/browser/api/electron_api_web_contents.h
-@@ -776,7 +776,7 @@ class WebContents final : public ExclusiveAccessContex
+@@ -781,7 +781,7 @@ class WebContents final : public ExclusiveAccessContex
#if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
ui::ImageModel GetDevToolsWindowIcon() override;
#endif
diff --git a/devel/electron34/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron34/files/patch-electron_shell_browser_electron__browser__main__parts.cc
index 5f614fb15d4c..07db5580f63e 100644
--- a/devel/electron34/files/patch-electron_shell_browser_electron__browser__main__parts.cc
+++ b/devel/electron34/files/patch-electron_shell_browser_electron__browser__main__parts.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/electron_browser_main_parts.cc.orig 2025-03-12 08:26:33 UTC
+--- electron/shell/browser/electron_browser_main_parts.cc.orig 2025-03-26 14:46:58 UTC
+++ electron/shell/browser/electron_browser_main_parts.cc
@@ -76,7 +76,7 @@
#include "ui/wm/core/wm_state.h"
@@ -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.
-@@ -607,7 +609,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
+@@ -601,7 +603,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
fake_browser_process_->PostMainMessageLoopRun();
content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();
diff --git a/devel/electron34/files/patch-electron_shell_browser_net_system__network__context__manager.cc b/devel/electron34/files/patch-electron_shell_browser_net_system__network__context__manager.cc
index d377efdbefbc..9bac7a794c55 100644
--- a/devel/electron34/files/patch-electron_shell_browser_net_system__network__context__manager.cc
+++ b/devel/electron34/files/patch-electron_shell_browser_net_system__network__context__manager.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/net/system_network_context_manager.cc.orig 2024-10-22 02:29:46 UTC
+--- electron/shell/browser/net/system_network_context_manager.cc.orig 2025-03-26 14:46:58 UTC
+++ electron/shell/browser/net/system_network_context_manager.cc
-@@ -40,7 +40,7 @@
+@@ -39,7 +39,7 @@
#include "shell/common/options_switches.h"
#include "url/gurl.h"
diff --git a/devel/electron34/files/patch-electron_shell_common_node__bindings.cc b/devel/electron34/files/patch-electron_shell_common_node__bindings.cc
index 9980187788a2..28ac0f9c28b7 100644
--- a/devel/electron34/files/patch-electron_shell_common_node__bindings.cc
+++ b/devel/electron34/files/patch-electron_shell_common_node__bindings.cc
@@ -1,4 +1,4 @@
---- electron/shell/common/node_bindings.cc.orig 2025-01-29 20:10:57 UTC
+--- electron/shell/common/node_bindings.cc.orig 2025-03-26 14:46:58 UTC
+++ electron/shell/common/node_bindings.cc
@@ -45,7 +45,7 @@
#include "third_party/electron_node/src/debug_utils.h"
@@ -18,7 +18,7 @@
electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message);
electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location);
#endif
-@@ -532,7 +532,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c
+@@ -535,7 +535,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c
TRACE_EVENT0("electron", "NodeBindings::Initialize");
// Open node's error reporting system for browser process.
diff --git a/devel/electron34/files/patch-electron_spec_api-desktop-capturer-spec.ts b/devel/electron34/files/patch-electron_spec_api-desktop-capturer-spec.ts
index 95fe1bf64980..4511304eebfc 100644
--- a/devel/electron34/files/patch-electron_spec_api-desktop-capturer-spec.ts
+++ b/devel/electron34/files/patch-electron_spec_api-desktop-capturer-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec/api-desktop-capturer-spec.ts.orig 2024-10-09 13:53:06 UTC
+--- electron/spec/api-desktop-capturer-spec.ts.orig 2025-03-26 14:46:58 UTC
+++ electron/spec/api-desktop-capturer-spec.ts
@@ -45,7 +45,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl
});
@@ -18,7 +18,7 @@
const displays = screen.getAllDisplays();
const sources = await desktopCapturer.getSources({ types: ['screen'] });
expect(sources).to.be.an('array').of.length(displays.length);
-@@ -102,7 +102,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl
+@@ -118,7 +118,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl
// TODO(julien.isorce): investigate why |sources| is empty on the linux
// bots while it is not on my workstation, as expected, with and without
// the --ci parameter.
@@ -27,7 +27,7 @@
it.skip('desktopCapturer.getSources returned an empty source list');
return;
}
-@@ -138,7 +138,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl
+@@ -154,7 +154,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl
// TODO(julien.isorce): investigate why |sources| is empty on the linux
// bots while it is not on my workstation, as expected, with and without
// the --ci parameter.
@@ -36,7 +36,7 @@
it.skip('desktopCapturer.getSources returned an empty source list');
return;
}
-@@ -207,7 +207,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl
+@@ -223,7 +223,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl
// TODO(julien.isorce): investigate why |sources| is empty on the linux
// bots while it is not on my workstation, as expected, with and without
// the --ci parameter.
diff --git a/devel/electron34/files/patch-electron_spec_api-web-contents-spec.ts b/devel/electron34/files/patch-electron_spec_api-web-contents-spec.ts
new file mode 100644
index 000000000000..824900c04d17
--- /dev/null
+++ b/devel/electron34/files/patch-electron_spec_api-web-contents-spec.ts
@@ -0,0 +1,11 @@
+--- electron/spec/api-web-contents-spec.ts.orig 2025-03-27 16:32:44 UTC
++++ electron/spec/api-web-contents-spec.ts
+@@ -2652,7 +2652,7 @@ describe('webContents module', () => {
+ });
+
+ // TODO(codebytere): OOPIF printing is disabled on Linux at the moment due to crashes.
+- ifit(process.platform !== 'linux')('can print cross-origin iframes', async () => {
++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('can print cross-origin iframes', async () => {
+ server = http.createServer((_, res) => {
+ res.writeHead(200);
+ res.end(`
diff --git a/devel/electron34/files/patch-electron_spec_crash-spec.ts b/devel/electron34/files/patch-electron_spec_crash-spec.ts
index 06aa44b6d80c..b4da5969eecd 100644
--- a/devel/electron34/files/patch-electron_spec_crash-spec.ts
+++ b/devel/electron34/files/patch-electron_spec_crash-spec.ts
@@ -1,6 +1,6 @@
---- electron/spec/crash-spec.ts.orig 2024-10-09 13:53:06 UTC
+--- electron/spec/crash-spec.ts.orig 2025-03-26 14:46:58 UTC
+++ electron/spec/crash-spec.ts
-@@ -47,7 +47,7 @@ const shouldRunCase = (crashCase: string) => {
+@@ -52,7 +52,7 @@ const shouldRunCase = (crashCase: string) => {
if (process.platform === 'win32') {
return process.arch !== 'ia32';
} else {