diff options
Diffstat (limited to 'devel/electron35')
9 files changed, 43 insertions, 44 deletions
diff --git a/devel/electron35/Makefile b/devel/electron35/Makefile index 26b698e1b5fc..a9fcafbe1640 100644 --- a/devel/electron35/Makefile +++ b/devel/electron35/Makefile @@ -1,7 +1,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER} -PORTREVISION= 1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= devel diff --git a/devel/electron35/Makefile.version b/devel/electron35/Makefile.version index 31ae5ab3a081..cffb6275675d 100644 --- a/devel/electron35/Makefile.version +++ b/devel/electron35/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 35.5.1 +ELECTRON_VER= 35.6.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron35/distinfo b/devel/electron35/distinfo index 7eeec3a73232..a58741a3a5d5 100644 --- a/devel/electron35/distinfo +++ b/devel/electron35/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1749016488 +TIMESTAMP = 1751000007 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 @@ -7,10 +7,10 @@ SHA256 (electron/chromium-134.0.6998.205.tar.xz.2) = 9631efe75d07b1f36799506e59b 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.5.1.tar.xz) = 8dd2897a373ae0484eaa7fd55fded2dd079d5d5464a4fcd27891f72b72ae901a -SIZE (electron/electron-yarn-cache-35.5.1.tar.xz) = 30314304 -SHA256 (electron/electron-electron-v35.5.1_GH0.tar.gz) = c3c13483ad36d0bf69e156d1fcbfd695e28fa29e51c6884c31d06bbfcd0be91c -SIZE (electron/electron-electron-v35.5.1_GH0.tar.gz) = 14777583 +SHA256 (electron/electron-yarn-cache-35.6.0.tar.xz) = 8dd2897a373ae0484eaa7fd55fded2dd079d5d5464a4fcd27891f72b72ae901a +SIZE (electron/electron-yarn-cache-35.6.0.tar.xz) = 30314304 +SHA256 (electron/electron-electron-v35.6.0_GH0.tar.gz) = 73eb457807bb5824e880dd795f861a9986e3458b584cbb61ce6ffd9519306c23 +SIZE (electron/electron-electron-v35.6.0_GH0.tar.gz) = 14797550 SHA256 (electron/nodejs-node-v22.15.1_GH0.tar.gz) = 71c357ee1a2df8d58509fa2a88b2028698e3113a0f1cbfdb849e808bef0b18ff SIZE (electron/nodejs-node-v22.15.1_GH0.tar.gz) = 122830007 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb 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 836060152e07..ebed95e3efca 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,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-05-27 20:59:13 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-06-25 20:51:20 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc -@@ -159,11 +159,11 @@ +@@ -160,11 +160,11 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -14,7 +14,7 @@ #include "ui/aura/window.h" #include "ui/gfx/font_render_params.h" #endif -@@ -195,7 +195,7 @@ +@@ -196,7 +196,7 @@ #include "content/public/browser/plugin_service.h" #endif @@ -23,7 +23,7 @@ #include "chrome/browser/hang_monitor/hang_crash_dump.h" // nogncheck #endif -@@ -569,7 +569,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval( +@@ -570,7 +570,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval( ui::TextInsertionCaretBlinkPeriodFromDefaults()); if (system_value) return *system_value; @@ -32,7 +32,7 @@ if (auto* linux_ui = ui::LinuxUi::instance()) return linux_ui->GetCursorBlinkInterval(); #elif BUILDFLAG(IS_WIN) -@@ -930,7 +930,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -931,7 +931,7 @@ void WebContents::InitWithSessionAndOptions( accept_languages.pop_back(); prefs->accept_languages = accept_languages; @@ -41,7 +41,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2762,13 +2762,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2763,13 +2763,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); -@@ -3451,7 +3451,7 @@ void WebContents::Focus() { +@@ -3458,7 +3458,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 -@@ -4322,7 +4322,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4334,7 +4334,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron35/files/patch-electron_shell_browser_native__window.cc b/devel/electron35/files/patch-electron_shell_browser_native__window.cc index 35a7c1948a12..4a441c7b891a 100644 --- a/devel/electron35/files/patch-electron_shell_browser_native__window.cc +++ b/devel/electron35/files/patch-electron_shell_browser_native__window.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/native_window.cc.orig 2025-05-27 20:59:13 UTC +--- electron/shell/browser/native_window.cc.orig 2025-06-25 20:51:20 UTC +++ electron/shell/browser/native_window.cc -@@ -188,7 +188,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D +@@ -180,7 +180,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D } else { SetSizeConstraints(size_constraints); } 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 cc2df857179f..8f74632de896 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,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2025-05-27 20:59:13 UTC +--- electron/shell/browser/native_window_views.cc.orig 2025-06-25 20:51:20 UTC +++ electron/shell/browser/native_window_views.cc @@ -51,7 +51,7 @@ #include "ui/wm/core/shadow_types.h" @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "shell/browser/browser.h" #include "shell/browser/linux/unity_service.h" -@@ -289,7 +289,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -298,7 +298,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: params.parent = parent->GetNativeWindow(); params.native_widget = new ElectronDesktopNativeWidgetAura(this); @@ -18,7 +18,7 @@ std::string name = Browser::Get()->GetName(); // Set WM_WINDOW_ROLE. params.wm_role_name = "browser-window"; -@@ -314,7 +314,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -323,7 +323,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: std::string window_type; options.Get(options::kType, &window_type); @@ -27,7 +27,7 @@ // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set. if (options.ValueOrDefault(options::kDarkTheme, false)) SetGTKDarkThemeEnabled(true); -@@ -436,7 +436,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -447,7 +447,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: if (window) window->AddPreTargetHandler(this); @@ -36,7 +36,7 @@ // 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); -@@ -472,7 +472,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us +@@ -483,7 +483,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us } void NativeWindowViews::SetGTKDarkThemeEnabled(bool use_dark_theme) { @@ -45,7 +45,7 @@ if (x11_util::IsX11()) { const std::string color = use_dark_theme ? "dark" : "light"; auto* connection = x11::Connection::Get(); -@@ -534,7 +534,7 @@ void NativeWindowViews::Show() { +@@ -545,7 +545,7 @@ void NativeWindowViews::Show() { NotifyWindowShow(); @@ -54,7 +54,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -550,7 +550,7 @@ void NativeWindowViews::ShowInactive() { +@@ -561,7 +561,7 @@ void NativeWindowViews::ShowInactive() { NotifyWindowShow(); @@ -63,7 +63,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -569,7 +569,7 @@ void NativeWindowViews::Hide() { +@@ -580,7 +580,7 @@ void NativeWindowViews::Hide() { NotifyWindowHide(); @@ -72,7 +72,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowUnmapped(); #endif -@@ -600,7 +600,7 @@ bool NativeWindowViews::IsEnabled() const { +@@ -611,7 +611,7 @@ bool NativeWindowViews::IsEnabled() const { bool NativeWindowViews::IsEnabled() const { #if BUILDFLAG(IS_WIN) return ::IsWindowEnabled(GetAcceleratedWidget()); @@ -81,7 +81,7 @@ if (x11_util::IsX11()) return !event_disabler_.get(); NOTIMPLEMENTED(); -@@ -850,7 +850,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -861,7 +861,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 (!resizable_) { -@@ -1108,7 +1108,7 @@ bool NativeWindowViews::IsClosable() const { +@@ -1119,7 +1119,7 @@ bool NativeWindowViews::IsClosable() const { return false; } return !(info.fState & MFS_DISABLED); @@ -99,7 +99,7 @@ return true; #endif } -@@ -1148,7 +1148,7 @@ void NativeWindowViews::Center() { +@@ -1159,7 +1159,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::GetScreen()->GetDisplayNearestWindow(GetNativeWindow()); gfx::Rect window_bounds_in_screen = display.work_area(); -@@ -1372,7 +1372,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men +@@ -1383,7 +1383,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(); -@@ -1428,7 +1428,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* +@@ -1439,7 +1439,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( -@@ -1474,7 +1474,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1485,7 +1485,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); } -@@ -1552,7 +1552,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con +@@ -1563,7 +1563,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con if (const auto* view_native_widget = widget()->native_widget_private()) return view_native_widget->IsVisibleOnAllWorkspaces(); @@ -144,7 +144,7 @@ if (x11_util::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. -@@ -1575,7 +1575,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1586,7 +1586,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM #if BUILDFLAG(IS_WIN) window_handle = reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget); @@ -153,7 +153,7 @@ window_handle = static_cast<uint32_t>(accelerated_widget); #endif aura::WindowTreeHost* const host = -@@ -1673,7 +1673,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1684,7 +1684,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC SendMessage(hwnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(app_icon_.get())); } @@ -162,7 +162,7 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget( GetAcceleratedWidget()); -@@ -1769,7 +1769,7 @@ bool NativeWindowViews::CanMinimize() const { +@@ -1780,7 +1780,7 @@ bool NativeWindowViews::CanMinimize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -171,7 +171,7 @@ return true; #endif } -@@ -1825,7 +1825,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1836,7 +1836,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) -@@ -1844,7 +1844,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1855,7 +1855,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron35/files/patch-electron_shell_browser_native__window__views.h b/devel/electron35/files/patch-electron_shell_browser_native__window__views.h index 55c4ce545e4b..d794ff336f31 100644 --- a/devel/electron35/files/patch-electron_shell_browser_native__window__views.h +++ b/devel/electron35/files/patch-electron_shell_browser_native__window__views.h @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.h.orig 2025-03-10 00:01:50 UTC +--- electron/shell/browser/native_window_views.h.orig 2025-06-25 20:51:20 UTC +++ electron/shell/browser/native_window_views.h @@ -25,7 +25,7 @@ namespace electron { @@ -18,7 +18,7 @@ void SetIcon(const gfx::ImageSkia& icon); #endif -@@ -246,7 +246,7 @@ class NativeWindowViews : public NativeWindow, +@@ -247,7 +247,7 @@ class NativeWindowViews : public NativeWindow, // events from resizing the window. extensions::SizeConstraints old_size_constraints_; 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 index dccc81864b78..6fe45f01b557 100644 --- a/devel/electron35/files/patch-electron_shell_browser_ui_file__dialog.h +++ b/devel/electron35/files/patch-electron_shell_browser_ui_file__dialog.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/ui/file_dialog.h.orig 2025-05-10 23:09:28 UTC +--- electron/shell/browser/ui/file_dialog.h.orig 2025-06-25 20:51:20 UTC +++ electron/shell/browser/ui/file_dialog.h -@@ -77,7 +77,7 @@ void ShowSaveDialog(const DialogSettings& settings, +@@ -79,7 +79,7 @@ void ShowSaveDialog(const DialogSettings& settings, void ShowSaveDialog(const DialogSettings& settings, gin_helper::Promise<gin_helper::Dictionary> promise); diff --git a/devel/electron35/files/patch-electron_shell_common_node__bindings.cc b/devel/electron35/files/patch-electron_shell_common_node__bindings.cc index d65ade1f21e7..65ba5a5a68df 100644 --- a/devel/electron35/files/patch-electron_shell_common_node__bindings.cc +++ b/devel/electron35/files/patch-electron_shell_common_node__bindings.cc @@ -1,4 +1,4 @@ ---- electron/shell/common/node_bindings.cc.orig 2025-05-27 20:59:13 UTC +--- electron/shell/common/node_bindings.cc.orig 2025-06-25 20:51:20 UTC +++ electron/shell/common/node_bindings.cc @@ -46,7 +46,7 @@ #include "third_party/electron_node/src/debug_utils.h" @@ -27,7 +27,7 @@ electron::crash_keys::SetCrashKey("electron.v8-oom.is_heap_oom", std::to_string(details.is_heap_oom)); if (location) { -@@ -565,7 +565,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c +@@ -566,7 +566,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c TRACE_EVENT0("electron", "NodeBindings::Initialize"); // Open node's error reporting system for browser process. |