From 17b68db36a2a26bbfe9e45650d0632b840e72b64 Mon Sep 17 00:00:00 2001 From: Hiroki Tagato Date: Thu, 19 Mar 2026 13:00:05 +0900 Subject: [PATCH] devel/electron39: Update to 39.8.3 Changelog: - https://github.com/electron/electron/releases/tag/v39.8.1 - https://github.com/electron/electron/releases/tag/v39.8.2 - https://github.com/electron/electron/releases/tag/v39.8.3 Reported by: GitHub (watch releases) --- devel/electron39/Makefile | 4 ++- devel/electron39/Makefile.version | 2 +- devel/electron39/distinfo | 14 +++++----- .../files/patch-electron_filenames.gni | 4 +-- ...-electron_lib_browser_api_power-monitor.ts | 6 ++--- ...owser_api_electron__api__power__monitor.cc | 6 ++--- ...shell_browser_api_electron__api__screen.cc | 17 +++++++++--- ...rowser_api_electron__api__web__contents.cc | 8 +++--- ...browser_api_electron__api__web__contents.h | 4 +-- .../patch-electron_shell_browser_browser.cc | 6 ++--- .../patch-electron_shell_browser_browser.h | 6 ++--- ...-electron_shell_browser_linux_x11__util.cc | 20 ++++++++++++++ ...ron_shell_browser_native__window__views.cc | 26 +++++++++---------- ...l_browser_ui_inspectable__web__contents.cc | 4 +-- .../files/patch-electron_spec_api-app-spec.ts | 10 +++---- ...h-electron_spec_api-browser-window-spec.ts | 13 ++-------- 16 files changed, 86 insertions(+), 64 deletions(-) create mode 100644 devel/electron39/files/patch-electron_shell_browser_linux_x11__util.cc diff --git a/devel/electron39/Makefile b/devel/electron39/Makefile index 6557640b2843..b3f7782d4425 100644 --- a/devel/electron39/Makefile +++ b/devel/electron39/Makefile @@ -225,7 +225,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER CHROMIUM_VER= 142.0.7444.265 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 22.22.0 +NODE_VER= 22.22.1 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER @@ -330,6 +330,8 @@ post-extract: ${WRKSRC}/third_party/engflow-reclient-configs pre-patch: + ${REINPLACE_CMD} -e 's|src/third_party/angle/src|src/third_party/angle|' \ + ${WRKSRC}/electron/patches/config.json ${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC} # ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete # ${FIND} ${WRKSRC} -type f -name '*~' -print -delete diff --git a/devel/electron39/Makefile.version b/devel/electron39/Makefile.version index 0e1e39305a66..21579ecd6824 100644 --- a/devel/electron39/Makefile.version +++ b/devel/electron39/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 39.8.0 +ELECTRON_VER= 39.8.3 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron39/distinfo b/devel/electron39/distinfo index 9e8a43cc9815..34d969b86e41 100644 --- a/devel/electron39/distinfo +++ b/devel/electron39/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1772890775 +TIMESTAMP = 1773831601 SHA256 (electron/chromium-142.0.7444.265.tar.xz.0) = 54ca3cf92f6a207a4e1b46fe016da7d515097f999b5e53ba4201adc906ae383e SIZE (electron/chromium-142.0.7444.265.tar.xz.0) = 2000000000 SHA256 (electron/chromium-142.0.7444.265.tar.xz.1) = 289722408b81d862eb63f98cf47516308add8e18f5d62d2455c98942a2ebface @@ -9,12 +9,12 @@ SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 SHA256 (electron/yarn-4.12.0.tgz) = bd58d06826ce9542c4cd904fe10bab7bc718ea2cc39a45d9fbd15f2edb45761c SIZE (electron/yarn-4.12.0.tgz) = 1056794 -SHA256 (electron/electron39-39.8.0-node-modules.tar.xz) = 0f539cfddfd0cbcf8df0e5a974a0c2a7cf812d7c1fd10ba2148a69265412ad5a -SIZE (electron/electron39-39.8.0-node-modules.tar.xz) = 59894046 -SHA256 (electron/electron-electron-v39.8.0_GH0.tar.gz) = 0d2bf4f74a7f5ccc2686f2b61580f2f08860dc2a5b48bfe09cbc8869470761a5 -SIZE (electron/electron-electron-v39.8.0_GH0.tar.gz) = 17143914 -SHA256 (electron/nodejs-node-v22.22.0_GH0.tar.gz) = b7f40aadbf71df0d78a2239f593e4f14bf2f129fd9c5643f024c68ec1b48a854 -SIZE (electron/nodejs-node-v22.22.0_GH0.tar.gz) = 129435366 +SHA256 (electron/electron39-39.8.3-node-modules.tar.xz) = 0f539cfddfd0cbcf8df0e5a974a0c2a7cf812d7c1fd10ba2148a69265412ad5a +SIZE (electron/electron39-39.8.3-node-modules.tar.xz) = 59894046 +SHA256 (electron/electron-electron-v39.8.3_GH0.tar.gz) = 294c6df630f84152ef0f66a9a4a02d89e9aaf2a53c27ea183ecb19d615530159 +SIZE (electron/electron-electron-v39.8.3_GH0.tar.gz) = 17160436 +SHA256 (electron/nodejs-node-v22.22.1_GH0.tar.gz) = 4d9ebbac6ba3f9610fdd5449274794a3b32305b33ca6f2fd476ac139024015c6 +SIZE (electron/nodejs-node-v22.22.1_GH0.tar.gz) = 129747267 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01 diff --git a/devel/electron39/files/patch-electron_filenames.gni b/devel/electron39/files/patch-electron_filenames.gni index f8c4bda94c1f..6d8c888188c5 100644 --- a/devel/electron39/files/patch-electron_filenames.gni +++ b/devel/electron39/files/patch-electron_filenames.gni @@ -1,6 +1,6 @@ ---- electron/filenames.gni.orig 2025-09-02 20:56:04 UTC +--- electron/filenames.gni.orig 2026-03-17 08:46:38 UTC +++ electron/filenames.gni -@@ -238,8 +238,8 @@ filenames = { +@@ -240,8 +240,8 @@ filenames = { "shell/app/command_line_args.h", "shell/app/electron_content_client.cc", "shell/app/electron_content_client.h", diff --git a/devel/electron39/files/patch-electron_lib_browser_api_power-monitor.ts b/devel/electron39/files/patch-electron_lib_browser_api_power-monitor.ts index 24713c283fe7..144f1bfe462c 100644 --- a/devel/electron39/files/patch-electron_lib_browser_api_power-monitor.ts +++ b/devel/electron39/files/patch-electron_lib_browser_api_power-monitor.ts @@ -1,7 +1,7 @@ ---- electron/lib/browser/api/power-monitor.ts.orig 2023-08-14 18:19:06 UTC +--- electron/lib/browser/api/power-monitor.ts.orig 2026-03-17 08:46:38 UTC +++ electron/lib/browser/api/power-monitor.ts -@@ -17,7 +17,7 @@ class PowerMonitor extends EventEmitter { - const pm = createPowerMonitor(); +@@ -23,7 +23,7 @@ class PowerMonitor extends EventEmitter implements Ele + pm = createPowerMonitor(); pm.emit = this.emit.bind(this); - if (process.platform === 'linux') { diff --git a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc index bca4a85e06ed..454c2994b075 100644 --- a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc +++ b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_power_monitor.cc.orig 2025-09-02 20:56:04 UTC +--- electron/shell/browser/api/electron_api_power_monitor.cc.orig 2026-03-17 08:46:38 UTC +++ electron/shell/browser/api/electron_api_power_monitor.cc -@@ -129,6 +129,11 @@ void PowerMonitor::OnSpeedLimitChange(int speed_limit) +@@ -137,6 +137,11 @@ void PowerMonitor::OnSpeedLimitChange(int speed_limit) gin::DataObjectBuilder(isolate).Set("limit", speed_limit).Build()); } @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_LINUX) void PowerMonitor::SetListeningForShutdown(bool is_listening) { if (is_listening) { -@@ -154,7 +159,7 @@ gin::ObjectTemplateBuilder PowerMonitor::GetObjectTemp +@@ -162,7 +167,7 @@ gin::ObjectTemplateBuilder PowerMonitor::GetObjectTemp auto builder = gin_helper::EventEmitterMixin::GetObjectTemplateBuilder( isolate); diff --git a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__screen.cc b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__screen.cc index a8f1c681f88c..2515ba44e617 100644 --- a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__screen.cc +++ b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__screen.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_screen.cc.orig 2025-07-02 10:12:01 UTC +--- electron/shell/browser/api/electron_api_screen.cc.orig 2026-03-17 08:46:38 UTC +++ electron/shell/browser/api/electron_api_screen.cc @@ -28,7 +28,7 @@ #include "ui/display/win/screen_win.h" @@ -9,7 +9,16 @@ #include "shell/browser/linux/x11_util.h" #endif -@@ -136,7 +136,7 @@ gfx::PointF Screen::ScreenToDIPPoint(const gfx::PointF +@@ -77,7 +77,7 @@ gfx::Point Screen::GetCursorScreenPoint(v8::Isolate* i + } + + gfx::Point Screen::GetCursorScreenPoint(v8::Isolate* isolate) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (x11_util::IsWayland()) + return {}; + #endif +@@ -125,7 +125,7 @@ gfx::PointF Screen::ScreenToDIPPoint(const gfx::PointF gfx::PointF Screen::ScreenToDIPPoint(const gfx::PointF& point_px) { #if BUILDFLAG(IS_WIN) return display::win::GetScreenWin()->ScreenToDIPPoint(point_px); @@ -18,7 +27,7 @@ if (x11_util::IsX11()) { gfx::Point pt_px = gfx::ToFlooredPoint(point_px); display::Display display = GetDisplayNearestPoint(pt_px); -@@ -155,7 +155,7 @@ gfx::Point Screen::DIPToScreenPoint(const gfx::Point& +@@ -144,7 +144,7 @@ gfx::Point Screen::DIPToScreenPoint(const gfx::Point& gfx::Point Screen::DIPToScreenPoint(const gfx::Point& point_dip) { #if BUILDFLAG(IS_WIN) return display::win::GetScreenWin()->DIPToScreenPoint(point_dip); @@ -27,7 +36,7 @@ if (x11_util::IsX11()) { display::Display display = GetDisplayNearestPoint(point_dip); gfx::Rect bounds_dip = display.bounds(); -@@ -198,7 +198,7 @@ gin::ObjectTemplateBuilder Screen::GetObjectTemplateBu +@@ -187,7 +187,7 @@ gin::ObjectTemplateBuilder Screen::GetObjectTemplateBu .SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay) .SetMethod("getAllDisplays", &Screen::GetAllDisplays) .SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint) diff --git a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index d7a322e4b9a5..1a8581eaa002 100644 --- a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron39/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 2026-03-03 14:13:37 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2026-03-17 08:46:38 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -162,11 +162,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -41,7 +41,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2727,13 +2727,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2742,13 +2742,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); -@@ -3417,7 +3417,7 @@ void WebContents::Focus() { +@@ -3432,7 +3432,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 -@@ -4308,7 +4308,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4323,7 +4323,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.h index 598d75144012..df26d1097ebe 100644 --- a/devel/electron39/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron39/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-03 14:13:37 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2026-03-17 08:46:38 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -746,7 +746,7 @@ class WebContents final : public ExclusiveAccessContex +@@ -750,7 +750,7 @@ class WebContents final : public ExclusiveAccessContex #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC) ui::ImageModel GetDevToolsWindowIcon() override; #endif diff --git a/devel/electron39/files/patch-electron_shell_browser_browser.cc b/devel/electron39/files/patch-electron_shell_browser_browser.cc index d4c7f912e1c6..4148b7978441 100644 --- a/devel/electron39/files/patch-electron_shell_browser_browser.cc +++ b/devel/electron39/files/patch-electron_shell_browser_browser.cc @@ -1,7 +1,7 @@ ---- electron/shell/browser/browser.cc.orig 2025-01-29 20:10:57 UTC +--- electron/shell/browser/browser.cc.orig 2026-03-17 08:46:38 UTC +++ electron/shell/browser/browser.cc -@@ -71,7 +71,7 @@ Browser* Browser::Get() { - return ElectronBrowserMainParts::Get()->browser(); +@@ -96,7 +96,7 @@ bool Browser::IsValidProtocolScheme(const std::string& + return true; } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) diff --git a/devel/electron39/files/patch-electron_shell_browser_browser.h b/devel/electron39/files/patch-electron_shell_browser_browser.h index a24bbdb011f0..08b8f53c04cd 100644 --- a/devel/electron39/files/patch-electron_shell_browser_browser.h +++ b/devel/electron39/files/patch-electron_shell_browser_browser.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/browser.h.orig 2025-10-27 17:58:27 UTC +--- electron/shell/browser/browser.h.orig 2026-03-17 08:46:38 UTC +++ electron/shell/browser/browser.h -@@ -148,7 +148,7 @@ class Browser : private WindowListObserver { +@@ -152,7 +152,7 @@ class Browser : private WindowListObserver { std::u16string GetApplicationNameForProtocol(const GURL& url); @@ -9,7 +9,7 @@ // get the name, icon and path for an application v8::Local GetApplicationInfoForProtocol(v8::Isolate* isolate, const GURL& url); -@@ -276,10 +276,10 @@ class Browser : private WindowListObserver { +@@ -280,10 +280,10 @@ class Browser : private WindowListObserver { PCWSTR GetAppUserModelID(); #endif // BUILDFLAG(IS_WIN) diff --git a/devel/electron39/files/patch-electron_shell_browser_linux_x11__util.cc b/devel/electron39/files/patch-electron_shell_browser_linux_x11__util.cc new file mode 100644 index 000000000000..10daeb46ef5d --- /dev/null +++ b/devel/electron39/files/patch-electron_shell_browser_linux_x11__util.cc @@ -0,0 +1,20 @@ +--- electron/shell/browser/linux/x11_util.cc.orig 2026-03-18 13:26:09 UTC ++++ electron/shell/browser/linux/x11_util.cc +@@ -10,7 +10,7 @@ bool IsX11() { + namespace x11_util { + + bool IsX11() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + static const bool is = ui::GetOzonePlatformId() == ui::kPlatformX11; + return is; + #else +@@ -19,7 +19,7 @@ bool IsWayland() { + } + + bool IsWayland() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + static const bool is = ui::GetOzonePlatformId() == ui::kPlatformWayland; + return is; + #else diff --git a/devel/electron39/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron39/files/patch-electron_shell_browser_native__window__views.cc index 01f86420cf54..0b81c6302dd3 100644 --- a/devel/electron39/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron39/files/patch-electron_shell_browser_native__window__views.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2025-11-13 22:50:46 UTC +--- electron/shell/browser/native_window_views.cc.orig 2026-03-17 08:46:38 UTC +++ electron/shell/browser/native_window_views.cc @@ -53,7 +53,7 @@ #include "ui/wm/core/shadow_types.h" @@ -81,7 +81,7 @@ if (x11_util::IsX11()) return !event_disabler_.get(); NOTIMPLEMENTED(); -@@ -864,7 +864,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -855,7 +855,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 (!CanResize()) { -@@ -1124,7 +1124,7 @@ bool NativeWindowViews::IsClosable() const { +@@ -1111,7 +1111,7 @@ bool NativeWindowViews::IsClosable() const { return false; } return !(info.fState & MFS_DISABLED); @@ -99,7 +99,7 @@ return true; #endif } -@@ -1164,7 +1164,7 @@ void NativeWindowViews::Center() { +@@ -1151,7 +1151,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::Get()->GetDisplayNearestWindow(GetNativeWindow()); gfx::Rect window_bounds_in_screen = display.work_area(); -@@ -1381,7 +1381,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men +@@ -1368,7 +1368,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(); -@@ -1437,7 +1437,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* +@@ -1424,7 +1424,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( -@@ -1483,7 +1483,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1470,7 +1470,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); } -@@ -1609,7 +1609,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1596,7 +1596,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 = -@@ -1707,7 +1707,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1694,7 +1694,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()); -@@ -1828,7 +1828,7 @@ bool NativeWindowViews::CanMinimize() const { +@@ -1815,7 +1815,7 @@ bool NativeWindowViews::CanMinimize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -162,7 +162,7 @@ return true; #endif } -@@ -1870,7 +1870,7 @@ std::unique_ptr NativeWindowViews::C +@@ -1857,7 +1857,7 @@ std::unique_ptr NativeWindowViews::C #endif } @@ -171,7 +171,7 @@ electron::ClientFrameViewLinux* NativeWindowViews::GetClientFrameViewLinux() { // Check to make sure this window's non-client frame view is a // ClientFrameViewLinux. If either has_frame() or has_client_frame() -@@ -1893,7 +1893,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1880,7 +1880,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) -@@ -1912,7 +1912,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1899,7 +1899,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron39/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc b/devel/electron39/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc index 407fbfe7b4c6..8de5a24ff8e6 100644 --- a/devel/electron39/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc +++ b/devel/electron39/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/ui/inspectable_web_contents.cc.orig 2025-11-13 22:50:46 UTC +--- electron/shell/browser/ui/inspectable_web_contents.cc.orig 2026-03-17 08:46:38 UTC +++ electron/shell/browser/ui/inspectable_web_contents.cc -@@ -555,7 +555,7 @@ void InspectableWebContents::LoadCompleted() { +@@ -559,7 +559,7 @@ void InspectableWebContents::LoadCompleted() { prefs.FindString("currentDockState"); base::RemoveChars(*current_dock_state, "\"", &dock_state_); } diff --git a/devel/electron39/files/patch-electron_spec_api-app-spec.ts b/devel/electron39/files/patch-electron_spec_api-app-spec.ts index 5125e2072163..dce72043d131 100644 --- a/devel/electron39/files/patch-electron_spec_api-app-spec.ts +++ b/devel/electron39/files/patch-electron_spec_api-app-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-app-spec.ts.orig 2025-11-13 22:50:46 UTC +--- electron/spec/api-app-spec.ts.orig 2026-03-17 08:46:38 UTC +++ electron/spec/api-app-spec.ts @@ -129,11 +129,11 @@ describe('app module', () => { }); @@ -95,7 +95,7 @@ it('returns promise rejection for a bogus protocol', async function () { await expect( app.getApplicationInfoForProtocol('bogus-protocol://') -@@ -1497,7 +1497,7 @@ describe('app module', () => { +@@ -1520,7 +1520,7 @@ describe('app module', () => { }); // FIXME Get these specs running on Linux CI @@ -104,7 +104,7 @@ const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico'); const sizes = { small: 16, -@@ -1579,7 +1579,7 @@ describe('app module', () => { +@@ -1602,7 +1602,7 @@ describe('app module', () => { expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0); } @@ -113,7 +113,7 @@ expect(entry.sandboxed).to.be.a('boolean'); } -@@ -1653,7 +1653,7 @@ describe('app module', () => { +@@ -1676,7 +1676,7 @@ describe('app module', () => { it('succeeds with complete GPUInfo', async () => { const completeInfo = await getGPUInfo('complete'); @@ -122,7 +122,7 @@ // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo); const basicInfo = await getGPUInfo('basic'); -@@ -1677,7 +1677,7 @@ describe('app module', () => { +@@ -1700,7 +1700,7 @@ describe('app module', () => { }); }); diff --git a/devel/electron39/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron39/files/patch-electron_spec_api-browser-window-spec.ts index 50a523d9eef6..7326e8ea2a21 100644 --- a/devel/electron39/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron39/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2026-03-03 14:13:37 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2026-03-17 08:46:38 UTC +++ electron/spec/api-browser-window-spec.ts @@ -69,7 +69,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -171,16 +171,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -5910,7 +5910,7 @@ describe('BrowserWindow module', () => { - }); - }); - -- ifdescribe(process.platform === 'linux')('menu bar AltGr behavior', () => { -+ ifdescribe(process.platform === 'linux' || process.platform === 'freebsd')('menu bar AltGr behavior', () => { - it('does not toggle auto-hide menu bar visibility', async () => { - const w = new BrowserWindow({ show: false, autoHideMenuBar: true }); - w.setMenuBarVisibility(false); -@@ -6864,7 +6864,7 @@ describe('BrowserWindow module', () => { +@@ -6858,7 +6858,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows);