diff options
Diffstat (limited to 'devel/electron34')
9 files changed, 57 insertions, 37 deletions
diff --git a/devel/electron34/Makefile b/devel/electron34/Makefile index 4fb71e179bcd..6976c7fd85c4 100644 --- a/devel/electron34/Makefile +++ b/devel/electron34/Makefile @@ -221,7 +221,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER CHROMIUM_VER= 132.0.6834.210 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 20.19.0 +NODE_VER= 20.19.1 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER diff --git a/devel/electron34/Makefile.version b/devel/electron34/Makefile.version index f4a1fff84738..aeb88d4d3be0 100644 --- a/devel/electron34/Makefile.version +++ b/devel/electron34/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 34.5.3 +ELECTRON_VER= 34.5.5 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron34/distinfo b/devel/electron34/distinfo index 934c257fa997..78ef095ac7fc 100644 --- a/devel/electron34/distinfo +++ b/devel/electron34/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1745668879 +TIMESTAMP = 1746710420 SHA256 (electron/chromium-132.0.6834.210.tar.xz.0) = ede58a1501f175aaa6c92e47793b773ed10b31a43d600375cb40727c4ae677d5 SIZE (electron/chromium-132.0.6834.210.tar.xz.0) = 2000000000 SHA256 (electron/chromium-132.0.6834.210.tar.xz.1) = 6d080b3948ef1d63d08b8cc1390662a439e635b881561434787b8b67ea99b08d @@ -7,12 +7,12 @@ SHA256 (electron/chromium-132.0.6834.210.tar.xz.2) = 989e234492cf50454303ec6f490 SIZE (electron/chromium-132.0.6834.210.tar.xz.2) = 484148560 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-34.5.3.tar.xz) = f0fa33e22a0b00e5440fbc57517f7b303d43ca07c25e43f35e28f97c2ce12c83 -SIZE (electron/electron-yarn-cache-34.5.3.tar.xz) = 29062184 -SHA256 (electron/electron-electron-v34.5.3_GH0.tar.gz) = 4b3cebec13d72c7ce07b41d60da424bb28534f7978b618c0ec44f466c09ddf9c -SIZE (electron/electron-electron-v34.5.3_GH0.tar.gz) = 14850706 -SHA256 (electron/nodejs-node-v20.19.0_GH0.tar.gz) = 110955872bb826e0e59eb88018219dd0828d2276b77598c64f50140e97a9d704 -SIZE (electron/nodejs-node-v20.19.0_GH0.tar.gz) = 116087668 +SHA256 (electron/electron-yarn-cache-34.5.5.tar.xz) = f0fa33e22a0b00e5440fbc57517f7b303d43ca07c25e43f35e28f97c2ce12c83 +SIZE (electron/electron-yarn-cache-34.5.5.tar.xz) = 29062184 +SHA256 (electron/electron-electron-v34.5.5_GH0.tar.gz) = afcd0268d91eb2c26758e3e550f6824e50f83e39fd4135f3138fe83959b0cc98 +SIZE (electron/electron-electron-v34.5.5_GH0.tar.gz) = 14851351 +SHA256 (electron/nodejs-node-v20.19.1_GH0.tar.gz) = babcd5b9e3216510b89305e6774bcdb2905ca98ff60028b67f163eb8296b6665 +SIZE (electron/nodejs-node-v20.19.1_GH0.tar.gz) = 116091586 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/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.cc b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.cc index 147b610b4673..4ea73d313d50 100644 --- a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.cc +++ b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_base_window.cc.orig 2025-04-08 22:12:25 UTC +--- electron/shell/browser/api/electron_api_base_window.cc.orig 2025-05-01 14:56:40 UTC +++ electron/shell/browser/api/electron_api_base_window.cc @@ -41,7 +41,7 @@ #include "shell/browser/ui/views/win_frame_view.h" @@ -27,7 +27,7 @@ void BaseWindow::SetTitleBarOverlay(const gin_helper::Dictionary& options, gin_helper::Arguments* args) { // Ensure WCO is already enabled on this window -@@ -1294,7 +1294,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, +@@ -1296,7 +1296,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, .SetMethod("setThumbnailToolTip", &BaseWindow::SetThumbnailToolTip) .SetMethod("setAppDetails", &BaseWindow::SetAppDetails) #endif diff --git a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 4d4b2e7ea376..faa913297e6c 100644 --- a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-04-23 00:27:29 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-05-01 14:56:40 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -157,11 +157,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -66,7 +66,7 @@ if (owner_window()) owner_window()->Focus(true); #endif -@@ -4345,7 +4345,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4353,7 +4353,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.h index ac8da8ab6300..dda65ccaafb0 100644 --- a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-03-26 14:46:58 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-05-01 14:56:40 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -781,7 +781,7 @@ class WebContents final : public ExclusiveAccessContex +@@ -782,7 +782,7 @@ class WebContents final : public ExclusiveAccessContex #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC) ui::ImageModel GetDevToolsWindowIcon() override; #endif diff --git a/devel/electron34/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron34/files/patch-electron_shell_browser_native__window__views.cc index e30f7edbb8eb..2cfb678b506d 100644 --- a/devel/electron34/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron34/files/patch-electron_shell_browser_native__window__views.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2025-04-08 22:12:25 UTC +--- electron/shell/browser/native_window_views.cc.orig 2025-05-01 14:56:40 UTC +++ electron/shell/browser/native_window_views.cc @@ -49,7 +49,7 @@ #include "ui/wm/core/shadow_types.h" @@ -135,16 +135,16 @@ if (unity::IsRunning()) { unity::SetProgressFraction(progress); } -@@ -1522,7 +1522,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con - } +@@ -1529,7 +1529,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. -@@ -1545,7 +1545,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1552,7 +1552,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 = -@@ -1643,7 +1643,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1650,7 +1650,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()); -@@ -1739,7 +1739,7 @@ bool NativeWindowViews::CanMinimize() const { +@@ -1746,7 +1746,7 @@ bool NativeWindowViews::CanMinimize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -171,7 +171,7 @@ return true; #endif } -@@ -1795,7 +1795,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1802,7 +1802,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) -@@ -1814,7 +1814,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1821,7 +1821,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron34/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron34/files/patch-electron_spec_api-browser-window-spec.ts index 03aafb7ad92d..4d6d79ed4d10 100644 --- a/devel/electron34/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron34/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2025-04-23 00:27:29 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2025-05-01 14:56:40 UTC +++ electron/spec/api-browser-window-spec.ts @@ -69,7 +69,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -72,7 +72,7 @@ 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); @@ -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); -@@ -3011,7 +3011,7 @@ describe('BrowserWindow module', () => { +@@ -3012,7 +3012,7 @@ describe('BrowserWindow module', () => { }); }); @@ -90,7 +90,7 @@ 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. @@ -99,7 +99,7 @@ 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. @@ -108,7 +108,7 @@ 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); @@ -117,7 +117,7 @@ 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', () => { }); }); @@ -126,7 +126,7 @@ 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 @@ -135,7 +135,7 @@ 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 @@ -144,7 +144,7 @@ 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 @@ -153,7 +153,7 @@ 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. @@ -162,7 +162,7 @@ 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', () => { }); }); @@ -171,7 +171,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6653,7 +6653,7 @@ describe('BrowserWindow module', () => { +@@ -6654,7 +6654,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); diff --git a/devel/electron34/files/patch-third__party_blink_renderer_build_scripts_gperf.py b/devel/electron34/files/patch-third__party_blink_renderer_build_scripts_gperf.py new file mode 100644 index 000000000000..253f9e7d747d --- /dev/null +++ b/devel/electron34/files/patch-third__party_blink_renderer_build_scripts_gperf.py @@ -0,0 +1,20 @@ +--- third_party/blink/renderer/build/scripts/gperf.py.orig 2025-02-24 19:59:26 UTC ++++ third_party/blink/renderer/build/scripts/gperf.py +@@ -35,10 +35,13 @@ def generate_gperf(gperf_path, gperf_input, gperf_args + # https://savannah.gnu.org/bugs/index.php?53028 + gperf_output = re.sub(r'\bregister ', '', gperf_output) + # -Wimplicit-fallthrough needs an explicit fallthrough statement, +- # so replace gperf's /*FALLTHROUGH*/ comment with the statement. +- # https://savannah.gnu.org/bugs/index.php?53029 +- gperf_output = gperf_output.replace('/*FALLTHROUGH*/', +- ' [[fallthrough]];') ++ # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement. ++ # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2) ++ if re.search( ++ r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/', ++ gperf_output): ++ gperf_output = gperf_output.replace('/*FALLTHROUGH*/', ++ ' [[fallthrough]];') + # -Wpointer-to-int-cast warns about casting pointers to smaller ints + # Replace {(int)(long)&(foo), bar} with + # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar} |