diff --git a/devel/electron29/Makefile.version b/devel/electron29/Makefile.version index 1514ed93cfb5..082a659efb08 100644 --- a/devel/electron29/Makefile.version +++ b/devel/electron29/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 29.4.5 +ELECTRON_VER= 29.4.6 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron29/distinfo b/devel/electron29/distinfo index b77963271b68..f31b9d341f6e 100644 --- a/devel/electron29/distinfo +++ b/devel/electron29/distinfo @@ -1,23 +1,23 @@ -TIMESTAMP = 1721377739 +TIMESTAMP = 1723946432 SHA256 (electron/chromium-122.0.6261.156.tar.xz) = c29e0d546920a788d664f241739c1b9ee6f5235cfab91f8d4cf3026f42bceead SIZE (electron/chromium-122.0.6261.156.tar.xz) = 1660787092 SHA256 (electron/e0b8a95aed06c02287872a2d15c28509b9808446) = 6c964b838cc8b73e6014d6f57ae132455e3b0787449a10d4cf12b1415f2abda2 SIZE (electron/e0b8a95aed06c02287872a2d15c28509b9808446) = 9601507 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-29.4.5.tar.xz) = 7bf31c8b9c55ee317c217cd6605eb85ed015cef96246188be0ab3b2681200368 -SIZE (electron/electron-yarn-cache-29.4.5.tar.xz) = 29229388 -SHA256 (electron/electron-electron-v29.4.5_GH0.tar.gz) = e195aa6f3f9172a8f3265fc9058cf03cb825d5f0c026f06284fac6f24926caf2 -SIZE (electron/electron-electron-v29.4.5_GH0.tar.gz) = 13457835 +SHA256 (electron/electron-yarn-cache-29.4.6.tar.xz) = 7bf31c8b9c55ee317c217cd6605eb85ed015cef96246188be0ab3b2681200368 +SIZE (electron/electron-yarn-cache-29.4.6.tar.xz) = 29229388 +SHA256 (electron/electron-electron-v29.4.6_GH0.tar.gz) = ef722f74add871e557b08731b3362c5f4080f3e84ccb89149536ebd197387b3c +SIZE (electron/electron-electron-v29.4.6_GH0.tar.gz) = 13454437 SHA256 (electron/nodejs-node-v20.9.0_GH0.tar.gz) = 97fa9283e5472d4252794c930ad59270e4851cc523fe5469f37f65a344f5f2e2 SIZE (electron/nodejs-node-v20.9.0_GH0.tar.gz) = 114905754 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/electron29/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc b/devel/electron29/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc index c7fef3ceb47c..de8c1b9a82cd 100644 --- a/devel/electron29/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc +++ b/devel/electron29/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc @@ -1,11 +1,11 @@ ---- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2024-02-21 16:26:48 UTC +--- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2024-08-09 17:08:27 UTC +++ electron/shell/browser/api/electron_api_desktop_capturer.cc -@@ -41,7 +41,7 @@ - #include "ui/gfx/x/randr.h" +@@ -45,7 +45,7 @@ + #include "ui/base/cocoa/permissions_utils.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Private function in ui/base/x/x11_display_util.cc std::map GetMonitors( std::pair version, diff --git a/devel/electron29/files/patch-electron_spec_api-app-spec.ts b/devel/electron29/files/patch-electron_spec_api-app-spec.ts index a4edc810ba96..79fb0e020864 100644 --- a/devel/electron29/files/patch-electron_spec_api-app-spec.ts +++ b/devel/electron29/files/patch-electron_spec_api-app-spec.ts @@ -1,133 +1,133 @@ ---- electron/spec/api-app-spec.ts.orig 2024-07-10 22:38:05 UTC +--- electron/spec/api-app-spec.ts.orig 2024-08-09 17:08:27 UTC +++ electron/spec/api-app-spec.ts @@ -123,11 +123,11 @@ describe('app module', () => { }); describe('app.getPreferredSystemLanguages()', () => { - ifit(process.platform !== 'linux')('should not be empty', () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not be empty', () => { expect(app.getPreferredSystemLanguages().length).to.not.equal(0); }); - ifit(process.platform === 'linux')('should be empty or contain C entry', () => { + ifit(process.platform === 'linux' || process.platform === 'freebsd')('should be empty or contain C entry', () => { const languages = app.getPreferredSystemLanguages(); if (languages.length) { expect(languages).to.not.include('C'); @@ -190,7 +190,7 @@ describe('app module', () => { expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound'); }); - ifit(['darwin', 'linux'].includes(process.platform))('exits gracefully', async function () { + ifit(['darwin', 'linux', 'freebsd'].includes(process.platform))('exits gracefully', async function () { const electronPath = process.execPath; const appPath = path.join(fixturesPath, 'api', 'singleton'); appProcess = cp.spawn(electronPath, [appPath]); @@ -444,7 +444,7 @@ describe('app module', () => { // let w = null // before(function () { - // if (process.platform !== 'linux') { + // if (process.platform !== 'linux' && process.platform !== 'freebsd') { // this.skip() // } // }) @@ -551,7 +551,7 @@ describe('app module', () => { describe('app.badgeCount', () => { const platformIsNotSupported = (process.platform === 'win32') || - (process.platform === 'linux' && !app.isUnityRunning()); + ((process.platform === 'linux' || process.platform === 'freebsd') && !app.isUnityRunning()); const expectedBadgeCount = 42; @@ -595,7 +595,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux' && !process.mas && (process.platform !== 'darwin' || process.arch === 'arm64'))('app.get/setLoginItemSettings API', function () { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd' && !process.mas && (process.platform !== 'darwin' || process.arch === 'arm64'))('app.get/setLoginItemSettings API', function () { const isMac = process.platform === 'darwin'; const isWin = process.platform === 'win32'; @@ -976,7 +976,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux')('accessibilitySupportEnabled property', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('accessibilitySupportEnabled property', () => { it('with properties', () => { it('can set accessibility support enabled', () => { expect(app.accessibilitySupportEnabled).to.eql(false); @@ -1138,7 +1138,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux')('select-client-certificate event', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('select-client-certificate event', () => { let w: BrowserWindow; before(function () { @@ -1273,7 +1273,7 @@ describe('app module', () => { describe('getApplicationNameForProtocol()', () => { // TODO: Linux CI doesn't have registered http & https handlers - ifit(!(process.env.CI && process.platform === 'linux'))('returns application names for common protocols', function () { + ifit(!(process.env.CI && (process.platform === 'linux' || process.platform === 'freebsd')))('returns application names for common protocols', function () { // We can't expect particular app names here, but these protocols should // at least have _something_ registered. Except on our Linux CI // environment apparently. @@ -1291,7 +1291,7 @@ describe('app module', () => { }); }); - ifdescribe(process.platform !== 'linux')('getApplicationInfoForProtocol()', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('getApplicationInfoForProtocol()', () => { it('returns promise rejection for a bogus protocol', async function () { await expect( app.getApplicationInfoForProtocol('bogus-protocol://') @@ -1341,7 +1341,7 @@ describe('app module', () => { }); // FIXME Get these specs running on Linux CI - ifdescribe(process.platform !== 'linux')('getFileIcon() API', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('getFileIcon() API', () => { const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico'); const sizes = { small: 16, @@ -1422,7 +1422,7 @@ describe('app module', () => { expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0); } - if (process.platform !== 'linux') { + if (process.platform !== 'linux' && process.platform !== 'freebsd') { expect(entry.sandboxed).to.be.a('boolean'); } @@ -1448,7 +1448,7 @@ describe('app module', () => { }); // FIXME https://github.com/electron/electron/issues/24224 - ifdescribe(process.platform !== 'linux')('getGPUInfo() API', () => { + ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('getGPUInfo() API', () => { const appPath = path.join(fixturesPath, 'api', 'gpu-info.js'); const getGPUInfo = async (type: string) => { @@ -1497,7 +1497,7 @@ describe('app module', () => { it('succeeds with complete GPUInfo', async () => { const completeInfo = await getGPUInfo('complete'); - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo); const basicInfo = await getGPUInfo('basic'); @@ -1521,7 +1521,7 @@ describe('app module', () => { }); }); - 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/electron29/files/patch-electron_spec_version-bump-spec.ts b/devel/electron29/files/patch-electron_spec_version-bump-spec.ts index b21840512b7c..6c1f583bef15 100644 --- a/devel/electron29/files/patch-electron_spec_version-bump-spec.ts +++ b/devel/electron29/files/patch-electron_spec_version-bump-spec.ts @@ -1,11 +1,11 @@ ---- electron/spec/version-bump-spec.ts.orig 2023-01-24 16:58:16 UTC +--- electron/spec/version-bump-spec.ts.orig 2024-08-09 17:08:27 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', () => { const nightlyPattern = /[0-9.]*(-nightly.(\d{4})(\d{2})(\d{2}))$/g; const betaPattern = /[0-9.]*(-beta[0-9.]*)/g;