diff --git a/devel/electron32/Makefile.version b/devel/electron32/Makefile.version index 7ab4400b813b..028ec921a412 100644 --- a/devel/electron32/Makefile.version +++ b/devel/electron32/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 32.2.4 +ELECTRON_VER= 32.2.5 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron32/distinfo b/devel/electron32/distinfo index cbf29395cdb8..e0e16d8c4ec2 100644 --- a/devel/electron32/distinfo +++ b/devel/electron32/distinfo @@ -1,25 +1,25 @@ -TIMESTAMP = 1731612887 +TIMESTAMP = 1731726207 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.4.tar.xz) = 91757602275d2d266604a25a164dd40397261b26fa3e6770cfc4431cedd35b2d -SIZE (electron/electron-yarn-cache-32.2.4.tar.xz) = 32181832 -SHA256 (electron/electron-electron-v32.2.4_GH0.tar.gz) = 7dfc9b9dcf1448d3b0a4e308fc05eba979c6cca9d123443868788b4aaf84da91 -SIZE (electron/electron-electron-v32.2.4_GH0.tar.gz) = 14652468 +SHA256 (electron/electron-yarn-cache-32.2.5.tar.xz) = 91757602275d2d266604a25a164dd40397261b26fa3e6770cfc4431cedd35b2d +SIZE (electron/electron-yarn-cache-32.2.5.tar.xz) = 32181832 +SHA256 (electron/electron-electron-v32.2.5_GH0.tar.gz) = ca5b677bf3cc0571e1bb65c65acbfe1b98f082c33b6169bee3df873ef6f5d8d3 +SIZE (electron/electron-electron-v32.2.5_GH0.tar.gz) = 14658993 SHA256 (electron/nodejs-node-v20.18.0_GH0.tar.gz) = 651bb82f6af18084070893559643759165ce050b5839f830d4cc098130d3ad89 SIZE (electron/nodejs-node-v20.18.0_GH0.tar.gz) = 115526827 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_spec_chromium-spec.ts b/devel/electron32/files/patch-electron_spec_chromium-spec.ts index 05d1382ec106..4ecba7850013 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-05 17:01:40 UTC +--- electron/spec/chromium-spec.ts.orig 2024-11-15 19:11:29 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 = ''; -@@ -2885,12 +2885,12 @@ describe('font fallback', () => { +@@ -2917,12 +2917,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 = ` -@@ -3286,7 +3286,7 @@ describe('navigator.clipboard.write', () => { +@@ -3318,7 +3318,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; diff --git a/devel/electron32/files/patch-ui_base_accelerators_accelerator.cc b/devel/electron32/files/patch-ui_base_accelerators_accelerator.cc index b30d690a091b..96b187550a97 100644 --- a/devel/electron32/files/patch-ui_base_accelerators_accelerator.cc +++ b/devel/electron32/files/patch-ui_base_accelerators_accelerator.cc @@ -1,11 +1,11 @@ ---- ui/base/accelerators/accelerator.cc.orig 2024-11-08 09:20:48 UTC +--- ui/base/accelerators/accelerator.cc.orig 2024-11-16 03:24:59 UTC +++ ui/base/accelerators/accelerator.cc -@@ -419,6 +419,8 @@ std::u16string Accelerator::ApplyLongFormModifiers( +@@ -419,7 +419,7 @@ std::u16string Accelerator::ApplyLongFormModifiers( result = ApplyModifierToAcceleratorString(result, IDS_APP_SEARCH_KEY); #elif BUILDFLAG(IS_WIN) result = ApplyModifierToAcceleratorString(result, IDS_APP_WINDOWS_KEY); +-#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) -+ result = ApplyModifierToAcceleratorString(result, IDS_APP_SUPER_KEY); + result = ApplyModifierToAcceleratorString(result, IDS_APP_SUPER_KEY); #else NOTREACHED_IN_MIGRATION(); - #endif diff --git a/devel/electron32/files/patch-ui_base_accelerators_accelerator__unittest.cc b/devel/electron32/files/patch-ui_base_accelerators_accelerator__unittest.cc index d253e6035192..90fcae311265 100644 --- a/devel/electron32/files/patch-ui_base_accelerators_accelerator__unittest.cc +++ b/devel/electron32/files/patch-ui_base_accelerators_accelerator__unittest.cc @@ -1,12 +1,11 @@ ---- ui/base/accelerators/accelerator_unittest.cc.orig 2024-10-18 12:35:12 UTC +--- ui/base/accelerators/accelerator_unittest.cc.orig 2024-11-16 03:24:59 UTC +++ ui/base/accelerators/accelerator_unittest.cc -@@ -59,6 +59,9 @@ TEST(AcceleratorTest, MAYBE_GetShortcutText) { +@@ -59,7 +59,7 @@ TEST(AcceleratorTest, MAYBE_GetShortcutText) { #if BUILDFLAG(IS_MAC) {VKEY_T, EF_COMMAND_DOWN | EF_CONTROL_DOWN, nullptr, u"⌃⌘T"}, #endif +-#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) -+ {VKEY_T, EF_COMMAND_DOWN | EF_CONTROL_DOWN, u"Super+Ctrl+T", nullptr}, -+#endif + {VKEY_T, EF_COMMAND_DOWN | EF_CONTROL_DOWN, u"Super+Ctrl+T", nullptr}, + #endif }; - - for (const auto& key : keys) { diff --git a/devel/electron32/files/patch-ui_strings_ui__strings.grd b/devel/electron32/files/patch-ui_strings_ui__strings.grd index 246281cec82e..6c650533ebfb 100644 --- a/devel/electron32/files/patch-ui_strings_ui__strings.grd +++ b/devel/electron32/files/patch-ui_strings_ui__strings.grd @@ -1,14 +1,11 @@ ---- ui/strings/ui_strings.grd.orig 2024-10-18 12:35:12 UTC +--- ui/strings/ui_strings.grd.orig 2024-11-16 03:24:59 UTC +++ ui/strings/ui_strings.grd -@@ -764,6 +764,11 @@ need to be translated for each locale.--> +@@ -764,7 +764,7 @@ need to be translated for each locale.--> Win +- + -+ -+ Super -+ -+ - - - Meta + + Super +