From nobody Sat Nov 16 13:17:09 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XrDv95Jxvz5dJyV; Sat, 16 Nov 2024 13:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XrDv94RQRz57l9; Sat, 16 Nov 2024 13:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731763029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WuQPeR1zZAwLFM5py/5dueNlavSSBokY/MKOoB5qRJo=; b=B7LL29Fq7k7HP0oBI0Sf963jF47dyZJEk1MdLnvTp4qUyPm/2XlkWmhnwJ1tfUAJzO1XLX Qqwt1tAUSdcpOq4O5qRQRdujOTaN1emBWyv16tgNuOvBvM84QEI2rXiNDb/bqNYg+aGWkF +SLP8DXI7q/dzHsWuA/SfHpWIJHna6rZWVNu68Xkp7yje3HFs23E7G8E0zx3KeiRzOG4d5 cWsU6Vzx3Jixas5+09hAytWgx0c7cSS2Sc5Chf+LXdaeuQDUAw7TtALSzRK/wQYITiuBWM 067oDtkzdKFFZsa1PgaJlFYbYOxcdSC58hC0f+2YW6aIOWiUyqmA7Nrdjh7f2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731763029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WuQPeR1zZAwLFM5py/5dueNlavSSBokY/MKOoB5qRJo=; b=bCMGM3Lv18IEv/7otn1+DCN4KRBKZShjU/ucDY0lKh4VU+W7KavZIoBr49JvK+vIiEJB5e 5AkyCAMBx1f2MWi2AGxNz9ksjpqftLT7FqYHWLgypL8YnbXU8D61KlJ8Hzvh0eSjg8zMvL DJ6J27f4NNqsBwLSFG3ojoXT4cTx3wG023WjUZ+hClIClUiweyjFgpQ1Gh6Q0APRevUHDd uP9Ggd9dFXSP3lo0531++ObdzO3japox6VI5aiXAm+dsdTfzWyZ9dybTaJWf52e7gYXIrx d13aesqsc0QzKAiOyiEgapaPkLW+vF2rmWYUXLRuqfEeAYpCfap8zNKj6zcUug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731763029; a=rsa-sha256; cv=none; b=J74ETLoNd3eB3SEArF9NxBS7nMyZkm7XIhp7VwqkQFjTQVZi93Kp9+2N9/QJjLup1vCwZm NbupvI/1GZwhGInju2zC6+9rUHRMyfYAliN0erLL1lzGs5kKt6NUbbJj/HXBF/OVL6HDHv 3zb1lOQ20N8QgySUPNcNDYjxrqkZIOmEGp9WoPhDP52P9ebiFepWGFxDYz+2v/o8qAsfk5 Xyp6RuqLeSXuwnI5xBAdnG9wJVsxhPI/XPePx/WQHQfKs9MIso43yCvpwlrBR4l8ouiNw8 ByxeVeM+ChJff8cYzcnVb+4ROMB+j0iWSudMAk+1Fx/vciU3LaXV0O//KTCiGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XrDv93Tb1z17hL; Sat, 16 Nov 2024 13:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AGDH9x1070491; Sat, 16 Nov 2024 13:17:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AGDH9lY070488; Sat, 16 Nov 2024 13:17:09 GMT (envelope-from git) Date: Sat, 16 Nov 2024 13:17:09 GMT Message-Id: <202411161317.4AGDH9lY070488@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: b59b6ad42c1a - main - devel/electron32: update to 32.2.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b59b6ad42c1ab1c02abff1cb96ce65f656807835 Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=b59b6ad42c1ab1c02abff1cb96ce65f656807835 commit b59b6ad42c1ab1c02abff1cb96ce65f656807835 Author: Hiroki Tagato AuthorDate: 2024-11-16 13:15:23 +0000 Commit: Hiroki Tagato CommitDate: 2024-11-16 13:17:03 +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 --- 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(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 = ` -@@ -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 +- + -+ -+ Super -+ -+ - - - Meta + + Super +