Date: Thu, 19 Jun 2025 07:34:33 GMT From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7f94a439e56b - main - devel/electron36: update to 36.5.0 Message-ID: <202506190734.55J7YXUC031659@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f94a439e56b0635533c03100d1d99a7a0c62305 commit 7f94a439e56b0635533c03100d1d99a7a0c62305 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2025-06-19 07:32:47 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2025-06-19 07:34:18 +0000 devel/electron36: update to 36.5.0 Changelog: https://github.com/electron/electron/releases/tag/v36.5.0 Reported by: GitHub (watch releases) --- devel/electron36/Makefile | 7 ++-- devel/electron36/Makefile.version | 2 +- devel/electron36/distinfo | 26 +++++++-------- ...-chrome_browser_ui_views_frame_browser__view.cc | 6 ++-- ...ell_browser_api_electron__api__web__contents.cc | 16 ++++----- ...hell_browser_api_electron__api__web__contents.h | 4 +-- .../patch-electron_shell_browser_ui_file__dialog.h | 4 +-- .../patch-electron_spec_api-browser-window-spec.ts | 38 +++++++++++----------- .../patch-electron_spec_api-web-contents-spec.ts | 4 +-- 9 files changed, 53 insertions(+), 54 deletions(-) diff --git a/devel/electron36/Makefile b/devel/electron36/Makefile index 75f94a0d8088..5aac5aa4aa79 100644 --- a/devel/electron36/Makefile +++ b/devel/electron36/Makefile @@ -1,11 +1,10 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER} -PORTREVISION= 1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= devel -MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v36.4.0/:chromium \ +MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v36.5.0/:chromium \ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \ @@ -222,9 +221,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= 136.0.7103.149 +CHROMIUM_VER= 136.0.7103.168 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 22.15.1 +NODE_VER= 22.16.0 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER diff --git a/devel/electron36/Makefile.version b/devel/electron36/Makefile.version index a7152ae86c24..b4583b2ce488 100644 --- a/devel/electron36/Makefile.version +++ b/devel/electron36/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 36.4.0 +ELECTRON_VER= 36.5.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron36/distinfo b/devel/electron36/distinfo index 523b9e1b6fcc..c5e00f8cbf57 100644 --- a/devel/electron36/distinfo +++ b/devel/electron36/distinfo @@ -1,18 +1,18 @@ -TIMESTAMP = 1749038859 -SHA256 (electron/chromium-136.0.7103.149.tar.xz.0) = 397ba16511dc4516dd0bd763a9a1c18a1c9dcccc52fc28144739346a37cb93be -SIZE (electron/chromium-136.0.7103.149.tar.xz.0) = 2000000000 -SHA256 (electron/chromium-136.0.7103.149.tar.xz.1) = 8fbd4de2f24a03d9af8d74ba6695f78e1237c4a63f62ac7dfaf68f5c4ac25da1 -SIZE (electron/chromium-136.0.7103.149.tar.xz.1) = 2000000000 -SHA256 (electron/chromium-136.0.7103.149.tar.xz.2) = 03f78c06ecf0174f11724c2710c1431544ebe53e21baa13869314b7ab8488682 -SIZE (electron/chromium-136.0.7103.149.tar.xz.2) = 248486308 +TIMESTAMP = 1750254398 +SHA256 (electron/chromium-136.0.7103.168.tar.xz.0) = 570faa3373d4dfce5db59072d49312dda929b6816682ff77a79216a376daf09c +SIZE (electron/chromium-136.0.7103.168.tar.xz.0) = 2000000000 +SHA256 (electron/chromium-136.0.7103.168.tar.xz.1) = b37cb75f196d4a6b5503783ac87be3049a2f4ba39b43d64ad2c8c5ab64aaddb0 +SIZE (electron/chromium-136.0.7103.168.tar.xz.1) = 2000000000 +SHA256 (electron/chromium-136.0.7103.168.tar.xz.2) = 707eb3336740faf9ec8306f8e1f1cd621dca075b1e7091b78da98359253f64e1 +SIZE (electron/chromium-136.0.7103.168.tar.xz.2) = 248411304 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-36.4.0.tar.xz) = 12d724437444b7425d85ad5bb3ecabafee10ca23a91185ca4d3cc4e5a9e5411b -SIZE (electron/electron-yarn-cache-36.4.0.tar.xz) = 30310152 -SHA256 (electron/electron-electron-v36.4.0_GH0.tar.gz) = c0b4ae19b1729327b5b17031ffc0d3a7d57c0d4c814fd8bc3b21859885d1c2c3 -SIZE (electron/electron-electron-v36.4.0_GH0.tar.gz) = 15774121 -SHA256 (electron/nodejs-node-v22.15.1_GH0.tar.gz) = 71c357ee1a2df8d58509fa2a88b2028698e3113a0f1cbfdb849e808bef0b18ff -SIZE (electron/nodejs-node-v22.15.1_GH0.tar.gz) = 122830007 +SHA256 (electron/electron-yarn-cache-36.5.0.tar.xz) = 12d724437444b7425d85ad5bb3ecabafee10ca23a91185ca4d3cc4e5a9e5411b +SIZE (electron/electron-yarn-cache-36.5.0.tar.xz) = 30310152 +SHA256 (electron/electron-electron-v36.5.0_GH0.tar.gz) = 1abd064f4a46b792b15f47a88123151d6d15e1f97b3fac3aa041ba58db292e2c +SIZE (electron/electron-electron-v36.5.0_GH0.tar.gz) = 15791712 +SHA256 (electron/nodejs-node-v22.16.0_GH0.tar.gz) = 00d7c2a8f315f201fe30e2f7ac5a137663ab1c79a5c6873df553aff0409ce291 +SIZE (electron/nodejs-node-v22.16.0_GH0.tar.gz) = 122982623 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/electron36/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/devel/electron36/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 96b1190ca49f..831092db20b7 100644 --- a/devel/electron36/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/devel/electron36/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-04-22 20:15:27 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-06-09 18:58:16 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2581,7 +2581,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2584,7 +2584,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra } void BrowserView::TabDraggingStatusChanged(bool is_dragging) { @@ -9,7 +9,7 @@ GetContentsWebView()->SetFastResize(is_dragging); if (multi_contents_view_) { multi_contents_view_->GetInactiveContentsView()->SetFastResize(is_dragging); -@@ -5825,7 +5825,7 @@ void BrowserView::MaybeShowSupervisedUserProfileSignIn +@@ -5828,7 +5828,7 @@ void BrowserView::MaybeShowSupervisedUserProfileSignIn } void BrowserView::MaybeShowSupervisedUserProfileSignInIPH() { diff --git a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 6467ac92650c..a8f025d7e547 100644 --- a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron36/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 16:50:03 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-06-16 21:48:02 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) -@@ -929,7 +929,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -930,7 +930,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)); -@@ -2665,13 +2665,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2672,13 +2672,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); -@@ -3342,7 +3342,7 @@ void WebContents::Focus() { +@@ -3355,7 +3355,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 -@@ -4218,7 +4218,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4236,7 +4236,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.h index 721d3e2c67dd..067cdf21a89b 100644 --- a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron36/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-05-07 07:36:13 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-06-16 21:48:02 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -739,7 +739,7 @@ class WebContents final : public ExclusiveAccessContex +@@ -741,7 +741,7 @@ class WebContents final : public ExclusiveAccessContex #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC) ui::ImageModel GetDevToolsWindowIcon() override; #endif diff --git a/devel/electron36/files/patch-electron_shell_browser_ui_file__dialog.h b/devel/electron36/files/patch-electron_shell_browser_ui_file__dialog.h index dccc81864b78..4bc5a5b0d881 100644 --- a/devel/electron36/files/patch-electron_shell_browser_ui_file__dialog.h +++ b/devel/electron36/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-16 21:48:02 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/electron36/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts index d896186706bd..bc476e7e91fd 100644 --- a/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2025-05-12 02:18:43 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2025-06-16 21:48:02 UTC +++ electron/spec/api-browser-window-spec.ts @@ -69,7 +69,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -18,7 +18,7 @@ afterEach(closeAllWindows); it('can set content protection', async () => { const w = new BrowserWindow({ show: false }); -@@ -1170,7 +1170,7 @@ describe('BrowserWindow module', () => { +@@ -1167,7 +1167,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; -@@ -1187,7 +1187,7 @@ describe('BrowserWindow module', () => { +@@ -1184,7 +1184,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(); -@@ -1252,7 +1252,7 @@ describe('BrowserWindow module', () => { +@@ -1249,7 +1249,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 }); -@@ -1354,7 +1354,7 @@ describe('BrowserWindow module', () => { +@@ -1351,7 +1351,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 }); -@@ -1813,7 +1813,7 @@ describe('BrowserWindow module', () => { +@@ -1810,7 +1810,7 @@ describe('BrowserWindow module', () => { }); }); @@ -63,7 +63,7 @@ it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = once(w, 'maximize'); -@@ -2023,7 +2023,7 @@ describe('BrowserWindow module', () => { +@@ -2020,7 +2020,7 @@ describe('BrowserWindow module', () => { }); }); @@ -72,7 +72,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -2987,7 +2987,7 @@ describe('BrowserWindow module', () => { +@@ -2984,7 +2984,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); -@@ -3013,7 +3013,7 @@ describe('BrowserWindow module', () => { +@@ -3010,7 +3010,7 @@ describe('BrowserWindow module', () => { }); }); @@ -90,7 +90,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3224,7 +3224,7 @@ describe('BrowserWindow module', () => { +@@ -3221,7 +3221,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(); -@@ -3290,7 +3290,7 @@ describe('BrowserWindow module', () => { +@@ -3287,7 +3287,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(); -@@ -3955,7 +3955,7 @@ describe('BrowserWindow module', () => { +@@ -3952,7 +3952,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 { -@@ -4460,7 +4460,7 @@ describe('BrowserWindow module', () => { +@@ -4457,7 +4457,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 }); -@@ -4731,7 +4731,7 @@ describe('BrowserWindow module', () => { +@@ -4728,7 +4728,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(); -@@ -4748,7 +4748,7 @@ describe('BrowserWindow module', () => { +@@ -4745,7 +4745,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 }); -@@ -4785,7 +4785,7 @@ describe('BrowserWindow module', () => { +@@ -4782,7 +4782,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(); -@@ -5271,7 +5271,7 @@ describe('BrowserWindow module', () => { +@@ -5268,7 +5268,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'); -@@ -5481,7 +5481,7 @@ describe('BrowserWindow module', () => { +@@ -5478,7 +5478,7 @@ describe('BrowserWindow module', () => { }); }); @@ -171,7 +171,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6680,7 +6680,7 @@ describe('BrowserWindow module', () => { +@@ -6677,7 +6677,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); diff --git a/devel/electron36/files/patch-electron_spec_api-web-contents-spec.ts b/devel/electron36/files/patch-electron_spec_api-web-contents-spec.ts index 4980d258f3a8..91ee421c5a05 100644 --- a/devel/electron36/files/patch-electron_spec_api-web-contents-spec.ts +++ b/devel/electron36/files/patch-electron_spec_api-web-contents-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-web-contents-spec.ts.orig 2025-05-07 07:36:13 UTC +--- electron/spec/api-web-contents-spec.ts.orig 2025-06-16 21:48:02 UTC +++ electron/spec/api-web-contents-spec.ts -@@ -2684,7 +2684,7 @@ describe('webContents module', () => { +@@ -2754,7 +2754,7 @@ describe('webContents module', () => { }); // TODO(codebytere): OOPIF printing is disabled on Linux at the moment due to crashes.home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506190734.55J7YXUC031659>