diff --git a/devel/electron35/Makefile.version b/devel/electron35/Makefile.version index 91fe60c171ef..adea8a03d784 100644 --- a/devel/electron35/Makefile.version +++ b/devel/electron35/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 35.2.1 +ELECTRON_VER= 35.3.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron35/distinfo b/devel/electron35/distinfo index cd66332309c5..0c73074fd4dc 100644 --- a/devel/electron35/distinfo +++ b/devel/electron35/distinfo @@ -1,25 +1,25 @@ -TIMESTAMP = 1745763608 +TIMESTAMP = 1746917507 SHA256 (electron/chromium-134.0.6998.205.tar.xz.0) = 2de727120892e92fa40fed6c76104ed66dace4fe66ae3be0e055c51b913009e8 SIZE (electron/chromium-134.0.6998.205.tar.xz.0) = 2000000000 SHA256 (electron/chromium-134.0.6998.205.tar.xz.1) = 58024b9e01977a769576b4c2b3056c9d894a2c13b4f0729f0b8060b3984243c9 SIZE (electron/chromium-134.0.6998.205.tar.xz.1) = 2000000000 SHA256 (electron/chromium-134.0.6998.205.tar.xz.2) = 9631efe75d07b1f36799506e59b8d49e478d71535188b95aca088f9d6fa49b84 SIZE (electron/chromium-134.0.6998.205.tar.xz.2) = 171552128 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-35.2.1.tar.xz) = 74a26f89b93b0b1756c6ff7e961b278235f109dab500a252c60f4d4a82637e7f -SIZE (electron/electron-yarn-cache-35.2.1.tar.xz) = 29892244 -SHA256 (electron/electron-electron-v35.2.1_GH0.tar.gz) = f332adf4b8cf75a8aac7d254bae573d0c54ce562b35530a3912ee5a9bd8beffa -SIZE (electron/electron-electron-v35.2.1_GH0.tar.gz) = 14743240 +SHA256 (electron/electron-yarn-cache-35.3.0.tar.xz) = 74a26f89b93b0b1756c6ff7e961b278235f109dab500a252c60f4d4a82637e7f +SIZE (electron/electron-yarn-cache-35.3.0.tar.xz) = 29892244 +SHA256 (electron/electron-electron-v35.3.0_GH0.tar.gz) = d00d5368fb2783592eb1beb39281bf147f35da9c921fc5a21d884803a6a9b770 +SIZE (electron/electron-electron-v35.3.0_GH0.tar.gz) = 14762701 SHA256 (electron/nodejs-node-v22.14.0_GH0.tar.gz) = ca1a2b5c0c7bc8343ccf1b4b6347a3cab093ed7ac642397189a15098105809c3 SIZE (electron/nodejs-node-v22.14.0_GH0.tar.gz) = 121559746 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 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 diff --git a/devel/electron35/files/patch-electron_filenames.gni b/devel/electron35/files/patch-electron_filenames.gni index d9414e61828c..beb4f75dfee9 100644 --- a/devel/electron35/files/patch-electron_filenames.gni +++ b/devel/electron35/files/patch-electron_filenames.gni @@ -1,13 +1,13 @@ ---- electron/filenames.gni.orig 2025-04-04 05:26:44 UTC +--- electron/filenames.gni.orig 2025-05-06 23:52:46 UTC +++ electron/filenames.gni -@@ -237,8 +237,8 @@ filenames = { +@@ -238,8 +238,8 @@ filenames = { "shell/app/command_line_args.h", "shell/app/electron_content_client.cc", "shell/app/electron_content_client.h", - "shell/app/electron_crash_reporter_client.cc", - "shell/app/electron_crash_reporter_client.h", + # "shell/app/electron_crash_reporter_client.cc", + # "shell/app/electron_crash_reporter_client.h", "shell/app/electron_main_delegate.cc", "shell/app/electron_main_delegate.h", "shell/app/node_main.cc", diff --git a/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.cc b/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.cc index ff576883918c..ad66ab5b7120 100644 --- a/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.cc +++ b/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.cc @@ -1,38 +1,38 @@ ---- electron/shell/browser/api/electron_api_base_window.cc.orig 2025-04-17 14:56:35 UTC +--- electron/shell/browser/api/electron_api_base_window.cc.orig 2025-05-06 23:52:46 UTC +++ electron/shell/browser/api/electron_api_base_window.cc @@ -41,7 +41,7 @@ #include "shell/browser/ui/views/win_frame_view.h" #include "shell/browser/ui/win/taskbar_host.h" #include "ui/base/win/shell.h" -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "shell/browser/ui/views/opaque_frame_view.h" #endif @@ -1024,7 +1024,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate, static_cast(window_.get()) ->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)), native_image->GetHICON(GetSystemMetrics(SM_CXICON))); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) static_cast(window_.get()) ->SetIcon(native_image->image().AsImageSkia()); #endif @@ -1081,7 +1081,7 @@ void BaseWindow::SetAppDetails(const gin_helper::Dicti } #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void BaseWindow::SetTitleBarOverlay(const gin_helper::Dictionary& options, gin_helper::Arguments* args) { // Ensure WCO is already enabled on this window -@@ -1332,7 +1332,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, +@@ -1334,7 +1334,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, .SetMethod("setThumbnailToolTip", &BaseWindow::SetThumbnailToolTip) .SetMethod("setAppDetails", &BaseWindow::SetAppDetails) #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) .SetMethod("setTitleBarOverlay", &BaseWindow::SetTitleBarOverlay) #endif .SetProperty("id", &BaseWindow::GetID); diff --git a/devel/electron35/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron35/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index b67763f0b52d..5c120f0b85f8 100644 --- a/devel/electron35/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron35/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 2025-04-17 14:56:35 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-05-06 23:52:46 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -159,11 +159,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 @@ -195,7 +195,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 @@ -569,7 +569,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* linux_ui = ui::LinuxUi::instance()) return linux_ui->GetCursorBlinkInterval(); #elif BUILDFLAG(IS_WIN) @@ -930,7 +930,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)); @@ -2759,13 +2759,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); @@ -3448,7 +3448,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 -@@ -4311,7 +4311,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4319,7 +4319,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/electron35/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron35/files/patch-electron_shell_browser_api_electron__api__web__contents.h index f3734fc1dfa0..b489d322ba0e 100644 --- a/devel/electron35/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron35/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 2025-04-04 05:26:44 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-05-06 23:52:46 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -783,7 +783,7 @@ class WebContents final : public ExclusiveAccessContex +@@ -784,7 +784,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/electron35/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc index 2d17cb915ce4..c0d887591946 100644 --- a/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc @@ -1,191 +1,191 @@ ---- electron/shell/browser/native_window_views.cc.orig 2025-04-17 14:56:35 UTC +--- electron/shell/browser/native_window_views.cc.orig 2025-05-06 23:52:46 UTC +++ electron/shell/browser/native_window_views.cc @@ -50,7 +50,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/strings/string_util.h" #include "shell/browser/browser.h" #include "shell/browser/linux/unity_service.h" @@ -295,7 +295,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: params.parent = parent->GetNativeWindow(); params.native_widget = new ElectronDesktopNativeWidgetAura(this); -#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"; @@ -321,7 +321,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. bool use_dark_theme = false; if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) { -@@ -427,7 +427,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -430,7 +430,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); -@@ -463,7 +463,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us +@@ -466,7 +466,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 (IsX11()) { const std::string color = use_dark_theme ? "dark" : "light"; auto* connection = x11::Connection::Get(); -@@ -525,7 +525,7 @@ void NativeWindowViews::Show() { +@@ -528,7 +528,7 @@ void NativeWindowViews::Show() { NotifyWindowShow(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -541,7 +541,7 @@ void NativeWindowViews::ShowInactive() { +@@ -544,7 +544,7 @@ void NativeWindowViews::ShowInactive() { NotifyWindowShow(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -560,7 +560,7 @@ void NativeWindowViews::Hide() { +@@ -563,7 +563,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 -@@ -591,7 +591,7 @@ bool NativeWindowViews::IsEnabled() const { +@@ -594,7 +594,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 (IsX11()) return !event_disabler_.get(); NOTIMPLEMENTED(); -@@ -831,7 +831,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -844,7 +844,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 (!resizable_) { -@@ -1089,7 +1089,7 @@ bool NativeWindowViews::IsClosable() const { +@@ -1102,7 +1102,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 } -@@ -1129,7 +1129,7 @@ void NativeWindowViews::Center() { +@@ -1142,7 +1142,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::GetScreen()->GetDisplayNearestWindow(GetNativeWindow()); gfx::Rect window_bounds_in_screen = display.work_area(); -@@ -1352,7 +1352,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men +@@ -1365,7 +1365,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(); -@@ -1407,7 +1407,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* +@@ -1420,7 +1420,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 (IsX11()) { auto* connection = x11::Connection::Get(); connection->SetProperty( -@@ -1453,7 +1453,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1466,7 +1466,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); } -@@ -1524,7 +1524,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con - } +@@ -1544,7 +1544,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con + if (const auto* view_native_widget = widget()->native_widget_private()) + return view_native_widget->IsVisibleOnAllWorkspaces(); - bool NativeWindowViews::IsVisibleOnAllWorkspaces() const { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (IsX11()) { // Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to // determine whether the current window is visible on all workspaces. -@@ -1547,7 +1547,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1567,7 +1567,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 = -@@ -1645,7 +1645,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1665,7 +1665,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()); -@@ -1741,7 +1741,7 @@ bool NativeWindowViews::CanMinimize() const { +@@ -1761,7 +1761,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 } -@@ -1797,7 +1797,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1817,7 +1817,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) -@@ -1816,7 +1816,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1836,7 +1836,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/electron35/files/patch-electron_shell_browser_ui_file__dialog.h b/devel/electron35/files/patch-electron_shell_browser_ui_file__dialog.h new file mode 100644 index 000000000000..dccc81864b78 --- /dev/null +++ b/devel/electron35/files/patch-electron_shell_browser_ui_file__dialog.h @@ -0,0 +1,11 @@ +--- electron/shell/browser/ui/file_dialog.h.orig 2025-05-10 23:09:28 UTC ++++ electron/shell/browser/ui/file_dialog.h +@@ -77,7 +77,7 @@ void ShowSaveDialog(const DialogSettings& settings, + void ShowSaveDialog(const DialogSettings& settings, + gin_helper::Promise promise); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Rewrite of SelectFileDialogLinuxPortal equivalent functions with primary + // difference being that dbus_thread_linux::GetSharedSessionBus is not used + // so that version detection can be initiated and compeleted on the dbus thread diff --git a/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts index 7747ff6553cc..35a58fabd5cf 100644 --- a/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,182 +1,182 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2025-04-17 14:56:35 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2025-05-06 23:52:46 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'); @@ -296,7 +296,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 }); @@ -1170,7 +1170,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; @@ -1187,7 +1187,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(); @@ -1252,7 +1252,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 }); @@ -1353,7 +1353,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 }); @@ -1812,7 +1812,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'); @@ -2022,7 +2022,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'); -@@ -2985,7 +2985,7 @@ describe('BrowserWindow module', () => { +@@ -2986,7 +2986,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); -@@ -3011,7 +3011,7 @@ describe('BrowserWindow module', () => { +@@ -3012,7 +3012,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); -@@ -3222,7 +3222,7 @@ describe('BrowserWindow module', () => { +@@ -3223,7 +3223,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(); -@@ -3288,7 +3288,7 @@ describe('BrowserWindow module', () => { +@@ -3289,7 +3289,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(); -@@ -3953,7 +3953,7 @@ describe('BrowserWindow module', () => { +@@ -3954,7 +3954,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 { -@@ -4458,7 +4458,7 @@ describe('BrowserWindow module', () => { +@@ -4459,7 +4459,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 }); -@@ -4729,7 +4729,7 @@ describe('BrowserWindow module', () => { +@@ -4730,7 +4730,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(); -@@ -4746,7 +4746,7 @@ describe('BrowserWindow module', () => { +@@ -4747,7 +4747,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 }); -@@ -4783,7 +4783,7 @@ describe('BrowserWindow module', () => { +@@ -4784,7 +4784,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(); -@@ -5269,7 +5269,7 @@ describe('BrowserWindow module', () => { +@@ -5270,7 +5270,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'); -@@ -5408,7 +5408,7 @@ describe('BrowserWindow module', () => { +@@ -5429,7 +5429,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); -@@ -6678,7 +6678,7 @@ describe('BrowserWindow module', () => { +@@ -6679,7 +6679,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/electron35/files/patch-electron_spec_api-menu-spec.ts b/devel/electron35/files/patch-electron_spec_api-menu-spec.ts index 0929780b9795..2d4a1fa635e6 100644 --- a/devel/electron35/files/patch-electron_spec_api-menu-spec.ts +++ b/devel/electron35/files/patch-electron_spec_api-menu-spec.ts @@ -1,11 +1,11 @@ ---- electron/spec/api-menu-spec.ts.orig 2024-10-09 13:53:06 UTC +--- electron/spec/api-menu-spec.ts.orig 2025-05-06 23:52:46 UTC +++ electron/spec/api-menu-spec.ts -@@ -890,7 +890,7 @@ describe('Menu module', function () { +@@ -891,7 +891,7 @@ describe('Menu module', function () { // https://github.com/electron/electron/issues/35724 // Maximizing window is enough to trigger the bug // FIXME(dsanders11): Test always passes on CI, even pre-fix - ifit(process.platform === 'linux' && !process.env.CI)('does not trigger issue #35724', (done) => { + ifit((process.platform === 'linux' || process.platform === 'freebsd') && !process.env.CI)('does not trigger issue #35724', (done) => { const showAndCloseMenu = async () => { await setTimeout(1000); menu.popup({ window: w, x: 50, y: 50 }); diff --git a/devel/electron35/files/patch-v8_src_diagnostics_perf-jit.cc b/devel/electron35/files/patch-v8_src_diagnostics_perf-jit.cc index 8ff9f89da4d4..8047bb29a79f 100644 --- a/devel/electron35/files/patch-v8_src_diagnostics_perf-jit.cc +++ b/devel/electron35/files/patch-v8_src_diagnostics_perf-jit.cc @@ -1,11 +1,11 @@ ---- v8/src/diagnostics/perf-jit.cc.orig 2023-10-19 20:00:39 UTC +--- v8/src/diagnostics/perf-jit.cc.orig 2025-05-10 23:04:03 UTC +++ v8/src/diagnostics/perf-jit.cc @@ -31,7 +31,7 @@ #include "src/flags/flags.h" - // Only compile the {LinuxPerfJitLogger} on Linux. --#if V8_OS_LINUX -+#if defined(V8_OS_LINUX) || defined(V8_OS_BSD) + // Only compile the {PerfJitLogger} on Linux & Darwin. +-#if V8_OS_LINUX || V8_OS_DARWIN ++#if defined(V8_OS_LINUX) || defined(V8_OS_DARWIN) || defined(V8_OS_BSD) #include #include diff --git a/devel/electron35/files/patch-v8_src_diagnostics_perf-jit.h b/devel/electron35/files/patch-v8_src_diagnostics_perf-jit.h index b5c06ad88b32..4981acef4fc9 100644 --- a/devel/electron35/files/patch-v8_src_diagnostics_perf-jit.h +++ b/devel/electron35/files/patch-v8_src_diagnostics_perf-jit.h @@ -1,11 +1,11 @@ ---- v8/src/diagnostics/perf-jit.h.orig 2022-06-17 14:20:10 UTC +--- v8/src/diagnostics/perf-jit.h.orig 2025-05-10 23:04:03 UTC +++ v8/src/diagnostics/perf-jit.h @@ -31,7 +31,7 @@ #include "include/v8config.h" - // {LinuxPerfJitLogger} is only implemented on Linux. --#if V8_OS_LINUX -+#if defined(V8_OS_LINUX) || defined(V8_OS_BSD) + // {PerfJitLogger} is only implemented on Linux & Darwin. +-#if V8_OS_LINUX || V8_OS_DARWIN ++#if defined(V8_OS_LINUX) || defined(V8_OS_DARWIN) || defined(V8_OS_BSD) #include "src/logging/log.h"