Date: Sat, 16 Nov 2024 13:17:57 GMT From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: de3c5cee9885 - 2024Q4 - devel/electron32: update to 32.2.5 Message-ID: <202411161317.4AGDHvC3070906@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=de3c5cee98853b183f4d6f724382ffaf544b39ef commit de3c5cee98853b183f4d6f724382ffaf544b39ef Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2024-11-16 13:15:23 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2024-11-16 13:17:46 +0000 devel/electron32: update to 32.2.5 Changelog: https://github.com/electron/electron/releases/tag/v32.2.5 Reported by: GitHub (watch releases) MFH: 2024Q4 Security: 773e7eb2-af19-4fc7-be7f-0f6a2523b98b (cherry picked from commit b59b6ad42c1ab1c02abff1cb96ce65f656807835) --- devel/electron32/Makefile.version | 2 +- devel/electron32/distinfo | 10 +++++----- .../electron32/files/patch-electron_spec_chromium-spec.ts | 6 +++--- .../files/patch-ui_base_accelerators_accelerator.cc | 8 ++++---- .../patch-ui_base_accelerators_accelerator__unittest.cc | 11 +++++------ devel/electron32/files/patch-ui_strings_ui__strings.grd | 15 ++++++--------- 6 files changed, 24 insertions(+), 28 deletions(-) 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,4 +1,4 @@ -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 @@ -7,10 +7,10 @@ SHA256 (electron/chromium-128.0.6613.186.tar.xz.2) = 9d48a4305a6a26b917476ff517b 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 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,4 +1,4 @@ ---- 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}`)); @@ -27,7 +27,7 @@ const rc = await startRemoteControlApp(['--trace-startup=*', `--trace-startup-file=${outputFilePath}`, '--trace-startup-duration=1', '--enable-logging']); const stderrComplete = new Promise<string>(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'); @@ -42,7 +42,7 @@ const html = ` <html lang="ja-JP"> <head> -@@ -3286,7 +3286,7 @@ describe('navigator.clipboard.write', () => { +@@ -3318,7 +3318,7 @@ describe('navigator.clipboard.write', () => { }); }); 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 </message> </if> +- <if expr="is_linux"> + <if expr="is_posix"> -+ <message name="IDS_APP_SUPER_KEY" desc="Windows key on Windows keyboards, and Command key on Mac keyboards."> -+ Super -+ </message> -+ </if> - <if expr="chromeos_ash"> - <message name="IDS_APP_META_KEY" desc="External Meta key (Search key on ChromeOS keyboards, Windows key on Windows keyboards, and Command key on Mac keyboards)"> - Meta + <message name="IDS_APP_SUPER_KEY" desc="Windows key on Windows keyboards, and Command key on Mac keyboards."> + Super + </message>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411161317.4AGDHvC3070906>