git: f12d584693da - main - devel/electron28: update to 28.2.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 02 Feb 2024 23:00:24 UTC
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=f12d584693da95a30083db616d20128f75946850 commit f12d584693da95a30083db616d20128f75946850 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2024-02-02 22:58:39 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2024-02-02 23:00:14 +0000 devel/electron28: update to 28.2.1 Changelog: https://github.com/electron/electron/releases/tag/v28.2.1 Reported by: GitHub (watch releases) Security: 13a8c4bf-cb2b-48ec-b49c-a3875c72b3e8 --- devel/electron28/Makefile | 9 ++++-- devel/electron28/Makefile.version | 2 +- devel/electron28/distinfo | 16 +++++----- .../files/patch-electron_lib_browser_init.ts | 4 +-- .../files/patch-electron_shell_app_node__main.cc | 12 ++++---- ...electron_shell_common_api_electron__bindings.cc | 4 +-- .../patch-electron_shell_common_node__bindings.cc | 8 ++--- .../patch-electron_spec_api-browser-window-spec.ts | 36 +++++++++++----------- .../files/patch-electron_spec_node-spec.ts | 4 +-- 9 files changed, 51 insertions(+), 44 deletions(-) diff --git a/devel/electron28/Makefile b/devel/electron28/Makefile index 00a8368ce386..975564e20571 100644 --- a/devel/electron28/Makefile +++ b/devel/electron28/Makefile @@ -2,10 +2,12 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} CATEGORIES= devel -MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \ +MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v28.2.1/:chromium \ + https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \ + ${CHROMIUM_NODE_MODULES_HASH}:chromium_node \ ${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \ electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch DIST_SUBDIR= ${PORTNAME} @@ -215,7 +217,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= 120.0.6099.227 +CHROMIUM_VER= 120.0.6099.268 +# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH +CHROMIUM_NODE_MODULES_HASH= bb991b26ccca36a9b3912b51dec5b70e5dea9aea # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH CHROMIUM_TEST_FONTS_HASH= 336e775eec536b2d785cc80eff6ac39051931286 # See ${WRKSRC}/electron/DEPS for NODE_VER @@ -335,6 +339,7 @@ post-extract: ${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \ ${WRKSRC}/third_party/squirrel.mac/vendor/Mantle + ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts # Install node modules for electron ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR} diff --git a/devel/electron28/Makefile.version b/devel/electron28/Makefile.version index b840ec466be6..ed4b6481f5ca 100644 --- a/devel/electron28/Makefile.version +++ b/devel/electron28/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 28.2.0 +ELECTRON_VER= 28.2.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron28/distinfo b/devel/electron28/distinfo index 2586fadbfee0..883d79ed48ad 100644 --- a/devel/electron28/distinfo +++ b/devel/electron28/distinfo @@ -1,12 +1,14 @@ -TIMESTAMP = 1706251460 -SHA256 (electron/chromium-120.0.6099.227.tar.xz) = bc8689db2a0883829ab1bd45ce1f247bbc410c633fc682d57fd924bf3a9e8b0e -SIZE (electron/chromium-120.0.6099.227.tar.xz) = 3303594484 +TIMESTAMP = 1706862681 +SHA256 (electron/chromium-120.0.6099.268.tar.xz) = 2a9dc42450764519b0c8a3678d0d48f253e963198178004cf2df0e3be89189c7 +SIZE (electron/chromium-120.0.6099.268.tar.xz) = 1578576248 +SHA256 (electron/bb991b26ccca36a9b3912b51dec5b70e5dea9aea) = 8ada8e0554ecd02f649047f8f15a438590c67505b9f2e6a58fd973fe02c4ca52 +SIZE (electron/bb991b26ccca36a9b3912b51dec5b70e5dea9aea) = 9782997 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-28.2.0.tar.xz) = ee4117440555d6be62f706646bb1b3c6737cc5b741b8e72377136c72a3474518 -SIZE (electron/electron-yarn-cache-28.2.0.tar.xz) = 29073696 -SHA256 (electron/electron-electron-v28.2.0_GH0.tar.gz) = b46307bef15d7a17994541ed2163177b5dc20168debf32c3996a79133b9d2fd5 -SIZE (electron/electron-electron-v28.2.0_GH0.tar.gz) = 11424253 +SHA256 (electron/electron-yarn-cache-28.2.1.tar.xz) = ee4117440555d6be62f706646bb1b3c6737cc5b741b8e72377136c72a3474518 +SIZE (electron/electron-yarn-cache-28.2.1.tar.xz) = 29073696 +SHA256 (electron/electron-electron-v28.2.1_GH0.tar.gz) = 478b40303596045c328cad7abdf26643a161196672508f2c60b45a0e355b4012 +SIZE (electron/electron-electron-v28.2.1_GH0.tar.gz) = 11459954 SHA256 (electron/nodejs-node-v18.18.2_GH0.tar.gz) = b1c20070ec2cfc930572e8d3c3f1de4be8bc7e2259956031db00709b7775a0da SIZE (electron/nodejs-node-v18.18.2_GH0.tar.gz) = 112758381 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb diff --git a/devel/electron28/files/patch-electron_lib_browser_init.ts b/devel/electron28/files/patch-electron_lib_browser_init.ts index e97987122f28..2b01209236e2 100644 --- a/devel/electron28/files/patch-electron_lib_browser_init.ts +++ b/devel/electron28/files/patch-electron_lib_browser_init.ts @@ -1,6 +1,6 @@ ---- electron/lib/browser/init.ts.orig 2023-10-20 08:29:17 UTC +--- electron/lib/browser/init.ts.orig 2024-01-31 15:12:32 UTC +++ electron/lib/browser/init.ts -@@ -158,7 +158,7 @@ const mainStartupScript = packageJson.main || 'index.j +@@ -155,7 +155,7 @@ function currentPlatformSupportsAppIndicator () { const KNOWN_XDG_DESKTOP_VALUES = new Set(['Pantheon', 'Unity:Unity7', 'pop:GNOME']); function currentPlatformSupportsAppIndicator () { diff --git a/devel/electron28/files/patch-electron_shell_app_node__main.cc b/devel/electron28/files/patch-electron_shell_app_node__main.cc index fba25a6af28c..0dc68ef43792 100644 --- a/devel/electron28/files/patch-electron_shell_app_node__main.cc +++ b/devel/electron28/files/patch-electron_shell_app_node__main.cc @@ -1,6 +1,6 @@ ---- electron/shell/app/node_main.cc.orig 2024-01-10 12:21:58 UTC +--- electron/shell/app/node_main.cc.orig 2024-01-31 15:12:32 UTC +++ electron/shell/app/node_main.cc -@@ -48,7 +48,7 @@ +@@ -47,7 +47,7 @@ #include "shell/common/mac/codesign_util.h" #endif @@ -9,16 +9,16 @@ #include "components/crash/core/app/crashpad.h" // nogncheck #include "shell/app/electron_crash_reporter_client.h" #include "shell/common/crash_keys.h" -@@ -83,7 +83,7 @@ void ExitIfContainsDisallowedFlags(const std::vector<s - } +@@ -99,7 +99,7 @@ bool UnsetHijackableEnvs(base::Environment* env) { } + #endif -#if IS_MAS_BUILD() +#if IS_MAS_BUILD() || BUILDFLAG(IS_BSD) void SetCrashKeyStub(const std::string& key, const std::string& value) {} void ClearCrashKeyStub(const std::string& key) {} #endif -@@ -94,7 +94,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolat +@@ -110,7 +110,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolat v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) { std::map<std::string, std::string> keys; @@ -27,7 +27,7 @@ electron::crash_keys::GetCrashKeys(&keys); #endif return gin::ConvertToV8(isolate, keys); -@@ -254,7 +254,7 @@ int NodeMain(int argc, char* argv[]) { +@@ -271,7 +271,7 @@ int NodeMain(int argc, char* argv[]) { // Setup process.crashReporter in child node processes auto reporter = gin_helper::Dictionary::CreateEmpty(isolate); reporter.SetMethod("getParameters", &GetParameters); diff --git a/devel/electron28/files/patch-electron_shell_common_api_electron__bindings.cc b/devel/electron28/files/patch-electron_shell_common_api_electron__bindings.cc index e10707789e59..fd5c2af7b177 100644 --- a/devel/electron28/files/patch-electron_shell_common_api_electron__bindings.cc +++ b/devel/electron28/files/patch-electron_shell_common_api_electron__bindings.cc @@ -1,6 +1,6 @@ ---- electron/shell/common/api/electron_bindings.cc.orig 2023-12-04 18:19:02 UTC +--- electron/shell/common/api/electron_bindings.cc.orig 2024-01-31 15:12:32 UTC +++ electron/shell/common/api/electron_bindings.cc -@@ -265,7 +265,7 @@ void ElectronBindings::DidReceiveMemoryDump( +@@ -257,7 +257,7 @@ void ElectronBindings::DidReceiveMemoryDump( if (target_pid == dump.pid()) { auto dict = gin_helper::Dictionary::CreateEmpty(isolate); const auto& osdump = dump.os_dump(); diff --git a/devel/electron28/files/patch-electron_shell_common_node__bindings.cc b/devel/electron28/files/patch-electron_shell_common_node__bindings.cc index 757b2260bba5..88fb5513cbbb 100644 --- a/devel/electron28/files/patch-electron_shell_common_node__bindings.cc +++ b/devel/electron28/files/patch-electron_shell_common_node__bindings.cc @@ -1,6 +1,6 @@ ---- electron/shell/common/node_bindings.cc.orig 2024-01-23 19:02:02 UTC +--- electron/shell/common/node_bindings.cc.orig 2024-01-31 15:12:32 UTC +++ electron/shell/common/node_bindings.cc -@@ -39,7 +39,7 @@ +@@ -42,7 +42,7 @@ #include "third_party/electron_node/src/debug_utils.h" #include "third_party/electron_node/src/module_wrap.h" @@ -9,7 +9,7 @@ #include "shell/common/crash_keys.h" #endif -@@ -154,7 +154,7 @@ void V8FatalErrorCallback(const char* location, const +@@ -157,7 +157,7 @@ void V8FatalErrorCallback(const char* location, const void V8FatalErrorCallback(const char* location, const char* message) { LOG(ERROR) << "Fatal error in V8: " << location << " " << message; @@ -18,7 +18,7 @@ electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message); electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location); #endif -@@ -505,7 +505,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c +@@ -508,7 +508,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c TRACE_EVENT0("electron", "NodeBindings::Initialize"); // Open node's error reporting system for browser process. diff --git a/devel/electron28/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron28/files/patch-electron_spec_api-browser-window-spec.ts index 5eeadf81dee9..81b7879410b1 100644 --- a/devel/electron28/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron28/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2024-01-10 12:21:58 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2024-01-31 15:12:32 UTC +++ electron/spec/api-browser-window-spec.ts -@@ -64,7 +64,7 @@ describe('BrowserWindow module', () => { +@@ -65,7 +65,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'); -@@ -1113,7 +1113,7 @@ describe('BrowserWindow module', () => { +@@ -1114,7 +1114,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.minimize()', () => { // TODO(codebytere): Enable for Linux once maximize/minimize events work in CI. @@ -18,7 +18,7 @@ const minimize = once(w, 'minimize'); w.minimize(); await minimize; -@@ -1130,7 +1130,7 @@ describe('BrowserWindow module', () => { +@@ -1131,7 +1131,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable for Linux once CI plays nice with these kinds of tests @@ -27,7 +27,7 @@ const maximize = once(w, 'maximize'); const shown = once(w, 'show'); w.maximize(); -@@ -1195,7 +1195,7 @@ describe('BrowserWindow module', () => { +@@ -1196,7 +1196,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(true); }); @@ -36,7 +36,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1296,7 +1296,7 @@ describe('BrowserWindow module', () => { +@@ -1297,7 +1297,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(false); }); @@ -45,7 +45,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1707,7 +1707,7 @@ describe('BrowserWindow module', () => { +@@ -1708,7 +1708,7 @@ describe('BrowserWindow module', () => { }); }); @@ -54,7 +54,7 @@ it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = once(w, 'maximize'); -@@ -1887,7 +1887,7 @@ describe('BrowserWindow module', () => { +@@ -1918,7 +1918,7 @@ describe('BrowserWindow module', () => { }); }); @@ -63,7 +63,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -2834,7 +2834,7 @@ describe('BrowserWindow module', () => { +@@ -2865,7 +2865,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); -@@ -2860,7 +2860,7 @@ describe('BrowserWindow module', () => { +@@ -2891,7 +2891,7 @@ describe('BrowserWindow module', () => { }); }); @@ -81,7 +81,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3790,7 +3790,7 @@ describe('BrowserWindow module', () => { +@@ -3821,7 +3821,7 @@ describe('BrowserWindow module', () => { expect(test.nodeTimers).to.equal(true); expect(test.nodeUrl).to.equal(true); @@ -90,7 +90,7 @@ expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -4295,7 +4295,7 @@ describe('BrowserWindow module', () => { +@@ -4326,7 +4326,7 @@ describe('BrowserWindow module', () => { }); }); @@ -99,7 +99,7 @@ afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); -@@ -4566,7 +4566,7 @@ describe('BrowserWindow module', () => { +@@ -4597,7 +4597,7 @@ describe('BrowserWindow module', () => { // TODO(zcbenz): // This test does not run on Linux CI. See: // https://github.com/electron/electron/issues/28699 @@ -108,7 +108,7 @@ const w = new BrowserWindow({}); const maximize = once(w, 'maximize'); w.maximize(); -@@ -4583,7 +4583,7 @@ describe('BrowserWindow module', () => { +@@ -4614,7 +4614,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI @@ -117,7 +117,7 @@ afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -4620,7 +4620,7 @@ describe('BrowserWindow module', () => { +@@ -4651,7 +4651,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 @@ -126,7 +126,7 @@ const w = new BrowserWindow(); const minimize = once(w, 'minimize'); w.minimize(); -@@ -5094,7 +5094,7 @@ describe('BrowserWindow module', () => { +@@ -5125,7 +5125,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. @@ -135,7 +135,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -5233,7 +5233,7 @@ describe('BrowserWindow module', () => { +@@ -5264,7 +5264,7 @@ describe('BrowserWindow module', () => { }); }); @@ -144,7 +144,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6398,7 +6398,7 @@ describe('BrowserWindow module', () => { +@@ -6429,7 +6429,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); diff --git a/devel/electron28/files/patch-electron_spec_node-spec.ts b/devel/electron28/files/patch-electron_spec_node-spec.ts index a9d5c04b145e..ec8eef08150f 100644 --- a/devel/electron28/files/patch-electron_spec_node-spec.ts +++ b/devel/electron28/files/patch-electron_spec_node-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/node-spec.ts.orig 2023-12-21 15:40:26 UTC +--- electron/spec/node-spec.ts.orig 2024-01-31 15:12:32 UTC +++ electron/spec/node-spec.ts -@@ -138,7 +138,7 @@ describe('node feature', () => { +@@ -144,7 +144,7 @@ describe('node feature', () => { }); describe('child_process.exec', () => {