Date: Tue, 09 Jun 2026 10:58:01 +0000 From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1a2bf51bcadd - main - devel/electron42: Update to 42.3.3 Message-ID: <6a27f1b9.317c3.32dfabb1@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a2bf51bcadddb49e1f975a9f87553984f8a32d3 commit 1a2bf51bcadddb49e1f975a9f87553984f8a32d3 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2026-06-09 10:56:43 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2026-06-09 10:57:46 +0000 devel/electron42: Update to 42.3.3 Changelog: https://github.com/electron/electron/releases/tag/v42.3.3 Reported by: GitHub (watch releases) --- devel/electron42/Makefile | 1 - devel/electron42/Makefile.version | 2 +- devel/electron42/distinfo | 10 ++--- devel/electron42/files/packagejsons/package.json | 3 +- .../fixtures/api/js2c-code-cache/app/package.json | 4 ++ devel/electron42/files/packagejsons/yarn.lock | 29 +------------- .../files/patch-build_config_compiler_BUILD.gn | 20 +++++----- ...tent_public_browser_content__browser__client.cc | 4 +- devel/electron42/files/patch-electron_BUILD.gn | 14 +++---- .../files/patch-electron_lib_browser_rpc-server.ts | 4 +- ...ell_browser_api_electron__api__web__contents.cc | 16 ++++---- ...hell_browser_api_electron__api__web__contents.h | 4 +- ...shell_browser_electron__browser__main__parts.cc | 14 +++---- ...ctron_shell_browser_ui_views_frameless__view.cc | 4 +- ...ectron_shell_browser_ui_views_frameless__view.h | 4 +- .../patch-electron_shell_common_node__bindings.cc | 12 +++--- .../patch-electron_spec_api-browser-window-spec.ts | 44 +++++++++++----------- devel/electron42/files/patch-v8_src_api_api.cc | 4 +- 18 files changed, 86 insertions(+), 107 deletions(-) diff --git a/devel/electron42/Makefile b/devel/electron42/Makefile index 731c1c4c5e65..2b366855e7d1 100644 --- a/devel/electron42/Makefile +++ b/devel/electron42/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/electron42/Makefile.version b/devel/electron42/Makefile.version index 2b192a6cedeb..328511e349d5 100644 --- a/devel/electron42/Makefile.version +++ b/devel/electron42/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 42.3.2 +ELECTRON_VER= 42.3.3 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron42/distinfo b/devel/electron42/distinfo index 64356d931530..cc7ba38c6cc9 100644 --- a/devel/electron42/distinfo +++ b/devel/electron42/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1780427435 +TIMESTAMP = 1780902060 SHA256 (electron/chromium-148.0.7778.218-lite.tar.xz) = 9ef5529ee99461ec74fca7582fbd9db81e88d702ff6c3d19d0db12944c0c0b35 SIZE (electron/chromium-148.0.7778.218-lite.tar.xz) = 1593163700 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 @@ -337,10 +337,10 @@ 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.3.2-node-modules.tar.xz) = e102aed0f760c44a06cc3ff83b021ad0948b1ef5ffa275fe305d1e720ada9d31 -SIZE (electron/electron42-42.3.2-node-modules.tar.xz) = 71041981 -SHA256 (electron/electron-electron-v42.3.2_GH0.tar.gz) = de837279aca38273391046e3780de350426db093d2f906b3f06faa7ce7a9077b -SIZE (electron/electron-electron-v42.3.2_GH0.tar.gz) = 18820240 +SHA256 (electron/electron42-42.3.3-node-modules.tar.xz) = fb701440d9f0c7f5e4a7d45c2365ffc64fab9bba66c5fdfe33f0a63397f96205 +SIZE (electron/electron42-42.3.3-node-modules.tar.xz) = 71016077 +SHA256 (electron/electron-electron-v42.3.3_GH0.tar.gz) = c019addb5d2f25c8570a2237be17fe5a3181220f19532986c5462c5e9c443428 +SIZE (electron/electron-electron-v42.3.3_GH0.tar.gz) = 18875958 SHA256 (electron/nodejs-node-v24.15.0_GH0.tar.gz) = 5cfb169b21878f50876e0c6a77db1a5e40d733960232682bebb5e267246a2e80 SIZE (electron/nodejs-node-v24.15.0_GH0.tar.gz) = 126716937 SHA256 (electron/nodejs-nan-675cefebca42410733da8a454c8d9391fcebfbc2_GH0.tar.gz) = 3983c68f19ed75dd37dc228eab385093ae2533132730f253f0c3d19ff10788e3 diff --git a/devel/electron42/files/packagejsons/package.json b/devel/electron42/files/packagejsons/package.json index 973ba98b3bae..04dc40d03d28 100644 --- a/devel/electron42/files/packagejsons/package.json +++ b/devel/electron42/files/packagejsons/package.json @@ -143,7 +143,8 @@ "dbus-native/xml2js": "0.5.0", "abstract-socket": "github:deepak1556/node-abstractsocket#928cc591decd12aff7dad96449da8afc29832c19", "minimist@npm:~0.0.1": "0.2.4", - "put": "npm:@nornagon/put@0.0.8" + "put": "npm:@nornagon/put@0.0.8", + "get-intrinsic": "^1.3.0" }, "packageManager": "yarn@4.12.0", "workspaces": [ diff --git a/devel/electron42/files/packagejsons/spec/fixtures/api/js2c-code-cache/app/package.json b/devel/electron42/files/packagejsons/spec/fixtures/api/js2c-code-cache/app/package.json new file mode 100644 index 000000000000..cd0054dd36c7 --- /dev/null +++ b/devel/electron42/files/packagejsons/spec/fixtures/api/js2c-code-cache/app/package.json @@ -0,0 +1,4 @@ +{ + "name": "electron-test-js2c-code-cache", + "main": "main.js" +} diff --git a/devel/electron42/files/packagejsons/yarn.lock b/devel/electron42/files/packagejsons/yarn.lock index 3e6f3d426183..b365ca4056cd 100644 --- a/devel/electron42/files/packagejsons/yarn.lock +++ b/devel/electron42/files/packagejsons/yarn.lock @@ -5993,32 +5993,7 @@ __metadata: languageName: node linkType: hard -"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0": - version: 1.2.1 - resolution: "get-intrinsic@npm:1.2.1" - dependencies: - function-bind: "npm:^1.1.1" - has: "npm:^1.0.3" - has-proto: "npm:^1.0.1" - has-symbols: "npm:^1.0.3" - checksum: 10c0/49eab47f9de8f1a4f9b458b8b74ee5199fb2614414a91973eb175e07db56b52b6df49b255cc7ff704cb0786490fb93bfe8f2ad138b590a8de09b47116a366bc9 - languageName: node - linkType: hard - -"get-intrinsic@npm:^1.2.4": - version: 1.2.4 - resolution: "get-intrinsic@npm:1.2.4" - dependencies: - es-errors: "npm:^1.3.0" - function-bind: "npm:^1.1.2" - has-proto: "npm:^1.0.1" - has-symbols: "npm:^1.0.3" - hasown: "npm:^2.0.0" - checksum: 10c0/0a9b82c16696ed6da5e39b1267104475c47e3a9bdbe8b509dfe1710946e38a87be70d759f4bb3cda042d76a41ef47fe769660f3b7c0d1f68750299344ffb15b7 - languageName: node - linkType: hard - -"get-intrinsic@npm:^1.2.6": +"get-intrinsic@npm:^1.3.0": version: 1.3.0 resolution: "get-intrinsic@npm:1.3.0" dependencies: @@ -6435,7 +6410,7 @@ __metadata: languageName: node linkType: hard -"hasown@npm:^2.0.0, hasown@npm:^2.0.2": +"hasown@npm:^2.0.2": version: 2.0.2 resolution: "hasown@npm:2.0.2" dependencies: diff --git a/devel/electron42/files/patch-build_config_compiler_BUILD.gn b/devel/electron42/files/patch-build_config_compiler_BUILD.gn index d1151590938c..5b5b3643a5ff 100644 --- a/devel/electron42/files/patch-build_config_compiler_BUILD.gn +++ b/devel/electron42/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2026-04-28 21:06:17 UTC +--- build/config/compiler/BUILD.gn.orig 2026-06-08 07:06:35 UTC +++ build/config/compiler/BUILD.gn @@ -202,7 +202,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of @@ -56,7 +56,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1338,7 +1345,7 @@ config("compiler_cpu_abi") { +@@ -1348,7 +1355,7 @@ config("compiler_cpu_abi") { # CPU architecture. We may or may not be doing a cross compile now, so for # simplicity we always explicitly set the architecture. if (current_cpu == "x64") { @@ -65,7 +65,7 @@ cflags += [ "--target=x86_64-unknown-linux-gnu" ] ldflags += [ "--target=x86_64-unknown-linux-gnu" ] } else { -@@ -1352,7 +1359,7 @@ config("compiler_cpu_abi") { +@@ -1362,7 +1369,7 @@ config("compiler_cpu_abi") { ldflags += [ "-march=$cros_target_cpu_arch" ] } } else if (current_cpu == "x86") { @@ -74,7 +74,7 @@ cflags += [ "--target=i386-unknown-linux-gnu" ] ldflags += [ "--target=i386-unknown-linux-gnu" ] } else { -@@ -1364,7 +1371,7 @@ config("compiler_cpu_abi") { +@@ -1374,7 +1381,7 @@ config("compiler_cpu_abi") { "-msse3", ] } else if (current_cpu == "arm") { @@ -83,7 +83,7 @@ cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] } -@@ -1373,7 +1380,7 @@ config("compiler_cpu_abi") { +@@ -1383,7 +1390,7 @@ config("compiler_cpu_abi") { "-mfloat-abi=$arm_float_abi", ] } else if (current_cpu == "arm64") { @@ -92,7 +92,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1785,7 +1792,7 @@ config("clang_revision") { +@@ -1795,7 +1802,7 @@ config("clang_revision") { } config("clang_revision") { @@ -101,7 +101,7 @@ current_os != "zos") { _perform_consistency_checks = current_toolchain == default_toolchain if (llvm_force_head_revision) { -@@ -1910,13 +1917,13 @@ config("sanitize_c_array_bounds") { +@@ -1920,13 +1927,13 @@ config("sanitize_c_array_bounds") { # sanitizer) is enabled, they then do expensive debug like operations. We # want to suppress this behaviour since we want to keep performance costs # as low as possible while having these checks. @@ -117,7 +117,7 @@ ] } } -@@ -1934,7 +1941,7 @@ config("sanitize_return") { +@@ -1944,7 +1951,7 @@ config("sanitize_return") { # sanitizer) is enabled, they then do expensive debug like operations. We # want to suppress this behaviour since we want to keep performance costs # as low as possible while having these checks. @@ -126,7 +126,7 @@ ] } } -@@ -3078,7 +3085,7 @@ config("afdo") { +@@ -3088,7 +3095,7 @@ config("afdo") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -135,7 +135,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -3105,7 +3112,7 @@ config("afdo") { +@@ -3115,7 +3122,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } diff --git a/devel/electron42/files/patch-content_public_browser_content__browser__client.cc b/devel/electron42/files/patch-content_public_browser_content__browser__client.cc index dc255fc7f959..514ec6d558ac 100644 --- a/devel/electron42/files/patch-content_public_browser_content__browser__client.cc +++ b/devel/electron42/files/patch-content_public_browser_content__browser__client.cc @@ -1,6 +1,6 @@ ---- content/public/browser/content_browser_client.cc.orig 2026-05-12 08:53:52 UTC +--- content/public/browser/content_browser_client.cc.orig 2026-06-08 07:06:35 UTC +++ content/public/browser/content_browser_client.cc -@@ -1414,7 +1414,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1428,7 +1428,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem // that can be adequately sandboxed. // Currently Android's network service will not run out of process or sandboxed, // so OutOfProcessSystemDnsResolution is not currently enabled on Android. diff --git a/devel/electron42/files/patch-electron_BUILD.gn b/devel/electron42/files/patch-electron_BUILD.gn index 5522d7b45455..6e7b70eb34a1 100644 --- a/devel/electron42/files/patch-electron_BUILD.gn +++ b/devel/electron42/files/patch-electron_BUILD.gn @@ -1,6 +1,6 @@ ---- electron/BUILD.gn.orig 2026-06-02 04:24:22 UTC +--- electron/BUILD.gn.orig 2026-06-03 19:18:10 UTC +++ electron/BUILD.gn -@@ -583,7 +583,7 @@ source_set("electron_lib") { +@@ -601,7 +601,7 @@ source_set("electron_lib") { defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ] } @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app", "//components/crash/core/browser", -@@ -684,6 +684,12 @@ source_set("electron_lib") { +@@ -715,6 +715,12 @@ source_set("electron_lib") { cflags_objcc = [ "-fobjc-weak" ] } } @@ -22,7 +22,7 @@ if (is_linux) { libs = [ "xshmfence" ] deps += [ -@@ -1302,7 +1308,7 @@ if (is_mac) { +@@ -1495,7 +1501,7 @@ if (is_mac) { ":electron_lib", ":electron_win32_resources", ":packed_resources", @@ -31,7 +31,7 @@ "//content:sandbox_helper_win", "//electron/buildflags", "//third_party/electron_node:libnode", -@@ -1329,7 +1335,7 @@ if (is_mac) { +@@ -1522,7 +1528,7 @@ if (is_mac) { public_deps = [ "//tools/v8_context_snapshot" ] } @@ -40,7 +40,7 @@ data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] } -@@ -1396,7 +1402,7 @@ if (is_mac) { +@@ -1589,7 +1595,7 @@ if (is_mac) { configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } @@ -49,7 +49,7 @@ deps += [ "//sandbox/linux:chrome_sandbox" ] } } -@@ -1517,7 +1523,9 @@ dist_zip("electron_dist_zip") { +@@ -1710,7 +1716,9 @@ dist_zip("electron_dist_zip") { ] } diff --git a/devel/electron42/files/patch-electron_lib_browser_rpc-server.ts b/devel/electron42/files/patch-electron_lib_browser_rpc-server.ts index c36dcea19343..e2440444288b 100644 --- a/devel/electron42/files/patch-electron_lib_browser_rpc-server.ts +++ b/devel/electron42/files/patch-electron_lib_browser_rpc-server.ts @@ -1,6 +1,6 @@ ---- electron/lib/browser/rpc-server.ts.orig 2025-09-02 20:56:04 UTC +--- electron/lib/browser/rpc-server.ts.orig 2026-06-03 19:18:10 UTC +++ electron/lib/browser/rpc-server.ts -@@ -34,7 +34,7 @@ const allowedClipboardMethods = (() => { +@@ -33,7 +33,7 @@ const allowedClipboardMethods = (() => { switch (process.platform) { case 'darwin': return new Set(['readFindText', 'writeFindText']); 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 67fc47c24571..74f5b28a5452 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,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2026-05-08 13:54:01 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2026-06-03 19:18:10 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc -@@ -168,11 +168,11 @@ +@@ -174,11 +174,11 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -14,7 +14,7 @@ #include "ui/aura/window.h" #include "ui/gfx/font_render_params.h" #endif -@@ -204,7 +204,7 @@ +@@ -210,7 +210,7 @@ #include "content/public/browser/plugin_service.h" #endif @@ -23,7 +23,7 @@ #include "chrome/browser/hang_monitor/hang_crash_dump.h" // nogncheck #endif -@@ -641,7 +641,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval( +@@ -647,7 +647,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval( ui::TextInsertionCaretBlinkPeriodFromDefaults()); if (system_value) return *system_value; @@ -32,7 +32,7 @@ if (auto* native_theme = ui::NativeTheme::GetInstanceForNativeUi()) return native_theme->caret_blink_interval(); #elif BUILDFLAG(IS_WIN) -@@ -1016,7 +1016,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -1022,7 +1022,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)); -@@ -2888,13 +2888,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2968,13 +2968,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); -@@ -3604,7 +3604,7 @@ void WebContents::Focus() { +@@ -3684,7 +3684,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 -@@ -4505,7 +4505,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4585,7 +4585,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron42/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron42/files/patch-electron_shell_browser_api_electron__api__web__contents.h index 0463534cd6e8..67e9a78e02f3 100644 --- a/devel/electron42/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron42/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 2026-03-17 08:46:52 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2026-06-03 19:18:10 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -753,7 +753,7 @@ class WebContents final : public ExclusiveAccessContex +@@ -758,7 +758,7 @@ class WebContents final : public ExclusiveAccessContex #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC) ui::ImageModel GetDevToolsWindowIcon() override; #endif diff --git a/devel/electron42/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron42/files/patch-electron_shell_browser_electron__browser__main__parts.cc index eddb091d8c1e..f485159d9626 100644 --- a/devel/electron42/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron42/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2026-05-08 13:54:01 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2026-06-03 19:18:10 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -78,7 +78,7 @@ #include "ui/wm/core/wm_state.h" @@ -27,7 +27,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -320,7 +320,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -331,7 +331,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { // happen before the ResourceBundle is loaded if (locale.empty()) l10n_util::OverrideLocaleWithCocoaLocale(); @@ -36,7 +36,7 @@ // l10n_util::GetApplicationLocaleInternal uses g_get_language_names(), // which keys off of getenv("LC_ALL"). // We must set this env first to make ui::ResourceBundle accept the custom -@@ -349,7 +349,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -360,7 +360,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { ElectronBrowserClient::SetApplicationLocale(app_locale); fake_browser_process_->SetApplicationLocale(app_locale); @@ -45,7 +45,7 @@ // Reset to the original LC_ALL since we should not be changing it. if (!locale.empty()) { if (lc_all) -@@ -405,7 +405,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() { +@@ -416,7 +416,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() { } void ElectronBrowserMainParts::ToolkitInitialized() { @@ -54,7 +54,7 @@ auto* linux_ui = ui::GetDefaultLinuxUi(); CHECK(linux_ui); linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>(); -@@ -516,7 +516,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -527,7 +527,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo } void ElectronBrowserMainParts::PostCreateMainMessageLoop() { @@ -63,7 +63,7 @@ std::string app_name = electron::Browser::Get()->GetName(); #endif #if BUILDFLAG(IS_LINUX) -@@ -528,7 +528,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -539,7 +539,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo if (!bluez::BluezDBusManager::IsInitialized()) bluez::DBusBluezManagerWrapperLinux::Initialize(); @@ -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. -@@ -625,7 +627,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -636,7 +638,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron42/files/patch-electron_shell_browser_ui_views_frameless__view.cc b/devel/electron42/files/patch-electron_shell_browser_ui_views_frameless__view.cc index 6f61a519984b..5e8c088684d2 100644 --- a/devel/electron42/files/patch-electron_shell_browser_ui_views_frameless__view.cc +++ b/devel/electron42/files/patch-electron_shell_browser_ui_views_frameless__view.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/ui/views/frameless_view.cc.orig 2026-05-26 16:24:13 UTC +--- electron/shell/browser/ui/views/frameless_view.cc.orig 2026-06-03 19:18:10 UTC +++ electron/shell/browser/ui/views/frameless_view.cc -@@ -119,7 +119,7 @@ gfx::Size FramelessView::GetMaximumSize() const { +@@ -118,7 +118,7 @@ gfx::Size FramelessView::GetMaximumSize() const { return window_->GetMaximumSize(); } diff --git a/devel/electron42/files/patch-electron_shell_browser_ui_views_frameless__view.h b/devel/electron42/files/patch-electron_shell_browser_ui_views_frameless__view.h index 2d2a8aae157c..43fadd71eff8 100644 --- a/devel/electron42/files/patch-electron_shell_browser_ui_views_frameless__view.h +++ b/devel/electron42/files/patch-electron_shell_browser_ui_views_frameless__view.h @@ -1,4 +1,4 @@ ---- electron/shell/browser/ui/views/frameless_view.h.orig 2026-05-26 16:24:13 UTC +--- electron/shell/browser/ui/views/frameless_view.h.orig 2026-06-03 19:18:10 UTC +++ electron/shell/browser/ui/views/frameless_view.h @@ -10,7 +10,7 @@ #include "ui/gfx/geometry/insets.h" @@ -9,7 +9,7 @@ #include "shell/browser/ui/views/linux_frame_layout.h" #endif -@@ -44,7 +44,7 @@ class FramelessView : public views::FrameView { +@@ -47,7 +47,7 @@ class FramelessView : public views::FrameView { // bounds of the view, used for CSD and resize targets on some platforms. virtual gfx::Insets RestoredFrameBorderInsets() const; diff --git a/devel/electron42/files/patch-electron_shell_common_node__bindings.cc b/devel/electron42/files/patch-electron_shell_common_node__bindings.cc index ae149f89c82c..1d3404194d7a 100644 --- a/devel/electron42/files/patch-electron_shell_common_node__bindings.cc +++ b/devel/electron42/files/patch-electron_shell_common_node__bindings.cc @@ -1,7 +1,7 @@ ---- electron/shell/common/node_bindings.cc.orig 2026-05-19 01:17:05 UTC +--- electron/shell/common/node_bindings.cc.orig 2026-06-03 19:18:10 UTC +++ electron/shell/common/node_bindings.cc -@@ -53,7 +53,7 @@ - #include "third_party/electron_node/src/module_wrap.h" +@@ -55,7 +55,7 @@ + #include "third_party/electron_node/src/node_snapshot_builder.h" #include "v8/include/v8-statistics.h" -#if !IS_MAS_BUILD() @@ -9,7 +9,7 @@ #include "shell/common/crash_keys.h" #endif -@@ -170,7 +170,7 @@ void V8FatalErrorCallback(const char* location, const +@@ -172,7 +172,7 @@ void V8FatalErrorCallback(const char* location, const void V8FatalErrorCallback(const char* location, const char* message) { LOG(ERROR) << "Fatal error in V8: " << location << " " << message; @@ -18,7 +18,7 @@ electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message); electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location); #endif -@@ -192,7 +192,7 @@ void V8OOMErrorCallback(const char* location, const v8 +@@ -194,7 +194,7 @@ void V8OOMErrorCallback(const char* location, const v8 LOG(ERROR) << "OOM detail: " << details.detail; } @@ -27,7 +27,7 @@ electron::crash_keys::SetCrashKey("electron.v8-oom.is_heap_oom", base::NumberToString(details.is_heap_oom)); if (location) { -@@ -684,7 +684,7 @@ void NodeBindings::Initialize(v8::Isolate* const isola +@@ -686,7 +686,7 @@ void NodeBindings::Initialize(v8::Isolate* const isola TRACE_EVENT0("electron", "NodeBindings::Initialize"); // Open node's error reporting system for browser process. 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 f21c79e9b8c5..ead7f7c80df5 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,6 +1,6 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2026-05-08 13:54:01 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2026-06-03 19:18:10 UTC +++ electron/spec/api-browser-window-spec.ts -@@ -88,7 +88,7 @@ describe('BrowserWindow module', () => { +@@ -89,7 +89,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); }); @@ -9,7 +9,7 @@ const appPath = path.join(fixtures, 'apps', 'xwindow-icon'); const appProcess = childProcess.spawn(process.execPath, [appPath]); await once(appProcess, 'exit'); -@@ -345,7 +345,7 @@ describe('BrowserWindow module', () => { +@@ -346,7 +346,7 @@ describe('BrowserWindow module', () => { }); }); @@ -18,7 +18,7 @@ afterEach(closeAllWindows); it('can set content protection', async () => { const w = new BrowserWindow({ show: false }); -@@ -1334,7 +1334,7 @@ describe('BrowserWindow module', () => { +@@ -1335,7 +1335,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.minimize()', () => { // TODO(codebytere): Enable for Linux once maximize/minimize events work in CI. @@ -27,7 +27,7 @@ const minimize = once(w, 'minimize'); w.minimize(); await minimize; -@@ -1351,7 +1351,7 @@ describe('BrowserWindow module', () => { +@@ -1352,7 +1352,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable for Linux once CI plays nice with these kinds of tests @@ -36,7 +36,7 @@ const maximize = once(w, 'maximize'); const shown = once(w, 'show'); w.maximize(); -@@ -1416,7 +1416,7 @@ describe('BrowserWindow module', () => { +@@ -1417,7 +1417,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(true); }); @@ -45,7 +45,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1519,7 +1519,7 @@ describe('BrowserWindow module', () => { +@@ -1520,7 +1520,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(false); }); @@ -54,7 +54,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -2038,7 +2038,7 @@ describe('BrowserWindow module', () => { +@@ -2039,7 +2039,7 @@ describe('BrowserWindow module', () => { }); }); @@ -63,7 +63,7 @@ it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = once(w, 'maximize'); -@@ -2256,7 +2256,7 @@ describe('BrowserWindow module', () => { +@@ -2257,7 +2257,7 @@ describe('BrowserWindow module', () => { }); }); @@ -72,7 +72,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -3364,7 +3364,7 @@ describe('BrowserWindow module', () => { +@@ -3365,7 +3365,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); -@@ -3390,7 +3390,7 @@ describe('BrowserWindow module', () => { +@@ -3391,7 +3391,7 @@ describe('BrowserWindow module', () => { }); }); @@ -90,7 +90,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3630,7 +3630,7 @@ describe('BrowserWindow module', () => { +@@ -3631,7 +3631,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(); -@@ -3697,7 +3697,7 @@ describe('BrowserWindow module', () => { +@@ -3698,7 +3698,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(); -@@ -4399,7 +4399,7 @@ describe('BrowserWindow module', () => { +@@ -4593,7 +4593,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 { -@@ -4915,7 +4915,7 @@ describe('BrowserWindow module', () => { +@@ -5109,7 +5109,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 }); -@@ -5191,7 +5191,7 @@ describe('BrowserWindow module', () => { +@@ -5385,7 +5385,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({}); -@@ -5209,7 +5209,7 @@ describe('BrowserWindow module', () => { +@@ -5403,7 +5403,7 @@ describe('BrowserWindow module', () => { } ); @@ -144,7 +144,7 @@ const w = new BrowserWindow({ show: false }); w.show(); -@@ -5232,7 +5232,7 @@ describe('BrowserWindow module', () => { +@@ -5426,7 +5426,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 }); -@@ -5269,7 +5269,7 @@ describe('BrowserWindow module', () => { +@@ -5463,7 +5463,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(); -@@ -5767,7 +5767,7 @@ describe('BrowserWindow module', () => { +@@ -5961,7 +5961,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'); -@@ -6020,7 +6020,7 @@ describe('BrowserWindow module', () => { +@@ -6214,7 +6214,7 @@ describe('BrowserWindow module', () => { }); }); @@ -180,7 +180,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -7338,7 +7338,7 @@ describe('BrowserWindow module', () => { +@@ -7532,7 +7532,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); diff --git a/devel/electron42/files/patch-v8_src_api_api.cc b/devel/electron42/files/patch-v8_src_api_api.cc index 6d9f351314c7..20acd5a372e1 100644 --- a/devel/electron42/files/patch-v8_src_api_api.cc +++ b/devel/electron42/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2026-04-28 21:06:17 UTC +--- v8/src/api/api.cc.orig 2026-06-08 07:06:36 UTC +++ v8/src/api/api.cc @@ -167,7 +167,7 @@ @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6372,7 +6372,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6369,7 +6369,7 @@ bool v8::V8::Initialize(const int build_config) { return true; }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a27f1b9.317c3.32dfabb1>