Skip to content

Commit fcc46be

Browse files
tagattietagattie
committed
devel/electron35: update to 35.4.0
Changelog: https://github.com/electron/electron/releases/tag/v35.4.0
1 parent ab74c75 commit fcc46be

9 files changed

+41
-41
lines changed

‎devel/electron35/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
223223
# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
224224
CHROMIUM_VER= 134.0.6998.205
225225
# See ${WRKSRC}/electron/DEPS for NODE_VER
226-
NODE_VER= 22.14.0
226+
NODE_VER= 22.15.0
227227
# See ${WRKSRC}/electron/DEPS for NAN_VER
228228
NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213
229229
# See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER

‎devel/electron35/Makefile.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
ELECTRON_VER= 35.3.0
1+
ELECTRON_VER= 35.4.0
22
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}

‎devel/electron35/distinfo‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TIMESTAMP = 1746917507
1+
TIMESTAMP = 1747311508
22
SHA256 (electron/chromium-134.0.6998.205.tar.xz.0) = 2de727120892e92fa40fed6c76104ed66dace4fe66ae3be0e055c51b913009e8
33
SIZE (electron/chromium-134.0.6998.205.tar.xz.0) = 2000000000
44
SHA256 (electron/chromium-134.0.6998.205.tar.xz.1) = 58024b9e01977a769576b4c2b3056c9d894a2c13b4f0729f0b8060b3984243c9
@@ -7,12 +7,12 @@ SHA256 (electron/chromium-134.0.6998.205.tar.xz.2) = 9631efe75d07b1f36799506e59b
77
SIZE (electron/chromium-134.0.6998.205.tar.xz.2) = 171552128
88
SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
99
SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
10-
SHA256 (electron/electron-yarn-cache-35.3.0.tar.xz) = 74a26f89b93b0b1756c6ff7e961b278235f109dab500a252c60f4d4a82637e7f
11-
SIZE (electron/electron-yarn-cache-35.3.0.tar.xz) = 29892244
12-
SHA256 (electron/electron-electron-v35.3.0_GH0.tar.gz) = d00d5368fb2783592eb1beb39281bf147f35da9c921fc5a21d884803a6a9b770
13-
SIZE (electron/electron-electron-v35.3.0_GH0.tar.gz) = 14762701
14-
SHA256 (electron/nodejs-node-v22.14.0_GH0.tar.gz) = ca1a2b5c0c7bc8343ccf1b4b6347a3cab093ed7ac642397189a15098105809c3
15-
SIZE (electron/nodejs-node-v22.14.0_GH0.tar.gz) = 121559746
10+
SHA256 (electron/electron-yarn-cache-35.4.0.tar.xz) = 74a26f89b93b0b1756c6ff7e961b278235f109dab500a252c60f4d4a82637e7f
11+
SIZE (electron/electron-yarn-cache-35.4.0.tar.xz) = 29892244
12+
SHA256 (electron/electron-electron-v35.4.0_GH0.tar.gz) = 746f6d1c5fa917313e32cb3dcba5d5011c523fd6bb55319edb3df979715c82f2
13+
SIZE (electron/electron-electron-v35.4.0_GH0.tar.gz) = 14768269
14+
SHA256 (electron/nodejs-node-v22.15.0_GH0.tar.gz) = 4f2515e143ffd73f069916ecc5daf503e7a05166c0ae4f1c1f8afdc8ab2f8a82
15+
SIZE (electron/nodejs-node-v22.15.0_GH0.tar.gz) = 122833296
1616
SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
1717
SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646
1818
SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01

‎devel/electron35/files/patch-electron_shell_browser_native__window__views.cc‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- electron/shell/browser/native_window_views.cc.orig 2025-05-06 23:52:46 UTC
1+
--- electron/shell/browser/native_window_views.cc.orig 2025-05-13 12:56:52 UTC
22
+++ electron/shell/browser/native_window_views.cc
3-
@@ -50,7 +50,7 @@
3+
@@ -51,7 +51,7 @@
44
#include "ui/wm/core/shadow_types.h"
55
#include "ui/wm/core/window_util.h"
66

@@ -9,7 +9,7 @@
99
#include "base/strings/string_util.h"
1010
#include "shell/browser/browser.h"
1111
#include "shell/browser/linux/unity_service.h"
12-
@@ -295,7 +295,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
12+
@@ -296,7 +296,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
1313
params.parent = parent->GetNativeWindow();
1414

1515
params.native_widget = new ElectronDesktopNativeWidgetAura(this);
@@ -18,7 +18,7 @@
1818
std::string name = Browser::Get()->GetName();
1919
// Set WM_WINDOW_ROLE.
2020
params.wm_role_name = "browser-window";
21-
@@ -321,7 +321,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
21+
@@ -322,7 +322,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
2222
std::string window_type;
2323
options.Get(options::kType, &window_type);
2424

@@ -27,7 +27,7 @@
2727
// Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.
2828
bool use_dark_theme = false;
2929
if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) {
30-
@@ -430,7 +430,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
30+
@@ -431,7 +431,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
3131
if (window)
3232
window->AddPreTargetHandler(this);
3333

@@ -36,7 +36,7 @@
3636
// On linux after the widget is initialized we might have to force set the
3737
// bounds if the bounds are smaller than the current display
3838
SetBounds(gfx::Rect(GetPosition(), bounds.size()), false);
39-
@@ -466,7 +466,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us
39+
@@ -467,7 +467,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us
4040
}
4141

4242
void NativeWindowViews::SetGTKDarkThemeEnabled(bool use_dark_theme) {
@@ -45,7 +45,7 @@
4545
if (IsX11()) {
4646
const std::string color = use_dark_theme ? "dark" : "light";
4747
auto* connection = x11::Connection::Get();
48-
@@ -528,7 +528,7 @@ void NativeWindowViews::Show() {
48+
@@ -529,7 +529,7 @@ void NativeWindowViews::Show() {
4949

5050
NotifyWindowShow();
5151

@@ -54,7 +54,7 @@
5454
if (global_menu_bar_)
5555
global_menu_bar_->OnWindowMapped();
5656

57-
@@ -544,7 +544,7 @@ void NativeWindowViews::ShowInactive() {
57+
@@ -545,7 +545,7 @@ void NativeWindowViews::ShowInactive() {
5858

5959
NotifyWindowShow();
6060

@@ -63,7 +63,7 @@
6363
if (global_menu_bar_)
6464
global_menu_bar_->OnWindowMapped();
6565

66-
@@ -563,7 +563,7 @@ void NativeWindowViews::Hide() {
66+
@@ -564,7 +564,7 @@ void NativeWindowViews::Hide() {
6767

6868
NotifyWindowHide();
6969

@@ -72,7 +72,7 @@
7272
if (global_menu_bar_)
7373
global_menu_bar_->OnWindowUnmapped();
7474
#endif
75-
@@ -594,7 +594,7 @@ bool NativeWindowViews::IsEnabled() const {
75+
@@ -595,7 +595,7 @@ bool NativeWindowViews::IsEnabled() const {
7676
bool NativeWindowViews::IsEnabled() const {
7777
#if BUILDFLAG(IS_WIN)
7878
return ::IsWindowEnabled(GetAcceleratedWidget());
@@ -81,7 +81,7 @@
8181
if (IsX11())
8282
return !event_disabler_.get();
8383
NOTIMPLEMENTED();
84-
@@ -844,7 +844,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
84+
@@ -845,7 +845,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
8585
}
8686
#endif
8787

@@ -90,7 +90,7 @@
9090
// On Linux and Windows the minimum and maximum size should be updated with
9191
// window size when window is not resizable.
9292
if (!resizable_) {
93-
@@ -1102,7 +1102,7 @@ bool NativeWindowViews::IsClosable() const {
93+
@@ -1103,7 +1103,7 @@ bool NativeWindowViews::IsClosable() const {
9494
return false;
9595
}
9696
return !(info.fState & MFS_DISABLED);
@@ -99,7 +99,7 @@
9999
return true;
100100
#endif
101101
}
102-
@@ -1142,7 +1142,7 @@ void NativeWindowViews::Center() {
102+
@@ -1143,7 +1143,7 @@ void NativeWindowViews::Center() {
103103
// for now to avoid breaking API contract, but should consider the long
104104
// term plan for this aligning with upstream.
105105
void NativeWindowViews::Center() {
@@ -108,7 +108,7 @@
108108
auto display =
109109
display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeWindow());
110110
gfx::Rect window_bounds_in_screen = display.work_area();
111-
@@ -1365,7 +1365,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
111+
@@ -1367,7 +1367,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
112112
}
113113

114114
void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) {
@@ -117,7 +117,7 @@
117117
// Remove global menu bar.
118118
if (global_menu_bar_ && menu_model == nullptr) {
119119
global_menu_bar_.reset();
120-
@@ -1420,7 +1420,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow*
120+
@@ -1422,7 +1422,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow*
121121
void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
122122
NativeWindow::SetParentWindow(parent);
123123

@@ -126,7 +126,7 @@
126126
if (IsX11()) {
127127
auto* connection = x11::Connection::Get();
128128
connection->SetProperty(
129-
@@ -1466,7 +1466,7 @@ void NativeWindowViews::SetProgressBar(double progress
129+
@@ -1468,7 +1468,7 @@ void NativeWindowViews::SetProgressBar(double progress
130130
NativeWindow::ProgressState state) {
131131
#if BUILDFLAG(IS_WIN)
132132
taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
@@ -135,7 +135,7 @@
135135
if (unity::IsRunning()) {
136136
unity::SetProgressFraction(progress);
137137
}
138-
@@ -1544,7 +1544,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
138+
@@ -1546,7 +1546,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
139139
if (const auto* view_native_widget = widget()->native_widget_private())
140140
return view_native_widget->IsVisibleOnAllWorkspaces();
141141

@@ -144,7 +144,7 @@
144144
if (IsX11()) {
145145
// Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to
146146
// determine whether the current window is visible on all workspaces.
147-
@@ -1567,7 +1567,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
147+
@@ -1569,7 +1569,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
148148
#if BUILDFLAG(IS_WIN)
149149
window_handle =
150150
reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
@@ -153,7 +153,7 @@
153153
window_handle = static_cast<uint32_t>(accelerated_widget);
154154
#endif
155155
aura::WindowTreeHost* const host =
156-
@@ -1665,7 +1665,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
156+
@@ -1667,7 +1667,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
157157
SendMessage(hwnd, WM_SETICON, ICON_BIG,
158158
reinterpret_cast<LPARAM>(app_icon_.get()));
159159
}
@@ -162,7 +162,7 @@
162162
void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
163163
auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
164164
GetAcceleratedWidget());
165-
@@ -1761,7 +1761,7 @@ bool NativeWindowViews::CanMinimize() const {
165+
@@ -1763,7 +1763,7 @@ bool NativeWindowViews::CanMinimize() const {
166166
bool NativeWindowViews::CanMinimize() const {
167167
#if BUILDFLAG(IS_WIN)
168168
return minimizable_;
@@ -171,7 +171,7 @@
171171
return true;
172172
#endif
173173
}
174-
@@ -1817,7 +1817,7 @@ void NativeWindowViews::HandleKeyboardEvent(
174+
@@ -1819,7 +1819,7 @@ void NativeWindowViews::HandleKeyboardEvent(
175175
if (widget_destroyed_)
176176
return;
177177

@@ -180,7 +180,7 @@
180180
if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
181181
NotifyWindowExecuteAppCommand(kBrowserBackward);
182182
else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
183-
@@ -1836,7 +1836,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
183+
@@ -1838,7 +1838,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
184184
// Alt+Click should not toggle menu bar.
185185
root_view_.ResetAltState();
186186

‎devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- electron/spec/api-browser-window-spec.ts.orig 2025-05-06 23:52:46 UTC
1+
--- electron/spec/api-browser-window-spec.ts.orig 2025-05-13 12:56:52 UTC
22
+++ electron/spec/api-browser-window-spec.ts
33
@@ -69,7 +69,7 @@ describe('BrowserWindow module', () => {
44
}).not.to.throw();
@@ -162,7 +162,7 @@
162162
const w = new BrowserWindow({ show: false });
163163
expect(w.resizable).to.be.true('resizable');
164164

165-
@@ -5429,7 +5429,7 @@ describe('BrowserWindow module', () => {
165+
@@ -5480,7 +5480,7 @@ describe('BrowserWindow module', () => {
166166
});
167167
});
168168

‎devel/electron35/files/patch-ui_gfx_x_atom__cache.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ui/gfx/x/atom_cache.cc.orig 2025-01-27 17:37:37 UTC
1+
--- ui/gfx/x/atom_cache.cc.orig 2025-05-15 12:22:59 UTC
22
+++ ui/gfx/x/atom_cache.cc
3-
@@ -155,6 +155,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha
3+
@@ -156,6 +156,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha
44
"application/octet-stream",
55
"application/vnd.chromium.test",
66
"chromium/filename",

‎devel/electron35/files/patch-ui_ozone_platform_x11_x11__window.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ui/ozone/platform/x11/x11_window.cc.orig 2025-01-27 17:37:37 UTC
1+
--- ui/ozone/platform/x11/x11_window.cc.orig 2025-05-15 12:22:59 UTC
22
+++ ui/ozone/platform/x11/x11_window.cc
3-
@@ -1502,7 +1502,7 @@ void X11Window::OnXWindowStateChanged() {
3+
@@ -1509,7 +1509,7 @@ void X11Window::OnXWindowStateChanged() {
44
WindowTiledEdges tiled_state = GetTiledState();
55
if (tiled_state != tiled_state_) {
66
tiled_state_ = tiled_state;

‎devel/electron35/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2025-03-24 20:50:14 UTC
1+
--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2025-05-15 12:22:59 UTC
22
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
33
@@ -50,7 +50,7 @@
44
#include "ui/wm/core/window_util.h"
@@ -18,7 +18,7 @@
1818
std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
1919
#else
2020
std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
21-
@@ -1174,7 +1174,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
21+
@@ -1179,7 +1179,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
2222
// DesktopWindowTreeHost:
2323

2424
// Linux subclasses this host and adds some Linux specific bits.

‎devel/electron35/files/patch-ui_views_widget_widget.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- ui/views/widget/widget.cc.orig 2025-03-24 20:50:14 UTC
1+
--- ui/views/widget/widget.cc.orig 2025-05-15 12:22:59 UTC
22
+++ ui/views/widget/widget.cc
33
@@ -63,7 +63,7 @@
44
#include "ui/views/window/custom_frame_view.h"
@@ -9,7 +9,7 @@
99
#include "ui/linux/linux_ui.h"
1010
#endif
1111

12-
@@ -2444,7 +2444,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const
12+
@@ -2450,7 +2450,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const
1313
return parent_->GetNativeTheme();
1414
}
1515

0 commit comments

Comments
 (0)