diff --git a/devel/electron27/Makefile.version b/devel/electron27/Makefile.version index 2f246865e095..ad1d758c3715 100644 --- a/devel/electron27/Makefile.version +++ b/devel/electron27/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 27.3.0 +ELECTRON_VER= 27.3.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron27/distinfo b/devel/electron27/distinfo index 041c935f2010..456cfd5ee05b 100644 --- a/devel/electron27/distinfo +++ b/devel/electron27/distinfo @@ -1,21 +1,21 @@ -TIMESTAMP = 1706181669 +TIMESTAMP = 1706850005 SHA256 (electron/chromium-118.0.5993.159.tar.xz) = 47fdd7677470f4f4daf68e59dcacbafb99f5ed0c07501162b6af168f760b4359 SIZE (electron/chromium-118.0.5993.159.tar.xz) = 1602730244 SHA256 (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = f7f7f38661b107fc1d91b7918f36362d9180e87f34e3027562eb5db8735746fe SIZE (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = 8881070 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-27.3.0.tar.xz) = b1d33fa2bf412990a64b1720140fdd712b5945f41f781a4b2c154915061c6d75 -SIZE (electron/electron-yarn-cache-27.3.0.tar.xz) = 29116528 -SHA256 (electron/electron-electron-v27.3.0_GH0.tar.gz) = d17e825ce21b2f0c4f632268acfaabbe33ebd36d9083bbddaf742c1edcec6346 -SIZE (electron/electron-electron-v27.3.0_GH0.tar.gz) = 11408261 +SHA256 (electron/electron-yarn-cache-27.3.1.tar.xz) = b1d33fa2bf412990a64b1720140fdd712b5945f41f781a4b2c154915061c6d75 +SIZE (electron/electron-yarn-cache-27.3.1.tar.xz) = 29116528 +SHA256 (electron/electron-electron-v27.3.1_GH0.tar.gz) = 02ca26c6cf9376860701b9ab8cda96d4657ff2168f36c2cee7c297649928a069 +SIZE (electron/electron-electron-v27.3.1_GH0.tar.gz) = 11416996 SHA256 (electron/nodejs-node-v18.17.1_GH0.tar.gz) = 1cc1670bc183eaf9e0afe0258391695d1d6ae1be02ba4c26e0218cf5f19b96f7 SIZE (electron/nodejs-node-v18.17.1_GH0.tar.gz) = 112512847 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 SIZE (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 179355 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01 SIZE (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = 2112918 SHA256 (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 88e65f116c7a06fccedb43970fba63080a57a4e5dc29147d2cdfe1ee58dd0546 SIZE (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 1136238 SHA256 (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = a365df6d83e0be3cc000b70bd39734d80c28f0d9983ebe44698337a2ca464bb1 SIZE (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = 62962 diff --git a/devel/electron27/files/patch-electron_lib_browser_init.ts b/devel/electron27/files/patch-electron_lib_browser_init.ts index e97987122f28..ae8c2a899e98 100644 --- a/devel/electron27/files/patch-electron_lib_browser_init.ts +++ b/devel/electron27/files/patch-electron_lib_browser_init.ts @@ -1,11 +1,11 @@ ---- electron/lib/browser/init.ts.orig 2023-10-20 08:29:17 UTC +--- electron/lib/browser/init.ts.orig 2024-01-29 17:52:10 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 () { - if (process.platform !== 'linux') return false; + if (process.platform !== 'linux' && process.platform !== 'freebsd') return false; const currentDesktop = process.env.XDG_CURRENT_DESKTOP; if (!currentDesktop) return false; diff --git a/devel/electron27/files/patch-electron_shell_app_node__main.cc b/devel/electron27/files/patch-electron_shell_app_node__main.cc index 0911cbeb437e..471e6ace33bf 100644 --- a/devel/electron27/files/patch-electron_shell_app_node__main.cc +++ b/devel/electron27/files/patch-electron_shell_app_node__main.cc @@ -1,38 +1,38 @@ ---- electron/shell/app/node_main.cc.orig 2024-01-10 11:28:08 UTC +--- electron/shell/app/node_main.cc.orig 2024-01-29 17:52:10 UTC +++ electron/shell/app/node_main.cc -@@ -48,7 +48,7 @@ +@@ -47,7 +47,7 @@ #include "shell/common/mac/codesign_util.h" #endif -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) #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 GetParameters(v8::Isolate* isolat +@@ -110,7 +110,7 @@ v8::Local GetParameters(v8::Isolate* isolat v8::Local GetParameters(v8::Isolate* isolate) { std::map keys; -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) 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 gin_helper::Dictionary reporter = gin::Dictionary::CreateEmpty(isolate); reporter.SetMethod("getParameters", &GetParameters); -#if IS_MAS_BUILD() +#if IS_MAS_BUILD() || BUILDFLAG(IS_BSD) reporter.SetMethod("addExtraParameter", &SetCrashKeyStub); reporter.SetMethod("removeExtraParameter", &ClearCrashKeyStub); #else diff --git a/devel/electron27/files/patch-electron_shell_common_api_electron__bindings.cc b/devel/electron27/files/patch-electron_shell_common_api_electron__bindings.cc index 8ed7afacf0da..1091a4733000 100644 --- a/devel/electron27/files/patch-electron_shell_common_api_electron__bindings.cc +++ b/devel/electron27/files/patch-electron_shell_common_api_electron__bindings.cc @@ -1,11 +1,11 @@ ---- electron/shell/common/api/electron_bindings.cc.orig 2023-02-15 22:22:31 UTC +--- electron/shell/common/api/electron_bindings.cc.orig 2024-01-29 17:52:10 UTC +++ electron/shell/common/api/electron_bindings.cc -@@ -268,7 +268,7 @@ void ElectronBindings::DidReceiveMemoryDump( +@@ -260,7 +260,7 @@ void ElectronBindings::DidReceiveMemoryDump( if (target_pid == dump.pid()) { gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate); const auto& osdump = dump.os_dump(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) dict.Set("residentSet", osdump.resident_set_kb); #endif dict.Set("private", osdump.private_footprint_kb); diff --git a/devel/electron27/files/patch-electron_shell_common_node__bindings.cc b/devel/electron27/files/patch-electron_shell_common_node__bindings.cc index 5cb12bf41880..74cd684780bf 100644 --- a/devel/electron27/files/patch-electron_shell_common_node__bindings.cc +++ b/devel/electron27/files/patch-electron_shell_common_node__bindings.cc @@ -1,29 +1,29 @@ ---- electron/shell/common/node_bindings.cc.orig 2024-01-23 09:41:40 UTC +--- electron/shell/common/node_bindings.cc.orig 2024-01-29 17:52:10 UTC +++ electron/shell/common/node_bindings.cc -@@ -35,7 +35,7 @@ +@@ -38,7 +38,7 @@ #include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h" // nogncheck #include "third_party/electron_node/src/debug_utils.h" -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) #include "shell/common/crash_keys.h" #endif -@@ -150,7 +150,7 @@ void V8FatalErrorCallback(const char* location, const +@@ -153,7 +153,7 @@ void V8FatalErrorCallback(const char* location, const void V8FatalErrorCallback(const char* location, const char* message) { LOG(ERROR) << "Fatal error in V8: " << location << " " << message; -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message); electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location); #endif -@@ -443,7 +443,7 @@ void NodeBindings::Initialize(v8::Local c +@@ -446,7 +446,7 @@ void NodeBindings::Initialize(v8::Local c TRACE_EVENT0("electron", "NodeBindings::Initialize"); // Open node's error reporting system for browser process. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Get real command line in renderer process forked by zygote. if (browser_env_ != BrowserEnvironment::kBrowser) ElectronCommandLine::InitializeFromCommandLine(); diff --git a/devel/electron27/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron27/files/patch-electron_spec_api-browser-window-spec.ts index f710d3d31e60..a595e96fff98 100644 --- a/devel/electron27/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron27/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,155 +1,155 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2024-01-10 11:28:08 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2024-01-29 17:52:10 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(); }); - ifit(process.platform === 'linux')('does not crash when setting large window icons', async () => { + ifit(process.platform === 'linux' || process.platform === 'freebsd')('does not crash when setting large window icons', async () => { const appPath = path.join(fixtures, 'apps', 'xwindow-icon'); const appProcess = childProcess.spawn(process.execPath, [appPath]); await once(appProcess, 'exit'); -@@ -1119,7 +1119,7 @@ describe('BrowserWindow module', () => { +@@ -1120,7 +1120,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.minimize()', () => { // TODO(codebytere): Enable for Linux once maximize/minimize events work in CI. - ifit(process.platform !== 'linux')('should not be visible when the window is minimized', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not be visible when the window is minimized', async () => { const minimize = once(w, 'minimize'); w.minimize(); await minimize; -@@ -1136,7 +1136,7 @@ describe('BrowserWindow module', () => { +@@ -1137,7 +1137,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable for Linux once CI plays nice with these kinds of tests - ifit(process.platform !== 'linux')('should not restore maximized windows', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not restore maximized windows', async () => { const maximize = once(w, 'maximize'); const shown = once(w, 'show'); w.maximize(); -@@ -1201,7 +1201,7 @@ describe('BrowserWindow module', () => { +@@ -1202,7 +1202,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(true); }); - ifit(process.platform !== 'linux')('acquires focus status from the other windows', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('acquires focus status from the other windows', async () => { const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1268,7 +1268,7 @@ describe('BrowserWindow module', () => { +@@ -1269,7 +1269,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(false); }); - ifit(process.platform !== 'linux')('transfers focus status to the next window', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('transfers focus status to the next window', async () => { const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1679,7 +1679,7 @@ describe('BrowserWindow module', () => { +@@ -1680,7 +1680,7 @@ describe('BrowserWindow module', () => { }); }); - ifdescribe(process.platform !== 'linux')('Maximized state', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('Maximized state', () => { it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = once(w, 'maximize'); -@@ -1859,7 +1859,7 @@ describe('BrowserWindow module', () => { +@@ -1890,7 +1890,7 @@ describe('BrowserWindow module', () => { }); }); - ifdescribe(process.platform !== 'linux')('Minimized state', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('Minimized state', () => { it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -2846,7 +2846,7 @@ describe('BrowserWindow module', () => { +@@ -2877,7 +2877,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.setOpacity(opacity)', () => { afterEach(closeAllWindows); - ifdescribe(process.platform !== 'linux')(('Windows and Mac'), () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')(('Windows and Mac'), () => { it('make window with initial opacity', () => { const w = new BrowserWindow({ show: false, opacity: 0.5 }); expect(w.getOpacity()).to.equal(0.5); -@@ -2872,7 +2872,7 @@ describe('BrowserWindow module', () => { +@@ -2903,7 +2903,7 @@ describe('BrowserWindow module', () => { }); }); - ifdescribe(process.platform === 'linux')(('Linux'), () => { + ifdescribe(process.platform === 'linux' || process.platform === 'freebsd')(('Linux'), () => { it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3801,7 +3801,7 @@ describe('BrowserWindow module', () => { +@@ -3832,7 +3832,7 @@ describe('BrowserWindow module', () => { expect(test.nodeTimers).to.equal(true); expect(test.nodeUrl).to.equal(true); - if (process.platform === 'linux' && test.osSandbox) { + if ((process.platform === 'linux' || process.platform === 'freebsd') && test.osSandbox) { expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -4306,7 +4306,7 @@ describe('BrowserWindow module', () => { +@@ -4337,7 +4337,7 @@ describe('BrowserWindow module', () => { }); }); - ifdescribe(process.platform !== 'linux')('max/minimize events', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('max/minimize events', () => { afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); -@@ -4577,7 +4577,7 @@ describe('BrowserWindow module', () => { +@@ -4608,7 +4608,7 @@ describe('BrowserWindow module', () => { // TODO(zcbenz): // This test does not run on Linux CI. See: // https://github.com/electron/electron/issues/28699 - ifit(process.platform === 'linux' && !process.env.CI)('should bring a minimized maximized window back to maximized state', async () => { + ifit((process.platform === 'linux' || process.platform === 'freebsd') && !process.env.CI)('should bring a minimized maximized window back to maximized state', async () => { const w = new BrowserWindow({}); const maximize = once(w, 'maximize'); w.maximize(); -@@ -4594,7 +4594,7 @@ describe('BrowserWindow module', () => { +@@ -4625,7 +4625,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI - ifdescribe(process.platform !== 'linux')('BrowserWindow.maximize()', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('BrowserWindow.maximize()', () => { afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -4631,7 +4631,7 @@ describe('BrowserWindow module', () => { +@@ -4662,7 +4662,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 - ifit(process.platform !== 'linux')('should not restore a minimized window', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not restore a minimized window', async () => { const w = new BrowserWindow(); const minimize = once(w, 'minimize'); w.minimize(); -@@ -5105,7 +5105,7 @@ describe('BrowserWindow module', () => { +@@ -5136,7 +5136,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. - ifit(process.platform !== 'linux')('does affect maximizability when disabled and enabled', () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('does affect maximizability when disabled and enabled', () => { const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -5244,7 +5244,7 @@ describe('BrowserWindow module', () => { +@@ -5275,7 +5275,7 @@ describe('BrowserWindow module', () => { }); }); - ifdescribe(process.platform !== 'linux')('window states (excluding Linux)', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('window states (excluding Linux)', () => { // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6411,7 +6411,7 @@ describe('BrowserWindow module', () => { +@@ -6442,7 +6442,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); - ifit(process.platform !== 'linux')('correctly returns isMaximized() when the window is maximized then minimized', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('correctly returns isMaximized() when the window is maximized then minimized', async () => { const w = new BrowserWindow({ frame: false, transparent: true diff --git a/devel/electron27/files/patch-electron_spec_node-spec.ts b/devel/electron27/files/patch-electron_spec_node-spec.ts index f0a92d1f3aea..dcb018fd9b19 100644 --- a/devel/electron27/files/patch-electron_spec_node-spec.ts +++ b/devel/electron27/files/patch-electron_spec_node-spec.ts @@ -1,11 +1,11 @@ ---- electron/spec/node-spec.ts.orig 2023-12-21 18:00:06 UTC +--- electron/spec/node-spec.ts.orig 2024-01-29 17:52:10 UTC +++ electron/spec/node-spec.ts -@@ -138,7 +138,7 @@ describe('node feature', () => { +@@ -144,7 +144,7 @@ describe('node feature', () => { }); describe('child_process.exec', () => { - ifit(process.platform === 'linux')('allows executing a setuid binary from non-sandboxed renderer', async () => { + ifit(process.platform === 'linux' || process.platform === 'freebsd')('allows executing a setuid binary from non-sandboxed renderer', async () => { // Chrome uses prctl(2) to set the NO_NEW_PRIVILEGES flag on Linux (see // https://github.com/torvalds/linux/blob/40fde647cc/Documentation/userspace-api/no_new_privs.rst). // We disable this for unsandboxed processes, which the renderer tests