diff --git a/devel/electron32/Makefile.version b/devel/electron32/Makefile.version index 43997d798c2c..7e1246425a06 100644 --- a/devel/electron32/Makefile.version +++ b/devel/electron32/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 32.2.7 +ELECTRON_VER= 32.2.8 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron32/distinfo b/devel/electron32/distinfo index e44e1059c744..c5049a9151c3 100644 --- a/devel/electron32/distinfo +++ b/devel/electron32/distinfo @@ -1,25 +1,25 @@ -TIMESTAMP = 1733569912 +TIMESTAMP = 1737549837 SHA256 (electron/chromium-128.0.6613.186.tar.xz.0) = 3ed399ba626343eb1a522939b16ded1ff5b553b477bd37e48710371000fa294b SIZE (electron/chromium-128.0.6613.186.tar.xz.0) = 2000000000 SHA256 (electron/chromium-128.0.6613.186.tar.xz.1) = 5986cf222802789f16b81759b7e1104edc61619a422c82c979d1268b90d7e415 SIZE (electron/chromium-128.0.6613.186.tar.xz.1) = 2000000000 SHA256 (electron/chromium-128.0.6613.186.tar.xz.2) = 9d48a4305a6a26b917476ff517b71722efdaabb3aed9898e9be4b3ec644894ad SIZE (electron/chromium-128.0.6613.186.tar.xz.2) = 766712880 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-32.2.7.tar.xz) = 91757602275d2d266604a25a164dd40397261b26fa3e6770cfc4431cedd35b2d -SIZE (electron/electron-yarn-cache-32.2.7.tar.xz) = 32181832 -SHA256 (electron/electron-electron-v32.2.7_GH0.tar.gz) = 1bef2a666302f3e579a5fd6dba539964614861bea8265d8bcbf7b6a6f9085bd0 -SIZE (electron/electron-electron-v32.2.7_GH0.tar.gz) = 14667125 +SHA256 (electron/electron-yarn-cache-32.2.8.tar.xz) = 91757602275d2d266604a25a164dd40397261b26fa3e6770cfc4431cedd35b2d +SIZE (electron/electron-yarn-cache-32.2.8.tar.xz) = 32181832 +SHA256 (electron/electron-electron-v32.2.8_GH0.tar.gz) = c9c02a68c33776c15f64ac283116c4b68d3c29c9df2a606b58d1a26109424f5a +SIZE (electron/electron-electron-v32.2.8_GH0.tar.gz) = 14683579 SHA256 (electron/nodejs-node-v20.18.1_GH0.tar.gz) = e52a6d719db786fffdc7ac3dc623023803336d8ce7a1dd61d9f68bd851d2a921 SIZE (electron/nodejs-node-v20.18.1_GH0.tar.gz) = 115585611 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 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 SHA256 (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = c148f76220fc41a89ffeaf370c2cc175577be184688b12aa6fec5f8ac6c714c4 SIZE (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = 13014 diff --git a/devel/electron32/files/patch-electron_script_spec-runner.js b/devel/electron32/files/patch-electron_script_spec-runner.js index a8cb776a89db..7828a931b0e3 100644 --- a/devel/electron32/files/patch-electron_script_spec-runner.js +++ b/devel/electron32/files/patch-electron_script_spec-runner.js @@ -1,11 +1,11 @@ ---- electron/script/spec-runner.js.orig 2024-10-09 13:53:06 UTC +--- electron/script/spec-runner.js.orig 2025-01-06 20:10:18 UTC +++ electron/script/spec-runner.js -@@ -165,7 +165,7 @@ async function runTestUsingElectron (specDir, testName +@@ -197,7 +197,7 @@ async function runTestUsingElectron (specDir, testName exe = path.resolve(BASE, utils.getElectronExec()); } const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)]; - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { runnerArgs.unshift(path.resolve(__dirname, 'dbus_mock.py'), exe); exe = 'python3'; } diff --git a/devel/electron32/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron32/files/patch-electron_spec_api-browser-window-spec.ts index 42e1bd49462a..b06ebe5436c9 100644 --- a/devel/electron32/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,173 +1,173 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2024-11-27 18:42:14 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2025-01-06 20:10:18 UTC +++ electron/spec/api-browser-window-spec.ts @@ -67,7 +67,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'); -@@ -1123,7 +1123,7 @@ describe('BrowserWindow module', () => { +@@ -1126,7 +1126,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; -@@ -1140,7 +1140,7 @@ describe('BrowserWindow module', () => { +@@ -1143,7 +1143,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(); -@@ -1205,7 +1205,7 @@ describe('BrowserWindow module', () => { +@@ -1208,7 +1208,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 }); -@@ -1306,7 +1306,7 @@ describe('BrowserWindow module', () => { +@@ -1309,7 +1309,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 }); -@@ -1765,7 +1765,7 @@ describe('BrowserWindow module', () => { +@@ -1768,7 +1768,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'); -@@ -1975,7 +1975,7 @@ describe('BrowserWindow module', () => { +@@ -1978,7 +1978,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'); -@@ -2938,7 +2938,7 @@ describe('BrowserWindow module', () => { +@@ -2941,7 +2941,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); -@@ -2964,7 +2964,7 @@ describe('BrowserWindow module', () => { +@@ -2967,7 +2967,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); -@@ -3175,7 +3175,7 @@ describe('BrowserWindow module', () => { +@@ -3178,7 +3178,7 @@ describe('BrowserWindow module', () => { expect(overlayRectPreMax.height).to.equal(size); // 'maximize' event is not emitted on Linux in CI. - if (process.platform !== 'linux' && !w.isMaximized()) { + if ((process.platform !== 'linux' && process.platform !== 'freebsd') && !w.isMaximized()) { const maximize = once(w, 'maximize'); w.show(); w.maximize(); -@@ -3241,7 +3241,7 @@ describe('BrowserWindow module', () => { +@@ -3244,7 +3244,7 @@ describe('BrowserWindow module', () => { expect(preMaxHeight).to.equal(size); // 'maximize' event is not emitted on Linux in CI. - if (process.platform !== 'linux' && !w.isMaximized()) { + if ((process.platform !== 'linux' && process.platform !== 'freebsd') && !w.isMaximized()) { const maximize = once(w, 'maximize'); w.show(); w.maximize(); -@@ -3906,7 +3906,7 @@ describe('BrowserWindow module', () => { +@@ -3909,7 +3909,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 { -@@ -4411,7 +4411,7 @@ describe('BrowserWindow module', () => { +@@ -4414,7 +4414,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 }); -@@ -4682,7 +4682,7 @@ describe('BrowserWindow module', () => { +@@ -4685,7 +4685,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(); -@@ -4699,7 +4699,7 @@ describe('BrowserWindow module', () => { +@@ -4702,7 +4702,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 }); -@@ -4736,7 +4736,7 @@ describe('BrowserWindow module', () => { +@@ -4739,7 +4739,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(); -@@ -5210,7 +5210,7 @@ describe('BrowserWindow module', () => { +@@ -5213,7 +5213,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'); -@@ -5349,7 +5349,7 @@ describe('BrowserWindow module', () => { +@@ -5352,7 +5352,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); -@@ -6516,7 +6516,7 @@ describe('BrowserWindow module', () => { +@@ -6519,7 +6519,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/electron32/files/patch-electron_spec_api-shell-spec.ts b/devel/electron32/files/patch-electron_spec_api-shell-spec.ts index a7acaf05d22f..d442c2d8d792 100644 --- a/devel/electron32/files/patch-electron_spec_api-shell-spec.ts +++ b/devel/electron32/files/patch-electron_spec_api-shell-spec.ts @@ -1,23 +1,23 @@ ---- electron/spec/api-shell-spec.ts.orig 2024-10-09 13:53:06 UTC +--- electron/spec/api-shell-spec.ts.orig 2025-01-06 20:10:18 UTC +++ electron/spec/api-shell-spec.ts -@@ -26,7 +26,7 @@ describe('shell module', () => { +@@ -37,7 +37,7 @@ describe('shell module', () => { afterEach(async () => { // reset env vars to prevent side effects - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { process.env.DE = envVars.de; process.env.BROWSER = envVars.browser; process.env.DISPLAY = envVars.display; -@@ -39,6 +39,11 @@ describe('shell module', () => { +@@ -54,6 +54,11 @@ describe('shell module', () => { let requestReceived: Promise; if (process.platform === 'linux') { process.env.BROWSER = '/bin/true'; + process.env.DE = 'generic'; + process.env.DISPLAY = ''; + requestReceived = Promise.resolve(); + } else if (process.platform === 'freebsd') { + process.env.BROWSER = '/usr/bin/true'; process.env.DE = 'generic'; process.env.DISPLAY = ''; requestReceived = Promise.resolve(); diff --git a/devel/electron32/files/patch-electron_spec_chromium-spec.ts b/devel/electron32/files/patch-electron_spec_chromium-spec.ts index 4ecba7850013..824dfcadc872 100644 --- a/devel/electron32/files/patch-electron_spec_chromium-spec.ts +++ b/devel/electron32/files/patch-electron_spec_chromium-spec.ts @@ -1,53 +1,53 @@ ---- electron/spec/chromium-spec.ts.orig 2024-11-15 19:11:29 UTC +--- electron/spec/chromium-spec.ts.orig 2025-01-06 20:10:18 UTC +++ electron/spec/chromium-spec.ts @@ -474,13 +474,13 @@ describe('command line switches', () => { it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}|${currentPreferredLanguages}`)); const lcAll = String(process.env.LC_ALL); - ifit(process.platform === 'linux')('current process has a valid LC_ALL env', async () => { + ifit(process.platform === 'linux' || process.platform === 'freebsd')('current process has a valid LC_ALL env', async () => { // The LC_ALL env should not be set to DOM locale string. expect(lcAll).to.not.equal(app.getLocale()); }); - ifit(process.platform === 'linux')('should not change LC_ALL', async () => testLocale('fr', lcAll, true)); - ifit(process.platform === 'linux')('should not change LC_ALL when setting invalid locale', async () => testLocale('asdfkl', lcAll, true)); - ifit(process.platform === 'linux')('should not change LC_ALL when --lang is not set', async () => testLocale('', lcAll, true)); + ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL', async () => testLocale('fr', lcAll, true)); + ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL when setting invalid locale', async () => testLocale('asdfkl', lcAll, true)); + ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL when --lang is not set', async () => testLocale('', lcAll, true)); }); describe('--remote-debugging-pipe switch', () => { @@ -567,7 +567,7 @@ describe('command line switches', () => { // Disable the test on linux arm and arm64 to avoid startup crash // https://github.com/electron/electron/issues/44293#issuecomment-2420077154 - ifit(process.platform !== 'linux' || (process.arch !== 'arm' && process.arch !== 'arm64'))('creates startup trace', async () => { + ifit((process.platform !== 'linux' && process.platform !== 'freebsd') || (process.arch !== 'arm' && process.arch !== 'arm64'))('creates startup trace', async () => { const rc = await startRemoteControlApp(['--trace-startup=*', `--trace-startup-file=${outputFilePath}`, '--trace-startup-duration=1', '--enable-logging']); const stderrComplete = new Promise(resolve => { let stderr = ''; -@@ -2917,12 +2917,12 @@ describe('font fallback', () => { +@@ -2924,12 +2924,12 @@ describe('font fallback', () => { expect(fonts[0].familyName).to.equal('Arial'); } else if (process.platform === 'darwin') { expect(fonts[0].familyName).to.equal('Helvetica'); - } else if (process.platform === 'linux') { + } else if (process.platform === 'linux' || process.platform === 'freebsd') { expect(fonts[0].familyName).to.equal('DejaVu Sans'); } // I think this depends on the distro? We don't specify a default. }); - ifit(process.platform !== 'linux')('should fall back to Japanese font for sans-serif Japanese script', async function () { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should fall back to Japanese font for sans-serif Japanese script', async function () { const html = ` -@@ -3318,7 +3318,7 @@ describe('navigator.clipboard.write', () => { +@@ -3326,7 +3326,7 @@ describe('navigator.clipboard.write', () => { }); }); -ifdescribe((process.platform !== 'linux' || app.isUnityRunning()))('navigator.setAppBadge/clearAppBadge', () => { +ifdescribe(((process.platform !== 'linux' && process.platform !== 'freebsd') || app.isUnityRunning()))('navigator.setAppBadge/clearAppBadge', () => { let w: BrowserWindow; const expectedBadgeCount = 42;