Skip to content

Commit d9b0306

Browse files
tagattietagattie
committed
devel/electron29: update to 29.1.6
Changelog: https://github.com/electron/electron/releases/tag/v29.1.6
1 parent ff333df commit d9b0306

File tree

5 files changed

+29
-22
lines changed

5 files changed

+29
-22
lines changed

‎devel/electron29/Makefile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ PORTNAME= electron
22
DISTVERSIONPREFIX= v
33
DISTVERSION= ${ELECTRON_VER:S/-beta./.b/}
44
CATEGORIES= devel
5-
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \
5+
MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v29.1.6/:chromium \
6+
https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
67
https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
78
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
89
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
10+
${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
911
${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
1012
electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
1113
DIST_SUBDIR= ${PORTNAME}
@@ -218,7 +220,9 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true
218220
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
219221

220222
# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
221-
CHROMIUM_VER= 122.0.6261.130
223+
CHROMIUM_VER= 122.0.6261.139
224+
# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
225+
CHROMIUM_NODE_MODULES_HASH= e0b8a95aed06c02287872a2d15c28509b9808446
222226
# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
223227
CHROMIUM_TEST_FONTS_HASH= 336e775eec536b2d785cc80eff6ac39051931286
224228
# See ${WRKSRC}/electron/DEPS for NODE_VER
@@ -342,6 +346,7 @@ post-extract:
342346
${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
343347
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reclient_configs}-${ENGFLOW_RECLIENT_CONFIGS_VER} \
344348
${WRKSRC}/third_party/engflow-reclient-configs
349+
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
345350
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
346351
# Install node modules for electron
347352
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}

‎devel/electron29/Makefile.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
ELECTRON_VER= 29.1.5
1+
ELECTRON_VER= 29.1.6
22
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}

‎devel/electron29/distinfo‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
TIMESTAMP = 1711137153
2-
SHA256 (electron/chromium-122.0.6261.130.tar.xz) = efa3610ee9ec7359316a1b671ae46ffd6e32222e901b1b8adbd0fda91722bedc
3-
SIZE (electron/chromium-122.0.6261.130.tar.xz) = 3434504756
1+
TIMESTAMP = 1711774537
2+
SHA256 (electron/chromium-122.0.6261.139.tar.xz) = 38e036c1522c4338d439c680b4992f768e028511f27d5ee182a4bc79ce7ec589
3+
SIZE (electron/chromium-122.0.6261.139.tar.xz) = 1660785404
4+
SHA256 (electron/e0b8a95aed06c02287872a2d15c28509b9808446) = 6c964b838cc8b73e6014d6f57ae132455e3b0787449a10d4cf12b1415f2abda2
5+
SIZE (electron/e0b8a95aed06c02287872a2d15c28509b9808446) = 9601507
46
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
57
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
6-
SHA256 (electron/electron-yarn-cache-29.1.5.tar.xz) = 33fb5418c9bd9a90ba8a04ecce54acb230f87a66b90033f8b72376bca566a689
7-
SIZE (electron/electron-yarn-cache-29.1.5.tar.xz) = 29177856
8-
SHA256 (electron/electron-electron-v29.1.5_GH0.tar.gz) = 900bf22ffde4edcb77a9f7b3561a9d4384740a720082920a21f0badba1366bb3
9-
SIZE (electron/electron-electron-v29.1.5_GH0.tar.gz) = 13353002
8+
SHA256 (electron/electron-yarn-cache-29.1.6.tar.xz) = 33fb5418c9bd9a90ba8a04ecce54acb230f87a66b90033f8b72376bca566a689
9+
SIZE (electron/electron-yarn-cache-29.1.6.tar.xz) = 29177856
10+
SHA256 (electron/electron-electron-v29.1.6_GH0.tar.gz) = bddf8d893683eea13fcc333507a476a8af2dc5f1fb2adb88cd0976b1521882fd
11+
SIZE (electron/electron-electron-v29.1.6_GH0.tar.gz) = 13353753
1012
SHA256 (electron/nodejs-node-v20.9.0_GH0.tar.gz) = 97fa9283e5472d4252794c930ad59270e4851cc523fe5469f37f65a344f5f2e2
1113
SIZE (electron/nodejs-node-v20.9.0_GH0.tar.gz) = 114905754
1214
SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb

‎devel/electron29/files/patch-electron_spec_api-app-spec.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- electron/spec/api-app-spec.ts.orig 2024-02-27 20:12:14 UTC
1+
--- electron/spec/api-app-spec.ts.orig 2024-03-27 09:20:29 UTC
22
+++ electron/spec/api-app-spec.ts
33
@@ -123,11 +123,11 @@ describe('app module', () => {
44
});
@@ -50,7 +50,7 @@
5050
const isMac = process.platform === 'darwin';
5151
const isWin = process.platform === 'win32';
5252

53-
@@ -975,7 +975,7 @@ describe('app module', () => {
53+
@@ -976,7 +976,7 @@ describe('app module', () => {
5454
});
5555
});
5656

@@ -59,7 +59,7 @@
5959
it('with properties', () => {
6060
it('can set accessibility support enabled', () => {
6161
expect(app.accessibilitySupportEnabled).to.eql(false);
62-
@@ -1137,7 +1137,7 @@ describe('app module', () => {
62+
@@ -1138,7 +1138,7 @@ describe('app module', () => {
6363
});
6464
});
6565

@@ -68,7 +68,7 @@
6868
let w: BrowserWindow;
6969

7070
before(function () {
71-
@@ -1272,7 +1272,7 @@ describe('app module', () => {
71+
@@ -1273,7 +1273,7 @@ describe('app module', () => {
7272

7373
describe('getApplicationNameForProtocol()', () => {
7474
// TODO: Linux CI doesn't have registered http & https handlers
@@ -77,7 +77,7 @@
7777
// We can't expect particular app names here, but these protocols should
7878
// at least have _something_ registered. Except on our Linux CI
7979
// environment apparently.
80-
@@ -1290,7 +1290,7 @@ describe('app module', () => {
80+
@@ -1291,7 +1291,7 @@ describe('app module', () => {
8181
});
8282
});
8383

@@ -86,7 +86,7 @@
8686
it('returns promise rejection for a bogus protocol', async function () {
8787
await expect(
8888
app.getApplicationInfoForProtocol('bogus-protocol://')
89-
@@ -1340,7 +1340,7 @@ describe('app module', () => {
89+
@@ -1341,7 +1341,7 @@ describe('app module', () => {
9090
});
9191

9292
// FIXME Get these specs running on Linux CI
@@ -95,7 +95,7 @@
9595
const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico');
9696
const sizes = {
9797
small: 16,
98-
@@ -1421,7 +1421,7 @@ describe('app module', () => {
98+
@@ -1422,7 +1422,7 @@ describe('app module', () => {
9999
expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0);
100100
}
101101

@@ -104,7 +104,7 @@
104104
expect(entry.sandboxed).to.be.a('boolean');
105105
}
106106

107-
@@ -1447,7 +1447,7 @@ describe('app module', () => {
107+
@@ -1448,7 +1448,7 @@ describe('app module', () => {
108108
});
109109

110110
// FIXME https://github.com/electron/electron/issues/24224
@@ -113,7 +113,7 @@
113113
const appPath = path.join(fixturesPath, 'api', 'gpu-info.js');
114114

115115
const getGPUInfo = async (type: string) => {
116-
@@ -1496,7 +1496,7 @@ describe('app module', () => {
116+
@@ -1497,7 +1497,7 @@ describe('app module', () => {
117117

118118
it('succeeds with complete GPUInfo', async () => {
119119
const completeInfo = await getGPUInfo('complete');
@@ -122,7 +122,7 @@
122122
// For linux and macOS complete info is same as basic info
123123
await verifyBasicGPUInfo(completeInfo);
124124
const basicInfo = await getGPUInfo('basic');
125-
@@ -1520,7 +1520,7 @@ describe('app module', () => {
125+
@@ -1521,7 +1521,7 @@ describe('app module', () => {
126126
});
127127
});
128128

‎devel/electron29/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2024-02-21 00:20:54 UTC
1+
--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2024-03-30 03:21:48 UTC
22
+++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc
3-
@@ -742,7 +742,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
3+
@@ -726,7 +726,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
44
mixer->get_output_params_for_testing().sample_rate());
55

66
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \

0 commit comments

Comments
 (0)