diff --git a/devel/electron40/Makefile.version b/devel/electron40/Makefile.version index fab5898378b5..7448da223f08 100644 --- a/devel/electron40/Makefile.version +++ b/devel/electron40/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 40.8.0 +ELECTRON_VER= 40.8.3 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron40/distinfo b/devel/electron40/distinfo index 35f1f9ac3454..366ddd1949cf 100644 --- a/devel/electron40/distinfo +++ b/devel/electron40/distinfo @@ -1,29 +1,29 @@ -TIMESTAMP = 1772976514 +TIMESTAMP = 1773918828 SHA256 (electron/chromium-144.0.7559.236.tar.xz.0) = 21556e44d5f5e464a7603afc1e912127c4546d3c55d777055614b769247d2714 SIZE (electron/chromium-144.0.7559.236.tar.xz.0) = 2000000000 SHA256 (electron/chromium-144.0.7559.236.tar.xz.1) = 389e96ab80e7f3ea7a330060c51ed714f2277810b13bbd1d72bb9e6119dce3a2 SIZE (electron/chromium-144.0.7559.236.tar.xz.1) = 2000000000 SHA256 (electron/chromium-144.0.7559.236.tar.xz.2) = 3783608e8c802c5660a7c2ea12d9e16ae6f534eb739c155c0de4b42eca358c3e SIZE (electron/chromium-144.0.7559.236.tar.xz.2) = 309499476 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 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/electron40-40.8.0-node-modules.tar.xz) = 5ead5307742772cd432cf026a946022a5f3e2b8b126d6eea5aaed20996608121 -SIZE (electron/electron40-40.8.0-node-modules.tar.xz) = 59675854 -SHA256 (electron/electron-electron-v40.8.0_GH0.tar.gz) = c5b1bb3695e4420065d4e16f3c7e7942cd2971d90675c5026ef9bc7239be8483 -SIZE (electron/electron-electron-v40.8.0_GH0.tar.gz) = 17144215 +SHA256 (electron/electron40-40.8.3-node-modules.tar.xz) = 5ead5307742772cd432cf026a946022a5f3e2b8b126d6eea5aaed20996608121 +SIZE (electron/electron40-40.8.3-node-modules.tar.xz) = 59675854 +SHA256 (electron/electron-electron-v40.8.3_GH0.tar.gz) = 1ea4a914096c5d4e9fdd1230c1e3be8d23b0657e802aed03b8c8a7a43cb20ea0 +SIZE (electron/electron-electron-v40.8.3_GH0.tar.gz) = 17168890 SHA256 (electron/nodejs-node-v24.14.0_GH0.tar.gz) = f3a7374f7d0a3b3dcd1b612dd2bf1ffbe7ace778c02c027efaaacbad1e17390a SIZE (electron/nodejs-node-v24.14.0_GH0.tar.gz) = 126199657 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 SIZE (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = 2112918 SHA256 (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 88e65f116c7a06fccedb43970fba63080a57a4e5dc29147d2cdfe1ee58dd0546 SIZE (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 1136238 SHA256 (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = a365df6d83e0be3cc000b70bd39734d80c28f0d9983ebe44698337a2ca464bb1 SIZE (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = 62962 SHA256 (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = c148f76220fc41a89ffeaf370c2cc175577be184688b12aa6fec5f8ac6c714c4 SIZE (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = 13014 SHA256 (electron/evanw-esbuild-v0.27.1_GH0.tar.gz) = bcc3abdc911961ef04340714dc69ddc34af6d2e2c60a1c4036d1c7f1a3fc4a23 SIZE (electron/evanw-esbuild-v0.27.1_GH0.tar.gz) = 1978868 diff --git a/devel/electron40/files/patch-electron_lib_browser_api_power-monitor.ts b/devel/electron40/files/patch-electron_lib_browser_api_power-monitor.ts index 24713c283fe7..19e72b62d170 100644 --- a/devel/electron40/files/patch-electron_lib_browser_api_power-monitor.ts +++ b/devel/electron40/files/patch-electron_lib_browser_api_power-monitor.ts @@ -1,11 +1,11 @@ ---- 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:36 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') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // On Linux, we inhibit shutdown in order to give the app a chance to // decide whether or not it wants to prevent the shutdown. We don't // inhibit the shutdown event unless there's a listener for it. This diff --git a/devel/electron40/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc b/devel/electron40/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc index bca4a85e06ed..28457188d378 100644 --- a/devel/electron40/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc +++ b/devel/electron40/files/patch-electron_shell_browser_api_electron__api__power__monitor.cc @@ -1,23 +1,23 @@ ---- 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:36 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()); } +#if BUILDFLAG(IS_BSD) +void PowerMonitor::SetListeningForShutdown(bool is_listening) { +} +#endif + #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); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) builder.SetMethod("setListeningForShutdown", &PowerMonitor::SetListeningForShutdown); #endif diff --git a/devel/electron40/files/patch-electron_shell_browser_api_electron__api__screen.cc b/devel/electron40/files/patch-electron_shell_browser_api_electron__api__screen.cc index a8f1c681f88c..bacea9efbcb6 100644 --- a/devel/electron40/files/patch-electron_shell_browser_api_electron__api__screen.cc +++ b/devel/electron40/files/patch-electron_shell_browser_api_electron__api__screen.cc @@ -1,38 +1,47 @@ ---- 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:36 UTC +++ electron/shell/browser/api/electron_api_screen.cc @@ -28,7 +28,7 @@ #include "ui/display/win/screen_win.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #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); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) .SetMethod("screenToDipPoint", &Screen::ScreenToDIPPoint) .SetMethod("dipToScreenPoint", &Screen::DIPToScreenPoint) #endif diff --git a/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 837c5b384922..c6af893f8178 100644 --- a/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,77 +1,77 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2026-03-05 10:29:21 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2026-03-17 08:46:36 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -162,11 +162,11 @@ #include "ui/base/cocoa/defaults_utils.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/linux/linux_ui.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "ui/aura/window.h" #include "ui/gfx/font_render_params.h" #endif @@ -198,7 +198,7 @@ #include "content/public/browser/plugin_service.h" #endif -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) #include "chrome/browser/hang_monitor/hang_crash_dump.h" // nogncheck #endif @@ -572,7 +572,7 @@ std::optional GetCursorBlinkInterval( ui::TextInsertionCaretBlinkPeriodFromDefaults()); if (system_value) return *system_value; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (auto* native_theme = ui::NativeTheme::GetInstanceForNativeUi()) return native_theme->caret_blink_interval(); #elif BUILDFLAG(IS_WIN) @@ -944,7 +944,7 @@ void WebContents::InitWithSessionAndOptions( accept_languages.pop_back(); prefs->accept_languages = accept_languages; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2753,13 +2753,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2758,13 +2758,13 @@ void WebContents::ForcefullyCrashRenderer() { content::RenderProcessHost* rph = rwh->GetProcess(); if (rph) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. // Instead we send an explicit IPC to crash on the renderer's IO thread. rph->ForceCrash(); #else // Try to generate a crash report for the hung process. -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) CrashDumpHungChildProcess(rph->GetProcess().Handle()); #endif rph->Shutdown(content::RESULT_CODE_HUNG); -@@ -3441,7 +3441,7 @@ void WebContents::Focus() { +@@ -3446,7 +3446,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. -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (owner_window()) owner_window()->Focus(true); #endif -@@ -4337,7 +4337,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4342,7 +4342,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void WebContents::GetDevToolsWindowWMClass(std::string* name, std::string* class_name) { *class_name = Browser::Get()->GetName(); diff --git a/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.h index d3e286305af8..8196ee0645ff 100644 --- a/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron40/files/patch-electron_shell_browser_api_electron__api__web__contents.h @@ -1,11 +1,11 @@ ---- electron/shell/browser/api/electron_api_web_contents.h.orig 2026-03-05 10:29:21 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2026-03-17 08:46:36 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -748,7 +748,7 @@ class WebContents final : public ExclusiveAccessContex +@@ -752,7 +752,7 @@ class WebContents final : public ExclusiveAccessContex #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC) ui::ImageModel GetDevToolsWindowIcon() override; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void GetDevToolsWindowWMClass(std::string* name, std::string* class_name) override; #endif diff --git a/devel/electron40/files/patch-electron_shell_browser_browser.cc b/devel/electron40/files/patch-electron_shell_browser_browser.cc index d4c7f912e1c6..eb74b8c22fc4 100644 --- a/devel/electron40/files/patch-electron_shell_browser_browser.cc +++ b/devel/electron40/files/patch-electron_shell_browser_browser.cc @@ -1,11 +1,11 @@ ---- electron/shell/browser/browser.cc.orig 2025-01-29 20:10:57 UTC +--- electron/shell/browser/browser.cc.orig 2026-03-17 08:46:36 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) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void Browser::Focus(gin::Arguments* args) { // Focus on the first visible window. for (auto* const window : WindowList::GetWindows()) { diff --git a/devel/electron40/files/patch-electron_shell_browser_browser.h b/devel/electron40/files/patch-electron_shell_browser_browser.h index a24bbdb011f0..c9fb3e7e1657 100644 --- a/devel/electron40/files/patch-electron_shell_browser_browser.h +++ b/devel/electron40/files/patch-electron_shell_browser_browser.h @@ -1,24 +1,24 @@ ---- electron/shell/browser/browser.h.orig 2025-10-27 17:58:27 UTC +--- electron/shell/browser/browser.h.orig 2026-03-17 08:46:36 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); -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) // 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) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Whether Unity launcher is running. bool IsUnityRunning(); -#endif // BUILDFLAG(IS_LINUX) +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Tell the application to open a file. bool OpenFile(const std::string& file_path); diff --git a/devel/electron40/files/patch-electron_shell_browser_linux_x11__util.cc b/devel/electron40/files/patch-electron_shell_browser_linux_x11__util.cc new file mode 100644 index 000000000000..3f664d3afe96 --- /dev/null +++ b/devel/electron40/files/patch-electron_shell_browser_linux_x11__util.cc @@ -0,0 +1,20 @@ +--- electron/shell/browser/linux/x11_util.cc.orig 2026-03-19 11:37:01 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/electron40/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron40/files/patch-electron_shell_browser_native__window__views.cc index 2aee2252df34..01b642b1a641 100644 --- a/devel/electron40/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron40/files/patch-electron_shell_browser_native__window__views.cc @@ -1,191 +1,191 @@ ---- electron/shell/browser/native_window_views.cc.orig 2026-03-05 10:29:21 UTC +--- electron/shell/browser/native_window_views.cc.orig 2026-03-17 08:46:36 UTC +++ electron/shell/browser/native_window_views.cc @@ -52,7 +52,7 @@ #include "ui/wm/core/shadow_types.h" #include "ui/wm/core/window_util.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/notimplemented.h" #include "shell/browser/browser.h" #include "shell/browser/linux/unity_service.h" @@ -282,7 +282,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: params.parent = parent->GetNativeWindow(); params.native_widget = new ElectronDesktopNativeWidgetAura{this, widget()}; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string name = Browser::Get()->GetName(); // Set WM_WINDOW_ROLE. params.wm_role_name = "browser-window"; @@ -307,7 +307,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: std::string window_type; options.Get(options::kType, &window_type); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // 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: if (window) window->AddPreTargetHandler(this); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // 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); @@ -502,7 +502,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us } void NativeWindowViews::SetGTKDarkThemeEnabled(bool use_dark_theme) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (x11_util::IsX11()) { const std::string color = use_dark_theme ? "dark" : "light"; auto* connection = x11::Connection::Get(); @@ -563,7 +563,7 @@ void NativeWindowViews::Show() { NotifyWindowShow(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); @@ -579,7 +579,7 @@ void NativeWindowViews::ShowInactive() { NotifyWindowShow(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); @@ -598,7 +598,7 @@ void NativeWindowViews::Hide() { NotifyWindowHide(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (global_menu_bar_) global_menu_bar_->OnWindowUnmapped(); #endif @@ -629,7 +629,7 @@ bool NativeWindowViews::IsEnabled() const { bool NativeWindowViews::IsEnabled() const { #if BUILDFLAG(IS_WIN) return ::IsWindowEnabled(GetAcceleratedWidget()); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (x11_util::IsX11()) return !event_disabler_.get(); NOTIMPLEMENTED(); @@ -854,7 +854,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou } #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // On Linux and Windows the minimum and maximum size should be updated with // window size when window is not resizable. if (!CanResize()) { -@@ -1114,7 +1114,7 @@ bool NativeWindowViews::IsClosable() const { +@@ -1110,7 +1110,7 @@ bool NativeWindowViews::IsClosable() const { return false; } return !(info.fState & MFS_DISABLED); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return true; #endif } -@@ -1154,7 +1154,7 @@ void NativeWindowViews::Center() { +@@ -1150,7 +1150,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() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto display = display::Screen::Get()->GetDisplayNearestWindow(GetNativeWindow()); gfx::Rect window_bounds_in_screen = display.work_area(); -@@ -1371,7 +1371,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men +@@ -1367,7 +1367,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men } void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Remove global menu bar. if (global_menu_bar_ && menu_model == nullptr) { global_menu_bar_.reset(); -@@ -1427,7 +1427,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* +@@ -1423,7 +1423,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* void NativeWindowViews::SetParentWindow(NativeWindow* parent) { NativeWindow::SetParentWindow(parent); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (x11_util::IsX11()) { auto* connection = x11::Connection::Get(); connection->SetProperty( -@@ -1473,7 +1473,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1469,7 +1469,7 @@ void NativeWindowViews::SetProgressBar(double progress NativeWindow::ProgressState state) { #if BUILDFLAG(IS_WIN) taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (unity::IsRunning()) { unity::SetProgressFraction(progress); } -@@ -1599,7 +1599,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1595,7 +1595,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM #if BUILDFLAG(IS_WIN) window_handle = reinterpret_cast(accelerated_widget); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) window_handle = static_cast(accelerated_widget); #endif aura::WindowTreeHost* const host = -@@ -1697,7 +1697,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1693,7 +1693,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC SendMessage(hwnd, WM_SETICON, ICON_BIG, reinterpret_cast(app_icon_.get())); } -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget( GetAcceleratedWidget()); -@@ -1818,7 +1818,7 @@ bool NativeWindowViews::CanMinimize() const { +@@ -1814,7 +1814,7 @@ bool NativeWindowViews::CanMinimize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return true; #endif } -@@ -1860,7 +1860,7 @@ std::unique_ptr NativeWindowViews::C +@@ -1856,7 +1856,7 @@ std::unique_ptr NativeWindowViews::C #endif } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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() -@@ -1883,7 +1883,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1879,7 +1879,7 @@ void NativeWindowViews::HandleKeyboardEvent( if (widget_destroyed_) return; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (event.windows_key_code == ui::VKEY_BROWSER_BACK) NotifyWindowExecuteAppCommand(kBrowserBackward); else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD) -@@ -1902,7 +1902,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1898,7 +1898,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (event->changed_button_flags() == ui::EF_BACK_MOUSE_BUTTON) NotifyWindowExecuteAppCommand(kBrowserBackward); else if (event->changed_button_flags() == ui::EF_FORWARD_MOUSE_BUTTON) diff --git a/devel/electron40/files/patch-electron_spec_api-app-spec.ts b/devel/electron40/files/patch-electron_spec_api-app-spec.ts index 06de92307024..bfe074db5ae0 100644 --- a/devel/electron40/files/patch-electron_spec_api-app-spec.ts +++ b/devel/electron40/files/patch-electron_spec_api-app-spec.ts @@ -1,133 +1,133 @@ ---- electron/spec/api-app-spec.ts.orig 2026-02-19 05:24:38 UTC +--- electron/spec/api-app-spec.ts.orig 2026-03-17 08:46:36 UTC +++ electron/spec/api-app-spec.ts @@ -129,11 +129,11 @@ describe('app module', () => { }); describe('app.getPreferredSystemLanguages()', () => { - ifit(process.platform !== 'linux')('should not be empty', () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not be empty', () => { expect(app.getPreferredSystemLanguages().length).to.not.equal(0); }); - ifit(process.platform === 'linux')('should be empty or contain C entry', () => { + ifit(process.platform === 'linux' || process.platform === 'freebsd')('should be empty or contain C entry', () => { const languages = app.getPreferredSystemLanguages(); if (languages.length) { expect(languages).to.not.include('C'); @@ -210,7 +210,7 @@ describe('app module', () => { expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound'); }); - ifit(['darwin', 'linux'].includes(process.platform))('exits gracefully', async function () { + ifit(['darwin', 'linux', 'freebsd'].includes(process.platform))('exits gracefully', async function () { const electronPath = process.execPath; const appPath = path.join(fixturesPath, 'api', 'singleton'); appProcess = cp.spawn(electronPath, [appPath]); @@ -374,7 +374,7 @@ describe('app module', () => { }); // GitHub Actions macOS-13 runners used for x64 seem to have a problem with this test. - ifdescribe(process.platform !== 'linux' && !isMacOSx64)('app.{add|get|clear}RecentDocument(s)', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd' && !isMacOSx64)('app.{add|get|clear}RecentDocument(s)', () => { const tempFiles = [ path.join(fixturesPath, 'foo.txt'), path.join(fixturesPath, 'bar.txt'), @@ -502,7 +502,7 @@ describe('app module', () => { // let w = null // before(function () { - // if (process.platform !== 'linux') { + // if (process.platform !== 'linux' && process.platform !== 'freebsd') { // this.skip() // } // }) @@ -609,7 +609,7 @@ describe('app module', () => { describe('app.badgeCount', () => { const platformIsNotSupported = (process.platform === 'win32') || - (process.platform === 'linux' && !app.isUnityRunning()); + (process.platform === 'linux' && !app.isUnityRunning()) || (process.platform === 'freebsd'); const expectedBadgeCount = 42; @@ -653,7 +653,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux' && !process.mas && (process.platform !== 'darwin' || process.arch === 'arm64'))('app.get/setLoginItemSettings API', function () { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd' && !process.mas && (process.platform !== 'darwin' || process.arch === 'arm64'))('app.get/setLoginItemSettings API', function () { const isMac = process.platform === 'darwin'; const isWin = process.platform === 'win32'; @@ -1033,7 +1033,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux')('accessibility support functionality', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('accessibility support functionality', () => { it('is mutable', () => { const values = [false, true, false]; const setters: Array<(arg: boolean) => void> = [ @@ -1302,7 +1302,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux')('select-client-certificate event', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('select-client-certificate event', () => { let w: BrowserWindow; before(function () { @@ -1437,7 +1437,7 @@ describe('app module', () => { describe('getApplicationNameForProtocol()', () => { // TODO: Linux CI doesn't have registered http & https handlers - ifit(!(process.env.CI && process.platform === 'linux'))('returns application names for common protocols', function () { + ifit(!(process.env.CI && (process.platform === 'linux' || process.platform === 'freebsd')))('returns application names for common protocols', function () { // We can't expect particular app names here, but these protocols should // at least have _something_ registered. Except on our Linux CI // environment apparently. @@ -1455,7 +1455,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux')('getApplicationInfoForProtocol()', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('getApplicationInfoForProtocol()', () => { it('returns promise rejection for a bogus protocol', async function () { await expect( app.getApplicationInfoForProtocol('bogus-protocol://') -@@ -1505,7 +1505,7 @@ describe('app module', () => { +@@ -1528,7 +1528,7 @@ describe('app module', () => { }); // FIXME Get these specs running on Linux CI - ifdescribe(process.platform !== 'linux')('getFileIcon() API', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('getFileIcon() API', () => { const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico'); const sizes = { small: 16, -@@ -1587,7 +1587,7 @@ describe('app module', () => { +@@ -1610,7 +1610,7 @@ describe('app module', () => { expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0); } - if (process.platform !== 'linux') { + if (process.platform !== 'linux' && process.platform !== 'freebsd') { expect(entry.sandboxed).to.be.a('boolean'); } -@@ -1661,7 +1661,7 @@ describe('app module', () => { +@@ -1684,7 +1684,7 @@ describe('app module', () => { it('succeeds with complete GPUInfo', async () => { const completeInfo = await getGPUInfo('complete'); - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo); const basicInfo = await getGPUInfo('basic'); -@@ -1685,7 +1685,7 @@ describe('app module', () => { +@@ -1708,7 +1708,7 @@ describe('app module', () => { }); }); - ifdescribe(!(process.platform === 'linux' && (process.arch === 'arm64' || process.arch === 'arm')))('sandbox options', () => { + ifdescribe(!((process.platform === 'linux' || process.platform === 'freebsd') && (process.arch === 'arm64' || process.arch === 'arm')))('sandbox options', () => { let appProcess: cp.ChildProcess = null as any; let server: net.Server = null as any; const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox'; diff --git a/devel/electron40/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron40/files/patch-electron_spec_api-browser-window-spec.ts index f8cc5d3d0af3..b796d46dfe39 100644 --- a/devel/electron40/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron40/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,200 +1,191 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2026-03-05 10:29:21 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2026-03-17 08:46:36 UTC +++ electron/spec/api-browser-window-spec.ts @@ -69,7 +69,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); }); - ifit(process.platform === 'linux')('does not crash when setting large window icons', async () => { + ifit(process.platform === 'linux' || process.platform === 'freebsd')('does not crash when setting large window icons', async () => { const appPath = path.join(fixtures, 'apps', 'xwindow-icon'); const appProcess = childProcess.spawn(process.execPath, [appPath]); await once(appProcess, 'exit'); @@ -326,7 +326,7 @@ describe('BrowserWindow module', () => { }); }); - ifdescribe(process.platform !== 'linux')('BrowserWindow.getContentProtection', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('BrowserWindow.getContentProtection', () => { afterEach(closeAllWindows); it('can set content protection', async () => { const w = new BrowserWindow({ show: false }); @@ -1197,7 +1197,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.minimize()', () => { // TODO(codebytere): Enable for Linux once maximize/minimize events work in CI. - ifit(process.platform !== 'linux')('should not be visible when the window is minimized', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not be visible when the window is minimized', async () => { const minimize = once(w, 'minimize'); w.minimize(); await minimize; @@ -1214,7 +1214,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable for Linux once CI plays nice with these kinds of tests - ifit(process.platform !== 'linux')('should not restore maximized windows', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not restore maximized windows', async () => { const maximize = once(w, 'maximize'); const shown = once(w, 'show'); w.maximize(); @@ -1279,7 +1279,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(true); }); - ifit(process.platform !== 'linux')('acquires focus status from the other windows', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('acquires focus status from the other windows', async () => { const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); @@ -1381,7 +1381,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(false); }); - ifit(process.platform !== 'linux')('transfers focus status to the next window', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('transfers focus status to the next window', async () => { const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); @@ -1840,7 +1840,7 @@ describe('BrowserWindow module', () => { }); }); - ifdescribe(process.platform !== 'linux')('Maximized state', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('Maximized state', () => { it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = once(w, 'maximize'); @@ -2050,7 +2050,7 @@ describe('BrowserWindow module', () => { }); }); - ifdescribe(process.platform !== 'linux')('Minimized state', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('Minimized state', () => { it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); @@ -3124,7 +3124,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.setOpacity(opacity)', () => { afterEach(closeAllWindows); - ifdescribe(process.platform !== 'linux')(('Windows and Mac'), () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')(('Windows and Mac'), () => { it('make window with initial opacity', () => { const w = new BrowserWindow({ show: false, opacity: 0.5 }); expect(w.getOpacity()).to.equal(0.5); @@ -3150,7 +3150,7 @@ describe('BrowserWindow module', () => { }); }); - ifdescribe(process.platform === 'linux')(('Linux'), () => { + ifdescribe(process.platform === 'linux' || process.platform === 'freebsd')(('Linux'), () => { it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); @@ -3361,7 +3361,7 @@ describe('BrowserWindow module', () => { expect(overlayRectPreMax.height).to.equal(size); // 'maximize' event is not emitted on Linux in CI. - if (process.platform !== 'linux' && !w.isMaximized()) { + if ((process.platform !== 'linux' && process.platform !== 'freebsd') && !w.isMaximized()) { const maximize = once(w, 'maximize'); w.show(); w.maximize(); @@ -3427,7 +3427,7 @@ describe('BrowserWindow module', () => { expect(preMaxHeight).to.equal(size); // 'maximize' event is not emitted on Linux in CI. - if (process.platform !== 'linux' && !w.isMaximized()) { + if ((process.platform !== 'linux' && process.platform !== 'freebsd') && !w.isMaximized()) { const maximize = once(w, 'maximize'); w.show(); w.maximize(); @@ -4120,7 +4120,7 @@ describe('BrowserWindow module', () => { expect(test.nodeTimers).to.equal(true); expect(test.nodeUrl).to.equal(true); - if (process.platform === 'linux' && test.osSandbox) { + if ((process.platform === 'linux' || process.platform === 'freebsd') && test.osSandbox) { expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { @@ -4625,7 +4625,7 @@ describe('BrowserWindow module', () => { }); }); - ifdescribe(process.platform !== 'linux')('max/minimize events', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('max/minimize events', () => { afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); @@ -4896,7 +4896,7 @@ describe('BrowserWindow module', () => { // TODO(zcbenz): // This test does not run on Linux CI. See: // https://github.com/electron/electron/issues/28699 - ifit(process.platform === 'linux' && !process.env.CI)('should bring a minimized maximized window back to maximized state', async () => { + ifit((process.platform === 'linux' || process.platform === 'freebsd') && !process.env.CI)('should bring a minimized maximized window back to maximized state', async () => { const w = new BrowserWindow({}); const maximize = once(w, 'maximize'); w.maximize(); @@ -4911,7 +4911,7 @@ describe('BrowserWindow module', () => { expect(w.isMaximized()).to.equal(true); }); - ifit(process.platform !== 'linux')('should not break fullscreen state', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not break fullscreen state', async () => { const w = new BrowserWindow({ show: false }); w.show(); @@ -4934,7 +4934,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI - ifdescribe(process.platform !== 'linux')('BrowserWindow.maximize()', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('BrowserWindow.maximize()', () => { afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); @@ -4971,7 +4971,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 - ifit(process.platform !== 'linux')('should not restore a minimized window', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not restore a minimized window', async () => { const w = new BrowserWindow(); const minimize = once(w, 'minimize'); w.minimize(); @@ -5457,7 +5457,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. - ifit(process.platform !== 'linux')('does affect maximizability when disabled and enabled', () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('does affect maximizability when disabled and enabled', () => { const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); @@ -5697,7 +5697,7 @@ describe('BrowserWindow module', () => { }); }); - ifdescribe(process.platform !== 'linux')('window states (excluding Linux)', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('window states (excluding Linux)', () => { // Not implemented on Linux. afterEach(closeAllWindows); -@@ -5931,7 +5931,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); -@@ -6957,7 +6957,7 @@ describe('BrowserWindow module', () => { +@@ -6940,7 +6940,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); - ifit(process.platform !== 'linux')('correctly returns isMaximized() when the window is maximized then minimized', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('correctly returns isMaximized() when the window is maximized then minimized', async () => { const w = new BrowserWindow({ frame: false, transparent: true diff --git a/devel/electron40/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/devel/electron40/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index a84e55ae2c07..fdab145499e1 100644 --- a/devel/electron40/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/devel/electron40/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2026-01-07 00:52:53 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2026-03-19 11:32:34 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2846,7 +2846,7 @@ std::unique_ptr GLES2Decoder::Create( +@@ -2853,7 +2853,7 @@ std::unique_ptr GLES2Decoder::Create( } // Allow linux to run fuzzers. -#if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique(client, command_buffer_service, outputter, group); #else diff --git a/devel/electron40/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/devel/electron40/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 530a8c2a481a..b397e2d69035 100644 --- a/devel/electron40/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/devel/electron40/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,20 +1,20 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2026-01-07 00:52:53 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2026-03-19 11:32:34 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1759,7 +1759,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte +@@ -1762,7 +1762,7 @@ wgpu::Adapter WebGPUDecoderImpl::CreatePreferredAdapte backend_types = {wgpu::BackendType::D3D12}; #elif BUILDFLAG(IS_APPLE) backend_types = {wgpu::BackendType::Metal}; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (shared_context_state_->GrContextIsVulkan() || webgpu_on_vk_gl_interop_ || shared_context_state_->IsGraphiteDawnVulkan()) { -@@ -2006,7 +2006,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -2009,7 +2009,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ - !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX) + !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) if (usage & wgpu::TextureUsage::StorageBinding) { LOG(ERROR) << "AssociateMailbox: wgpu::TextureUsage::StorageBinding is NOT " "supported yet on this platform.";