diff options
Diffstat (limited to 'devel/electron37')
13 files changed, 76 insertions, 107 deletions
diff --git a/devel/electron37/Makefile b/devel/electron37/Makefile index 1064bbe297cf..5d3fef289dcc 100644 --- a/devel/electron37/Makefile +++ b/devel/electron37/Makefile @@ -220,9 +220,9 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER -CHROMIUM_VER= 138.0.7204.100 +CHROMIUM_VER= 138.0.7204.157 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 22.17.0 +NODE_VER= 22.17.1 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER diff --git a/devel/electron37/Makefile.version b/devel/electron37/Makefile.version index bb8c54495d28..e3523fa3bf77 100644 --- a/devel/electron37/Makefile.version +++ b/devel/electron37/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 37.2.3 +ELECTRON_VER= 37.2.4 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron37/distinfo b/devel/electron37/distinfo index 5965dd844c9d..e27bb1a04fd9 100644 --- a/devel/electron37/distinfo +++ b/devel/electron37/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1752785159 -SHA256 (electron/chromium-138.0.7204.100.tar.xz) = 368d1a1d73c8703b9f9252340680468e3e3073b33b5127ac9e5fd8e9431b18b8 -SIZE (electron/chromium-138.0.7204.100.tar.xz) = 7269991840 +TIMESTAMP = 1753322506 +SHA256 (electron/chromium-138.0.7204.157.tar.xz) = 835dfd3228f6adb2a8c78e296c7d4981aee35daee401a2fe1493b4657d736d25 +SIZE (electron/chromium-138.0.7204.157.tar.xz) = 7275180828 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-37.2.3.tar.xz) = aab59edf3be7db5f011edb65a3684ce424d6bc016067fa5a6ff6d9afe08fc188 -SIZE (electron/electron-yarn-cache-37.2.3.tar.xz) = 30486640 -SHA256 (electron/electron-electron-v37.2.3_GH0.tar.gz) = d67acd729e4fc909bfd1405a194563bd40ab1c0e7c1b7b1d66fd9b0619b8f0bb -SIZE (electron/electron-electron-v37.2.3_GH0.tar.gz) = 15824762 -SHA256 (electron/nodejs-node-v22.17.0_GH0.tar.gz) = 8d96cd01627c625e9e1db219f91ebbccae074ae4ce1a99a48aeed3d6da9161b9 -SIZE (electron/nodejs-node-v22.17.0_GH0.tar.gz) = 123067140 +SHA256 (electron/electron-yarn-cache-37.2.4.tar.xz) = 156bcfdc1d2066a4e3639d76851884f446942aa05a371cbf4b6f43381fed497b +SIZE (electron/electron-yarn-cache-37.2.4.tar.xz) = 30485132 +SHA256 (electron/electron-electron-v37.2.4_GH0.tar.gz) = 67d80459149e885a7bfa6b832dbf094b0f9f41e4fe576810cedad778f4a665b3 +SIZE (electron/electron-electron-v37.2.4_GH0.tar.gz) = 15824526 +SHA256 (electron/nodejs-node-v22.17.1_GH0.tar.gz) = 7a1dbcd53b7152df5592624698f987fd626d9240c33d59dfef13812e4c168eb2 +SIZE (electron/nodejs-node-v22.17.1_GH0.tar.gz) = 123061071 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01 diff --git a/devel/electron37/files/package.json b/devel/electron37/files/package.json index c62b95ca7871..4a3a1d78f04b 100644 --- a/devel/electron37/files/package.json +++ b/devel/electron37/files/package.json @@ -18,7 +18,6 @@ "@types/semver": "^7.5.8", "@types/stream-json": "^1.7.7", "@types/temp": "^0.9.4", - "@types/webpack": "^5.28.5", "@types/webpack-env": "^1.18.5", "@typescript-eslint/eslint-plugin": "^8.7.0", "@typescript-eslint/parser": "^8.7.0", diff --git a/devel/electron37/files/patch-ash_display_mirror__window__controller.cc b/devel/electron37/files/patch-ash_display_mirror__window__controller.cc index 6eae7ace3785..2f730fc7eeda 100644 --- a/devel/electron37/files/patch-ash_display_mirror__window__controller.cc +++ b/devel/electron37/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2025-01-27 17:37:37 UTC +--- ash/display/mirror_window_controller.cc.orig 2025-07-14 18:11:59 UTC +++ ash/display/mirror_window_controller.cc -@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow( +@@ -283,7 +283,11 @@ void MirrorWindowController::UpdateWindow( if (!base::Contains(display_info_list, iter->first, &display::ManagedDisplayInfo::id)) { CloseAndDeleteHost(iter->second, true); diff --git a/devel/electron37/files/patch-electron_shell_browser_native__window.cc b/devel/electron37/files/patch-electron_shell_browser_native__window.cc index fca4b51359b0..c1ac025389df 100644 --- a/devel/electron37/files/patch-electron_shell_browser_native__window.cc +++ b/devel/electron37/files/patch-electron_shell_browser_native__window.cc @@ -1,11 +1,11 @@ ---- electron/shell/browser/native_window.cc.orig 2025-07-02 10:12:01 UTC +--- electron/shell/browser/native_window.cc.orig 2025-07-22 07:51:00 UTC +++ electron/shell/browser/native_window.cc -@@ -184,7 +184,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D +@@ -182,7 +182,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D } else { SetSizeConstraints(size_constraints); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool closable; - if (options.Get(options::kClosable, &closable)) { - SetClosable(closable); + if (bool val; options.Get(options::kClosable, &val)) + SetClosable(val); + #endif diff --git a/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc index dc3bb249236d..9cfa655838e9 100644 --- a/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2025-07-02 10:12:01 UTC +--- electron/shell/browser/native_window_views.cc.orig 2025-07-22 07:51:00 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" -@@ -299,7 +299,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -282,7 +282,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"; -@@ -324,7 +324,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -307,7 +307,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); -@@ -448,7 +448,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -429,7 +429,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); -@@ -469,7 +469,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us +@@ -450,7 +450,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(); -@@ -530,7 +530,7 @@ void NativeWindowViews::Show() { +@@ -511,7 +511,7 @@ void NativeWindowViews::Show() { NotifyWindowShow(); @@ -54,7 +54,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -546,7 +546,7 @@ void NativeWindowViews::ShowInactive() { +@@ -527,7 +527,7 @@ void NativeWindowViews::ShowInactive() { NotifyWindowShow(); @@ -63,7 +63,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -565,7 +565,7 @@ void NativeWindowViews::Hide() { +@@ -546,7 +546,7 @@ void NativeWindowViews::Hide() { NotifyWindowHide(); @@ -72,7 +72,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowUnmapped(); #endif -@@ -596,7 +596,7 @@ bool NativeWindowViews::IsEnabled() const { +@@ -577,7 +577,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(); -@@ -846,7 +846,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -827,7 +827,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_) { -@@ -1103,7 +1103,7 @@ bool NativeWindowViews::IsClosable() const { +@@ -1084,7 +1084,7 @@ bool NativeWindowViews::IsClosable() const { return false; } return !(info.fState & MFS_DISABLED); @@ -99,7 +99,7 @@ return true; #endif } -@@ -1143,7 +1143,7 @@ void NativeWindowViews::Center() { +@@ -1124,7 +1124,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(); -@@ -1368,7 +1368,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men +@@ -1349,7 +1349,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(); -@@ -1424,7 +1424,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* +@@ -1405,7 +1405,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( -@@ -1470,7 +1470,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1451,7 +1451,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); } -@@ -1568,7 +1568,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1549,7 +1549,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM #if BUILDFLAG(IS_WIN) window_handle = reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget); @@ -144,7 +144,7 @@ window_handle = static_cast<uint32_t>(accelerated_widget); #endif aura::WindowTreeHost* const host = -@@ -1666,7 +1666,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1647,7 +1647,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC SendMessage(hwnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(app_icon_.get())); } @@ -153,7 +153,7 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget( GetAcceleratedWidget()); -@@ -1771,7 +1771,7 @@ bool NativeWindowViews::CanMinimize() const { +@@ -1752,7 +1752,7 @@ bool NativeWindowViews::CanMinimize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -162,7 +162,7 @@ return true; #endif } -@@ -1827,7 +1827,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1808,7 +1808,7 @@ void NativeWindowViews::HandleKeyboardEvent( if (widget_destroyed_) return; @@ -171,7 +171,7 @@ if (event.windows_key_code == ui::VKEY_BROWSER_BACK) NotifyWindowExecuteAppCommand(kBrowserBackward); else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD) -@@ -1846,7 +1846,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1827,7 +1827,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron37/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron37/files/patch-electron_spec_api-browser-window-spec.ts index 48b2a66afcda..a2aaae07511d 100644 --- a/devel/electron37/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron37/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2025-07-09 10:31:48 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2025-07-22 07:51:00 UTC +++ electron/spec/api-browser-window-spec.ts -@@ -69,7 +69,7 @@ describe('BrowserWindow module', () => { +@@ -68,7 +68,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); }); @@ -9,7 +9,7 @@ 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', () => { +@@ -295,7 +295,7 @@ describe('BrowserWindow module', () => { }); }); @@ -18,7 +18,7 @@ afterEach(closeAllWindows); it('can set content protection', async () => { const w = new BrowserWindow({ show: false }); -@@ -1167,7 +1167,7 @@ describe('BrowserWindow module', () => { +@@ -1166,7 +1166,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.minimize()', () => { // TODO(codebytere): Enable for Linux once maximize/minimize events work in CI. @@ -27,7 +27,7 @@ const minimize = once(w, 'minimize'); w.minimize(); await minimize; -@@ -1184,7 +1184,7 @@ describe('BrowserWindow module', () => { +@@ -1183,7 +1183,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable for Linux once CI plays nice with these kinds of tests @@ -36,7 +36,7 @@ const maximize = once(w, 'maximize'); const shown = once(w, 'show'); w.maximize(); -@@ -1249,7 +1249,7 @@ describe('BrowserWindow module', () => { +@@ -1248,7 +1248,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(true); }); @@ -45,7 +45,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1351,7 +1351,7 @@ describe('BrowserWindow module', () => { +@@ -1350,7 +1350,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(false); }); @@ -54,7 +54,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1810,7 +1810,7 @@ describe('BrowserWindow module', () => { +@@ -1809,7 +1809,7 @@ describe('BrowserWindow module', () => { }); }); @@ -63,7 +63,7 @@ it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = once(w, 'maximize'); -@@ -2020,7 +2020,7 @@ describe('BrowserWindow module', () => { +@@ -2019,7 +2019,7 @@ describe('BrowserWindow module', () => { }); }); @@ -72,7 +72,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -2984,7 +2984,7 @@ describe('BrowserWindow module', () => { +@@ -2983,7 +2983,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.setOpacity(opacity)', () => { afterEach(closeAllWindows); @@ -81,7 +81,7 @@ it('make window with initial opacity', () => { const w = new BrowserWindow({ show: false, opacity: 0.5 }); expect(w.getOpacity()).to.equal(0.5); -@@ -3010,7 +3010,7 @@ describe('BrowserWindow module', () => { +@@ -3009,7 +3009,7 @@ describe('BrowserWindow module', () => { }); }); @@ -90,7 +90,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3221,7 +3221,7 @@ describe('BrowserWindow module', () => { +@@ -3220,7 +3220,7 @@ describe('BrowserWindow module', () => { expect(overlayRectPreMax.height).to.equal(size); // 'maximize' event is not emitted on Linux in CI. @@ -99,7 +99,7 @@ const maximize = once(w, 'maximize'); w.show(); w.maximize(); -@@ -3287,7 +3287,7 @@ describe('BrowserWindow module', () => { +@@ -3286,7 +3286,7 @@ describe('BrowserWindow module', () => { expect(preMaxHeight).to.equal(size); // 'maximize' event is not emitted on Linux in CI. @@ -108,7 +108,7 @@ const maximize = once(w, 'maximize'); w.show(); w.maximize(); -@@ -3952,7 +3952,7 @@ describe('BrowserWindow module', () => { +@@ -3951,7 +3951,7 @@ describe('BrowserWindow module', () => { expect(test.nodeTimers).to.equal(true); expect(test.nodeUrl).to.equal(true); @@ -117,7 +117,7 @@ expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -4457,7 +4457,7 @@ describe('BrowserWindow module', () => { +@@ -4456,7 +4456,7 @@ describe('BrowserWindow module', () => { }); }); @@ -126,7 +126,7 @@ afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); -@@ -4728,7 +4728,7 @@ describe('BrowserWindow module', () => { +@@ -4727,7 +4727,7 @@ describe('BrowserWindow module', () => { // TODO(zcbenz): // This test does not run on Linux CI. See: // https://github.com/electron/electron/issues/28699 @@ -135,7 +135,7 @@ const w = new BrowserWindow({}); const maximize = once(w, 'maximize'); w.maximize(); -@@ -4745,7 +4745,7 @@ describe('BrowserWindow module', () => { +@@ -4744,7 +4744,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI @@ -144,7 +144,7 @@ afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -4782,7 +4782,7 @@ describe('BrowserWindow module', () => { +@@ -4781,7 +4781,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 @@ -153,7 +153,7 @@ const w = new BrowserWindow(); const minimize = once(w, 'minimize'); w.minimize(); -@@ -5268,7 +5268,7 @@ describe('BrowserWindow module', () => { +@@ -5267,7 +5267,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. @@ -162,7 +162,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -5478,7 +5478,7 @@ describe('BrowserWindow module', () => { +@@ -5477,7 +5477,7 @@ describe('BrowserWindow module', () => { }); }); @@ -171,7 +171,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6725,7 +6725,7 @@ describe('BrowserWindow module', () => { +@@ -6678,7 +6678,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); diff --git a/devel/electron37/files/patch-electron_spec_api-web-frame-main-spec.ts b/devel/electron37/files/patch-electron_spec_api-web-frame-main-spec.ts index 279337ccb3c6..b5e0170a4816 100644 --- a/devel/electron37/files/patch-electron_spec_api-web-frame-main-spec.ts +++ b/devel/electron37/files/patch-electron_spec_api-web-frame-main-spec.ts @@ -1,7 +1,7 @@ ---- electron/spec/api-web-frame-main-spec.ts.orig 2024-12-05 00:03:13 UTC +--- electron/spec/api-web-frame-main-spec.ts.orig 2025-07-22 07:51:00 UTC +++ electron/spec/api-web-frame-main-spec.ts -@@ -315,7 +315,7 @@ describe('webFrameMain module', () => { - }); +@@ -316,7 +316,7 @@ describe('webFrameMain module', () => { + afterEach(closeAllWindows); // TODO(jkleinsc) fix this flaky test on linux - ifit(process.platform !== 'linux')('throws upon accessing properties when disposed', async () => { diff --git a/devel/electron37/files/patch-ui_accessibility_ax__tree.cc b/devel/electron37/files/patch-ui_accessibility_ax__tree.cc index 86a10f0c749b..8e900bdbff86 100644 --- a/devel/electron37/files/patch-ui_accessibility_ax__tree.cc +++ b/devel/electron37/files/patch-ui_accessibility_ax__tree.cc @@ -1,4 +1,4 @@ ---- ui/accessibility/ax_tree.cc.orig 2025-06-30 07:04:30 UTC +--- ui/accessibility/ax_tree.cc.orig 2025-07-14 18:11:59 UTC +++ ui/accessibility/ax_tree.cc @@ -867,7 +867,7 @@ bool AXTree::ComputeNodeIsIgnoredChanged( return old_node_is_ignored != new_node_is_ignored; @@ -18,7 +18,7 @@ ClearExtraAnnouncementNodes(); #endif // BUILDFLAG(IS_LINUX) -@@ -2181,7 +2181,7 @@ void AXTree::NotifyNodeAttributesWillChange( +@@ -2187,7 +2187,7 @@ void AXTree::NotifyNodeAttributesWillChange( new_data); } @@ -27,7 +27,7 @@ void AXTree::ClearExtraAnnouncementNodes() { if (!extra_announcement_nodes_) { return; -@@ -2570,7 +2570,7 @@ bool AXTree::CreateNewChildVector( +@@ -2576,7 +2576,7 @@ bool AXTree::CreateNewChildVector( AXTreeUpdateState* update_state) { DCHECK(GetTreeUpdateInProgressState()); bool success = true; diff --git a/devel/electron37/files/patch-ui_gtk_gtk__compat.cc b/devel/electron37/files/patch-ui_gtk_gtk__compat.cc index a670361153b9..58d0bca48e6b 100644 --- a/devel/electron37/files/patch-ui_gtk_gtk__compat.cc +++ b/devel/electron37/files/patch-ui_gtk_gtk__compat.cc @@ -1,6 +1,6 @@ ---- ui/gtk/gtk_compat.cc.orig 2025-07-04 05:17:07 UTC +--- ui/gtk/gtk_compat.cc.orig 2025-07-24 02:17:12 UTC +++ ui/gtk/gtk_compat.cc -@@ -65,22 +65,38 @@ void* GetLibGio() { +@@ -64,22 +64,38 @@ void* GetLibGio() { } void* GetLibGio() { @@ -39,7 +39,7 @@ return libgtk4; } -@@ -165,7 +181,11 @@ void* GetLibGdkPixbuf() { +@@ -161,7 +177,11 @@ void* GetLibGdkPixbuf() { } // namespace void* GetLibGdkPixbuf() { diff --git a/devel/electron37/files/patch-ui_gtk_ime__compat__check.cc b/devel/electron37/files/patch-ui_gtk_ime__compat__check.cc deleted file mode 100644 index f5084072bfc6..000000000000 --- a/devel/electron37/files/patch-ui_gtk_ime__compat__check.cc +++ /dev/null @@ -1,21 +0,0 @@ ---- ui/gtk/ime_compat_check.cc.orig 2025-06-30 07:04:30 UTC -+++ ui/gtk/ime_compat_check.cc -@@ -35,6 +35,10 @@ std::vector<base::FilePath> GetLibrarySearchPaths() { - - std::vector<base::FilePath> GetLibrarySearchPaths() { - std::vector<base::FilePath> search_path; -+#if BUILDFLAG(IS_BSD) -+ // We really only care about this search path. -+ search_path.emplace_back("/usr/local/lib"); -+#else - void* handle = dlopen("libc.so.6", RTLD_GLOBAL | RTLD_LAZY | RTLD_NOLOAD); - if (!handle) { - return search_path; -@@ -60,6 +64,7 @@ std::vector<base::FilePath> GetLibrarySearchPaths() { - // SAFETY: The range is bound by `serinfo.dls_cnt`. - search_path.emplace_back(UNSAFE_BUFFERS(sip->dls_serpath[j].dls_name)); - } -+#endif - - return search_path; - } diff --git a/devel/electron37/files/yarn.lock b/devel/electron37/files/yarn.lock index 4ff9dd5afc01..05eef81f0ca3 100644 --- a/devel/electron37/files/yarn.lock +++ b/devel/electron37/files/yarn.lock @@ -1063,15 +1063,6 @@ resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.18.5.tgz#eccda0b04fe024bed505881e2e532f9c119169bf" integrity sha512-wz7kjjRRj8/Lty4B+Kr0LN6Ypc/3SymeCCGSbaXp2leH0ZVg/PriNiOwNj4bD4uphI7A8NXS4b6Gl373sfO5mA== -"@types/webpack@^5.28.5": - version "5.28.5" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.5.tgz#0e9d9a15efa09bbda2cef41356ca4ac2031ea9a2" - integrity sha512-wR87cgvxj3p6D0Crt1r5avwqffqPXUkNlnQ1mjU93G7gCuFjufZR4I6j8cz5g1F1tTYpfOOFvly+cmIQwL9wvw== - dependencies: - "@types/node" "*" - tapable "^2.2.0" - webpack "^5" - "@types/yauzl@^2.9.1": version "2.10.0" resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" @@ -1669,17 +1660,17 @@ boolean@^3.0.1: integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + version "1.1.12" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843" + integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7" + integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ== dependencies: balanced-match "^1.0.0" @@ -8125,7 +8116,7 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5, webpack@^5.95.0: +webpack@^5.95.0: version "5.95.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0" integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q== |