diff --git a/devel/electron42/Makefile b/devel/electron42/Makefile index 8dafb555f81d..5f997b3be784 100644 --- a/devel/electron42/Makefile +++ b/devel/electron42/Makefile @@ -4,7 +4,7 @@ DISTVERSION= ${ELECTRON_VER} PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= devel -MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v42.5.0/:chromium \ +MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v42.6.0/:chromium \ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \ @@ -225,9 +225,9 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER -CHROMIUM_VER= 148.0.7778.271 +CHROMIUM_VER= 148.0.7778.280 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 24.17.0 +NODE_VER= 24.18.0 # 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 6426cb5219c2..1646688960f2 100644 --- a/devel/electron42/Makefile.version +++ b/devel/electron42/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 42.5.1 +ELECTRON_VER= 42.6.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron42/distinfo b/devel/electron42/distinfo index 9fb86b8a7d05..54fef64ad06c 100644 --- a/devel/electron42/distinfo +++ b/devel/electron42/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1782822192 -SHA256 (electron/chromium-148.0.7778.271.tar.xz.0) = 6cdfd5bdece5928abc5ab8cfc0292b42b51eeb6d0241ba5986d452fe5d08cadd -SIZE (electron/chromium-148.0.7778.271.tar.xz.0) = 2000000000 -SHA256 (electron/chromium-148.0.7778.271.tar.xz.1) = 106bb8cb75ca1f6b925d2ce5da8106fbc253b90d922952add52871ffc5eaa1bc -SIZE (electron/chromium-148.0.7778.271.tar.xz.1) = 2000000000 -SHA256 (electron/chromium-148.0.7778.271.tar.xz.2) = fc35d431d4aa6d532819582192649e7fdaef1bda31c8211ebca0dd1569e0498e -SIZE (electron/chromium-148.0.7778.271.tar.xz.2) = 778485400 +TIMESTAMP = 1783335563 +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 +SIZE (electron/chromium-148.0.7778.280.tar.xz.1) = 2000000000 +SHA256 (electron/chromium-148.0.7778.280.tar.xz.2) = 252c5e676bb414ad9aa80399b3123a1ef9ead25aaf803d263413e724f0d485da +SIZE (electron/chromium-148.0.7778.280.tar.xz.2) = 778320896 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 SHA256 (electron/rust/crates/Inflector-0.11.4.crate) = fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3 @@ -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.5.1-node-modules.tar.xz) = 73224ef31205c29739c6d35f93129f0ab290bf714d59e1461fc675c070aac933 -SIZE (electron/electron42-42.5.1-node-modules.tar.xz) = 71097369 -SHA256 (electron/electron-electron-v42.5.1_GH0.tar.gz) = cc3411c194b179c18bfd9572de3ad13e6f43cb51ea13dc38c16844e29c1388d4 -SIZE (electron/electron-electron-v42.5.1_GH0.tar.gz) = 18920548 -SHA256 (electron/nodejs-node-v24.17.0_GH0.tar.gz) = 63ff9610929c96453b09914fb5fb37a46cd5f54a6f5147213d31b43e08850b44 -SIZE (electron/nodejs-node-v24.17.0_GH0.tar.gz) = 127311158 +SHA256 (electron/electron42-42.6.0-node-modules.tar.xz) = 73224ef31205c29739c6d35f93129f0ab290bf714d59e1461fc675c070aac933 +SIZE (electron/electron42-42.6.0-node-modules.tar.xz) = 71097369 +SHA256 (electron/electron-electron-v42.6.0_GH0.tar.gz) = bc5e9b086f95184505c1f5409bff30fe18abac8d5bfe29a941462bb88990a94a +SIZE (electron/electron-electron-v42.6.0_GH0.tar.gz) = 18999823 +SHA256 (electron/nodejs-node-v24.18.0_GH0.tar.gz) = e07dd419efe30a89b90d872a956d074f4197fd103781bc06e0fce99d0130ad01 +SIZE (electron/nodejs-node-v24.18.0_GH0.tar.gz) = 127522062 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-components_password__manager_core_browser_password__autofill__manager.h b/devel/electron42/files/patch-components_password__manager_core_browser_password__autofill__manager.h index fa57682f1b65..3a27c8af5bcb 100644 --- a/devel/electron42/files/patch-components_password__manager_core_browser_password__autofill__manager.h +++ b/devel/electron42/files/patch-components_password__manager_core_browser_password__autofill__manager.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_autofill_manager.h.orig 2026-04-28 21:06:17 UTC +--- components/password_manager/core/browser/password_autofill_manager.h.orig 2026-06-22 21:26:00 UTC +++ components/password_manager/core/browser/password_autofill_manager.h -@@ -290,7 +290,7 @@ class PasswordAutofillManager : public autofill::Autof +@@ -296,7 +296,7 @@ class PasswordAutofillManager : public autofill::Autof // Stores the controller of warning popup UI on cross domain filling. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/devel/electron42/files/patch-electron_BUILD.gn b/devel/electron42/files/patch-electron_BUILD.gn index 6e7b70eb34a1..fc5453a840df 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-03 19:18:10 UTC +--- electron/BUILD.gn.orig 2026-07-02 19:37:32 UTC +++ electron/BUILD.gn -@@ -601,7 +601,7 @@ source_set("electron_lib") { +@@ -609,7 +609,7 @@ source_set("electron_lib") { defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ] } @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app", "//components/crash/core/browser", -@@ -715,6 +715,12 @@ source_set("electron_lib") { +@@ -723,6 +723,12 @@ source_set("electron_lib") { cflags_objcc = [ "-fobjc-weak" ] } } @@ -22,7 +22,7 @@ if (is_linux) { libs = [ "xshmfence" ] deps += [ -@@ -1495,7 +1501,7 @@ if (is_mac) { +@@ -1503,7 +1509,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", -@@ -1522,7 +1528,7 @@ if (is_mac) { +@@ -1530,7 +1536,7 @@ if (is_mac) { public_deps = [ "//tools/v8_context_snapshot" ] } @@ -40,7 +40,7 @@ data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] } -@@ -1589,7 +1595,7 @@ if (is_mac) { +@@ -1597,7 +1603,7 @@ if (is_mac) { configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } @@ -49,7 +49,7 @@ deps += [ "//sandbox/linux:chrome_sandbox" ] } } -@@ -1710,7 +1716,9 @@ dist_zip("electron_dist_zip") { +@@ -1718,7 +1724,9 @@ dist_zip("electron_dist_zip") { ] } diff --git a/devel/electron42/files/patch-electron_build_args_all.gn b/devel/electron42/files/patch-electron_build_args_all.gn index 4556cf435392..81dfffa30248 100644 --- a/devel/electron42/files/patch-electron_build_args_all.gn +++ b/devel/electron42/files/patch-electron_build_args_all.gn @@ -1,6 +1,6 @@ ---- electron/build/args/all.gn.orig 2025-04-04 05:26:44 UTC +--- electron/build/args/all.gn.orig 2026-07-02 19:37:32 UTC +++ electron/build/args/all.gn -@@ -14,8 +14,8 @@ enable_cdm_host_verification = false +@@ -17,8 +17,8 @@ enable_cdm_host_verification = false v8_enable_javascript_promise_hooks = true enable_cdm_host_verification = false 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 7f8f1b735609..cfceb114e64b 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-06-09 06:05:33 UTC +--- 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 -@@ -174,11 +174,11 @@ +@@ -175,11 +175,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 -@@ -210,7 +210,7 @@ +@@ -211,7 +211,7 @@ #include "content/public/browser/plugin_service.h" #endif @@ -23,7 +23,7 @@ #include "chrome/browser/hang_monitor/hang_crash_dump.h" // nogncheck #endif -@@ -647,7 +647,7 @@ std::optional GetCursorBlinkInterval( +@@ -648,7 +648,7 @@ std::optional 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) -@@ -1022,7 +1022,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -1033,7 +1033,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)); -@@ -2982,13 +2982,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -3005,13 +3005,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); -@@ -3698,7 +3698,7 @@ void WebContents::Focus() { +@@ -3721,7 +3721,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 -@@ -4599,7 +4599,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4622,7 +4622,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron42/files/patch-electron_spec_crash-spec.ts b/devel/electron42/files/patch-electron_spec_crash-spec.ts index 0195437cebba..f886f990f0a0 100644 --- a/devel/electron42/files/patch-electron_spec_crash-spec.ts +++ b/devel/electron42/files/patch-electron_spec_crash-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/crash-spec.ts.orig 2026-05-07 20:19:20 UTC +--- electron/spec/crash-spec.ts.orig 2026-07-02 19:37:32 UTC +++ electron/spec/crash-spec.ts -@@ -52,7 +52,7 @@ const shouldRunCase = (crashCase: string) => { +@@ -53,7 +53,7 @@ const shouldRunCase = (crashCase: string) => { if (process.platform === 'win32') { return process.arch !== 'ia32'; } else { diff --git a/devel/electron42/files/patch-electron_spec_node-spec.ts b/devel/electron42/files/patch-electron_spec_node-spec.ts index 20b1e8c82e3b..864f1418b24f 100644 --- a/devel/electron42/files/patch-electron_spec_node-spec.ts +++ b/devel/electron42/files/patch-electron_spec_node-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/node-spec.ts.orig 2026-05-07 20:19:20 UTC +--- electron/spec/node-spec.ts.orig 2026-07-02 19:37:32 UTC +++ electron/spec/node-spec.ts -@@ -206,7 +206,7 @@ describe('node feature', () => { +@@ -207,7 +207,7 @@ describe('node feature', () => { }); describe('child_process.exec', () => { diff --git a/devel/electron42/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/devel/electron42/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index 09b7e051b13b..df30e4d5e34b 100644 --- a/devel/electron42/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/devel/electron42/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2026-06-24 12:54:01 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2026-07-06 11:02:38 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2866,7 +2866,7 @@ std::unique_ptr GLES2Decoder::Create( +@@ -3018,7 +3018,7 @@ std::unique_ptr GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/devel/electron42/files/patch-ui_ozone_platform_x11_x11__window.cc b/devel/electron42/files/patch-ui_ozone_platform_x11_x11__window.cc index 6f439d60eee5..85fc566682bd 100644 --- a/devel/electron42/files/patch-ui_ozone_platform_x11_x11__window.cc +++ b/devel/electron42/files/patch-ui_ozone_platform_x11_x11__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/x11_window.cc.orig 2026-01-27 00:55:35 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2026-07-06 11:02:39 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1505,7 +1505,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1533,7 +1533,7 @@ void X11Window::OnXWindowStateChanged() { WindowTiledEdges tiled_state = GetTiledState(); if (tiled_state != tiled_state_) { tiled_state_ = tiled_state; diff --git a/devel/electron42/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/devel/electron42/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index ca77f56b60b8..05c32384d865 100644 --- a/devel/electron42/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/devel/electron42/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2026-06-10 20:03:19 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2026-06-22 21:26:00 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -51,7 +51,7 @@ #include "ui/wm/core/window_util.h" @@ -18,7 +18,7 @@ std::make_unique(window(), drag_handler); #else std::make_unique(window(), drag_handler); -@@ -1248,7 +1248,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1264,7 +1264,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits.