Date: Sat, 27 Jul 2024 12:27:39 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: b369ac398d40 - main - devel/electron31: update to 31.3.0 Message-ID: <202407271227.46RCRd0g092371@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=b369ac398d40ea9d171169895b2c7d6dd38499aa commit b369ac398d40ea9d171169895b2c7d6dd38499aa Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2024-07-27 12:26:07 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2024-07-27 12:27:29 +0000 devel/electron31: update to 31.3.0 Changelog: https://github.com/electron/electron/releases/tag/v31.3.0 Reported by: GitHub (watch releases) --- devel/electron31/Makefile | 4 +-- devel/electron31/Makefile.version | 2 +- devel/electron31/distinfo | 18 ++++++------- ...shell_browser_api_electron__api__base__window.h | 4 +-- ...ell_browser_api_electron__api__web__contents.cc | 4 +-- ...shell_browser_electron__browser__main__parts.cc | 4 +-- .../files/patch-electron_spec_api-app-spec.ts | 8 +++--- .../patch-electron_spec_api-browser-window-spec.ts | 30 +++++++++++----------- .../files/patch-electron_spec_version-bump-spec.ts | 8 +++--- ...__aura_desktop__window__tree__host__platform.cc | 4 +-- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/devel/electron31/Makefile b/devel/electron31/Makefile index 579f65afc46b..04240e36691b 100644 --- a/devel/electron31/Makefile +++ b/devel/electron31/Makefile @@ -207,9 +207,9 @@ PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \ GN_ARGS+=rtc_link_pipewire=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER -CHROMIUM_VER= 126.0.6478.127 +CHROMIUM_VER= 126.0.6478.183 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 20.15.0 +NODE_VER= 20.15.1 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER diff --git a/devel/electron31/Makefile.version b/devel/electron31/Makefile.version index 97a99643e05e..92be2124a772 100644 --- a/devel/electron31/Makefile.version +++ b/devel/electron31/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 31.2.1 +ELECTRON_VER= 31.3.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron31/distinfo b/devel/electron31/distinfo index 269552926320..e3f4776b223c 100644 --- a/devel/electron31/distinfo +++ b/devel/electron31/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1721194519 -SHA256 (electron/chromium-126.0.6478.127.tar.xz) = 6caf331dc78089f8bffcadc289fafd527ed3a56aaf5e9307c4227411133f0f7e -SIZE (electron/chromium-126.0.6478.127.tar.xz) = 4167068116 +TIMESTAMP = 1721973146 +SHA256 (electron/chromium-126.0.6478.183.tar.xz) = f2588c00acbbb6f6b26e12b870b74a2f7a5e47b1cfe68b9218f35caa247bebaf +SIZE (electron/chromium-126.0.6478.183.tar.xz) = 4173374824 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-31.2.1.tar.xz) = 8b9a13b091dacb8b4f3ea7bb44826d7cf3062bc2700462d20a261da3d61ca189 -SIZE (electron/electron-yarn-cache-31.2.1.tar.xz) = 29172376 -SHA256 (electron/electron-electron-v31.2.1_GH0.tar.gz) = dfcef2efc3ca13f30ada6f466919099923b6dcd5d7f7df246d7657681ad52ad0 -SIZE (electron/electron-electron-v31.2.1_GH0.tar.gz) = 13826490 -SHA256 (electron/nodejs-node-v20.15.0_GH0.tar.gz) = 355d48c780d49c8bd5063016bc56c642db2840f6392d037cf74fd864c53f6922 -SIZE (electron/nodejs-node-v20.15.0_GH0.tar.gz) = 115459744 +SHA256 (electron/electron-yarn-cache-31.3.0.tar.xz) = 8b9a13b091dacb8b4f3ea7bb44826d7cf3062bc2700462d20a261da3d61ca189 +SIZE (electron/electron-yarn-cache-31.3.0.tar.xz) = 29172376 +SHA256 (electron/electron-electron-v31.3.0_GH0.tar.gz) = 6e2642999ede9ba1741fe8fe5d7f9ced246e562d9bfa0b5267ec3afbb5d9287d +SIZE (electron/electron-electron-v31.3.0_GH0.tar.gz) = 13810801 +SHA256 (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 9c54c9338f78cf99227d006e65123fd9ef66cf8c271f3c25cad9a336f201507f +SIZE (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 115474342 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/electron31/files/patch-electron_shell_browser_api_electron__api__base__window.h b/devel/electron31/files/patch-electron_shell_browser_api_electron__api__base__window.h index 83af79c40ce2..d3a4dc3afdbb 100644 --- a/devel/electron31/files/patch-electron_shell_browser_api_electron__api__base__window.h +++ b/devel/electron31/files/patch-electron_shell_browser_api_electron__api__base__window.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_base_window.h.orig 2024-07-17 06:27:32 UTC +--- electron/shell/browser/api/electron_api_base_window.h.orig 2024-07-24 17:23:33 UTC +++ electron/shell/browser/api/electron_api_base_window.h -@@ -243,7 +243,7 @@ class BaseWindow : public gin_helper::TrackableObject< +@@ -241,7 +241,7 @@ class BaseWindow : public gin_helper::TrackableObject< void SetAppDetails(const gin_helper::Dictionary& options); #endif diff --git a/devel/electron31/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron31/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index f95f38f0dfb0..4d57cda7b7af 100644 --- a/devel/electron31/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron31/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 2024-06-24 09:53:23 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2024-07-24 17:23:33 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -153,11 +153,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -50,7 +50,7 @@ if (owner_window()) owner_window()->Focus(true); #endif -@@ -4148,7 +4148,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4150,7 +4150,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron31/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron31/files/patch-electron_shell_browser_electron__browser__main__parts.cc index 39ce152d7a3c..afe7b88d8ce1 100644 --- a/devel/electron31/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron31/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2024-07-15 15:22:56 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2024-07-24 17:23:33 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -78,7 +78,7 @@ #include "ui/wm/core/wm_state.h" @@ -73,7 +73,7 @@ // Set up crypt config. This needs to be done before anything starts the // network service, as the raw encryption key needs to be shared with the // network service for encrypted cookie storage. -@@ -613,7 +615,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -614,7 +616,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron31/files/patch-electron_spec_api-app-spec.ts b/devel/electron31/files/patch-electron_spec_api-app-spec.ts index b6c5a356aa18..1b2248f85944 100644 --- a/devel/electron31/files/patch-electron_spec_api-app-spec.ts +++ b/devel/electron31/files/patch-electron_spec_api-app-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-app-spec.ts.orig 2024-07-15 15:22:56 UTC +--- electron/spec/api-app-spec.ts.orig 2024-07-24 17:23:33 UTC +++ electron/spec/api-app-spec.ts @@ -123,11 +123,11 @@ describe('app module', () => { }); @@ -119,6 +119,6 @@ - ifdescribe(!(process.platform === 'linux' && (process.arch === 'arm64' || process.arch === 'arm')))('sandbox options', () => { + ifdescribe(!((process.platform === 'linux' || process.platform === 'freebsd') && (process.arch === 'arm64' || process.arch === 'arm')))('sandbox options', () => { - // Our ARM tests are run on VSTS rather than CircleCI, and the Docker - // setup on VSTS disallows syscalls that Chrome requires for setting up - // sandboxing. + let appProcess: cp.ChildProcess = null as any; + let server: net.Server = null as any; + const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox'; diff --git a/devel/electron31/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron31/files/patch-electron_spec_api-browser-window-spec.ts index e808d5dc9b27..0815d78d0954 100644 --- a/devel/electron31/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron31/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2024-07-15 15:22:56 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2024-07-24 17:23:33 UTC +++ electron/spec/api-browser-window-spec.ts @@ -65,7 +65,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -45,7 +45,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1715,7 +1715,7 @@ describe('BrowserWindow module', () => { +@@ -1735,7 +1735,7 @@ describe('BrowserWindow module', () => { }); }); @@ -54,7 +54,7 @@ it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = once(w, 'maximize'); -@@ -1925,7 +1925,7 @@ describe('BrowserWindow module', () => { +@@ -1945,7 +1945,7 @@ describe('BrowserWindow module', () => { }); }); @@ -63,7 +63,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -2872,7 +2872,7 @@ describe('BrowserWindow module', () => { +@@ -2892,7 +2892,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.setOpacity(opacity)', () => { afterEach(closeAllWindows); @@ -72,7 +72,7 @@ it('make window with initial opacity', () => { const w = new BrowserWindow({ show: false, opacity: 0.5 }); expect(w.getOpacity()).to.equal(0.5); -@@ -2898,7 +2898,7 @@ describe('BrowserWindow module', () => { +@@ -2918,7 +2918,7 @@ describe('BrowserWindow module', () => { }); }); @@ -81,7 +81,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3109,7 +3109,7 @@ describe('BrowserWindow module', () => { +@@ -3129,7 +3129,7 @@ describe('BrowserWindow module', () => { expect(overlayRectPreMax.height).to.equal(size); // 'maximize' event is not emitted on Linux in CI. @@ -90,7 +90,7 @@ const maximize = once(w, 'maximize'); w.show(); w.maximize(); -@@ -3175,7 +3175,7 @@ describe('BrowserWindow module', () => { +@@ -3195,7 +3195,7 @@ describe('BrowserWindow module', () => { expect(preMaxHeight).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(); -@@ -3840,7 +3840,7 @@ describe('BrowserWindow module', () => { +@@ -3860,7 +3860,7 @@ describe('BrowserWindow module', () => { expect(test.nodeTimers).to.equal(true); expect(test.nodeUrl).to.equal(true); @@ -108,7 +108,7 @@ expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -4345,7 +4345,7 @@ describe('BrowserWindow module', () => { +@@ -4365,7 +4365,7 @@ describe('BrowserWindow module', () => { }); }); @@ -117,7 +117,7 @@ afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); -@@ -4616,7 +4616,7 @@ describe('BrowserWindow module', () => { +@@ -4636,7 +4636,7 @@ describe('BrowserWindow module', () => { // TODO(zcbenz): // This test does not run on Linux CI. See: // https://github.com/electron/electron/issues/28699 @@ -126,7 +126,7 @@ const w = new BrowserWindow({}); const maximize = once(w, 'maximize'); w.maximize(); -@@ -4633,7 +4633,7 @@ describe('BrowserWindow module', () => { +@@ -4653,7 +4653,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI @@ -135,7 +135,7 @@ afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -4670,7 +4670,7 @@ describe('BrowserWindow module', () => { +@@ -4690,7 +4690,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 @@ -144,7 +144,7 @@ const w = new BrowserWindow(); const minimize = once(w, 'minimize'); w.minimize(); -@@ -5144,7 +5144,7 @@ describe('BrowserWindow module', () => { +@@ -5164,7 +5164,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. @@ -153,7 +153,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -5283,7 +5283,7 @@ describe('BrowserWindow module', () => { +@@ -5303,7 +5303,7 @@ describe('BrowserWindow module', () => { }); }); @@ -162,7 +162,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6448,7 +6448,7 @@ describe('BrowserWindow module', () => { +@@ -6468,7 +6468,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); diff --git a/devel/electron31/files/patch-electron_spec_version-bump-spec.ts b/devel/electron31/files/patch-electron_spec_version-bump-spec.ts index b21840512b7c..481293d25f4e 100644 --- a/devel/electron31/files/patch-electron_spec_version-bump-spec.ts +++ b/devel/electron31/files/patch-electron_spec_version-bump-spec.ts @@ -1,9 +1,9 @@ ---- electron/spec/version-bump-spec.ts.orig 2023-01-24 16:58:16 UTC +--- electron/spec/version-bump-spec.ts.orig 2024-07-24 17:23:33 UTC +++ electron/spec/version-bump-spec.ts -@@ -92,7 +92,7 @@ describe('version-bumper', () => { +@@ -90,7 +90,7 @@ describe('version-bumper', () => { + }); + }); - // On macOS Circle CI we don't have a real git environment due to running - // gclient sync on a linux machine. These tests therefore don't run as expected. - ifdescribe(!(process.platform === 'linux' && process.arch.indexOf('arm') === 0) && process.platform !== 'darwin')('nextVersion', () => { + ifdescribe(!((process.platform === 'linux' || process.platform === 'freebsd') && process.arch.indexOf('arm') === 0) && process.platform !== 'darwin')('nextVersion', () => { describe('bump versions', () => { diff --git a/devel/electron31/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/devel/electron31/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 4ec91ada6a68..8b2bc1c1163b 100644 --- a/devel/electron31/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/devel/electron31/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-06-18 21:44:03 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-07-17 00:00:57 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -48,7 +48,7 @@ #include "ui/wm/core/window_util.h" @@ -18,7 +18,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1142,7 +1142,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1148,7 +1148,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407271227.46RCRd0g092371>