git: 81e288af7a5e - main - devel/electron30: update to 30.3.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 23 Jul 2024 03:55:34 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=81e288af7a5efafdc7a57890bd80d9f8056e65d3
commit 81e288af7a5efafdc7a57890bd80d9f8056e65d3
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2024-07-23 03:52:02 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2024-07-23 03:55:24 +0000
devel/electron30: update to 30.3.0
Changelog: https://github.com/electron/electron/releases/tag/v30.3.0
Reported by: GitHub (watch releases)
---
devel/electron30/Makefile | 2 +-
devel/electron30/Makefile.version | 2 +-
devel/electron30/distinfo | 14 +++++++-------
...ron_shell_browser_electron__browser__main__parts.cc | 18 +++++++++---------
.../files/patch-electron_spec_api-app-spec.ts | 8 ++++----
.../files/patch-electron_spec_version-bump-spec.ts | 8 ++++----
6 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/devel/electron30/Makefile b/devel/electron30/Makefile
index b5229bbc859f..aeef62afabcf 100644
--- a/devel/electron30/Makefile
+++ b/devel/electron30/Makefile
@@ -226,7 +226,7 @@ CHROMIUM_NODE_MODULES_HASH= 97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2
# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
CHROMIUM_TEST_FONTS_HASH= 336e775eec536b2d785cc80eff6ac39051931286
# See ${WRKSRC}/electron/DEPS for NODE_VER
-NODE_VER= 20.15.0
+NODE_VER= 20.15.1
# See ${WRKSRC}/electron/DEPS for NAN_VER
NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213
# See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
diff --git a/devel/electron30/Makefile.version b/devel/electron30/Makefile.version
index f926410a0aa8..18f94b16b610 100644
--- a/devel/electron30/Makefile.version
+++ b/devel/electron30/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 30.2.0
+ELECTRON_VER= 30.3.0
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron30/distinfo b/devel/electron30/distinfo
index c4a634c5e36b..901c34bc0fbc 100644
--- a/devel/electron30/distinfo
+++ b/devel/electron30/distinfo
@@ -1,16 +1,16 @@
-TIMESTAMP = 1721043029
+TIMESTAMP = 1721698144
SHA256 (electron/chromium-124.0.6367.243.tar.xz) = 53ed2f29769fe105ae884e37fd9fd9d9756931cf1d6d16c6a252f5982b8496cb
SIZE (electron/chromium-124.0.6367.243.tar.xz) = 1633060772
SHA256 (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = dcfaea4d353d1df3d4ac2d245ea7e32ad177d4bea1351f363714c9c22ca5c4f8
SIZE (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = 9761601
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
-SHA256 (electron/electron-yarn-cache-30.2.0.tar.xz) = f1850543ce13619fe291e15e25418779cee8ed154d2424c5dbb49faa2e4c60f3
-SIZE (electron/electron-yarn-cache-30.2.0.tar.xz) = 29179584
-SHA256 (electron/electron-electron-v30.2.0_GH0.tar.gz) = 6af984fbf42f5ac64ba298f780448ea8e87672ed7e804cd241298524d451e728
-SIZE (electron/electron-electron-v30.2.0_GH0.tar.gz) = 13401245
-SHA256 (electron/nodejs-node-v20.15.0_GH0.tar.gz) = 355d48c780d49c8bd5063016bc56c642db2840f6392d037cf74fd864c53f6922
-SIZE (electron/nodejs-node-v20.15.0_GH0.tar.gz) = 115459744
+SHA256 (electron/electron-yarn-cache-30.3.0.tar.xz) = f1850543ce13619fe291e15e25418779cee8ed154d2424c5dbb49faa2e4c60f3
+SIZE (electron/electron-yarn-cache-30.3.0.tar.xz) = 29179584
+SHA256 (electron/electron-electron-v30.3.0_GH0.tar.gz) = 9894aea259b28442e894817c7d6187791da80321c0fbf5504ca4bee4466897e5
+SIZE (electron/electron-electron-v30.3.0_GH0.tar.gz) = 13378936
+SHA256 (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 9c54c9338f78cf99227d006e65123fd9ef66cf8c271f3c25cad9a336f201507f
+SIZE (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 115474342
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
diff --git a/devel/electron30/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron30/files/patch-electron_shell_browser_electron__browser__main__parts.cc
index f58864b1204e..6483a0cbee7b 100644
--- a/devel/electron30/files/patch-electron_shell_browser_electron__browser__main__parts.cc
+++ b/devel/electron30/files/patch-electron_shell_browser_electron__browser__main__parts.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/electron_browser_main_parts.cc.orig 2024-05-15 08:18:48 UTC
+--- electron/shell/browser/electron_browser_main_parts.cc.orig 2024-07-18 11:13:59 UTC
+++ electron/shell/browser/electron_browser_main_parts.cc
@@ -77,7 +77,7 @@
#include "ui/wm/core/wm_state.h"
@@ -9,7 +9,7 @@
#include "base/environment.h"
#include "chrome/browser/ui/views/dark_mode_manager_linux.h"
#include "device/bluetooth/bluetooth_adapter_factory.h"
-@@ -129,7 +129,7 @@ namespace {
+@@ -130,7 +130,7 @@ namespace {
namespace {
@@ -18,7 +18,7 @@
class LinuxUiGetterImpl : public ui::LinuxUiGetter {
public:
LinuxUiGetterImpl() = default;
-@@ -212,7 +212,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization()
+@@ -213,7 +213,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization()
#if BUILDFLAG(IS_POSIX)
HandleSIGCHLD();
#endif
@@ -27,7 +27,7 @@
DetectOzonePlatform();
ui::OzonePlatform::PreEarlyInitialization();
#endif
-@@ -302,7 +302,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
+@@ -303,7 +303,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
// happen before the ResourceBundle is loaded
if (locale.empty())
l10n_util::OverrideLocaleWithCocoaLocale();
@@ -36,7 +36,7 @@
// l10n_util::GetApplicationLocaleInternal uses g_get_language_names(),
// which keys off of getenv("LC_ALL").
// We must set this env first to make ui::ResourceBundle accept the custom
-@@ -333,7 +333,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
+@@ -334,7 +334,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
ElectronBrowserClient::SetApplicationLocale(app_locale);
fake_browser_process_->SetApplicationLocale(app_locale);
@@ -45,7 +45,7 @@
// Reset to the original LC_ALL since we should not be changing it.
if (!locale.empty()) {
if (lc_all)
-@@ -393,7 +393,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() {
+@@ -394,7 +394,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() {
}
void ElectronBrowserMainParts::ToolkitInitialized() {
@@ -54,7 +54,7 @@
auto* linux_ui = ui::GetDefaultLinuxUi();
CHECK(linux_ui);
linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>();
-@@ -494,7 +494,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
+@@ -500,7 +500,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
}
void ElectronBrowserMainParts::PostCreateMainMessageLoop() {
@@ -63,7 +63,7 @@
std::string app_name = electron::Browser::Get()->GetName();
#endif
#if BUILDFLAG(IS_LINUX)
-@@ -506,7 +506,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
+@@ -512,7 +512,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
if (!bluez::BluezDBusManager::IsInitialized())
bluez::DBusBluezManagerWrapperLinux::Initialize();
@@ -73,7 +73,7 @@
// Set up crypt config. This needs to be done before anything starts the
// network service, as the raw encryption key needs to be shared with the
// network service for encrypted cookie storage.
-@@ -605,7 +607,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
+@@ -611,7 +613,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
fake_browser_process_->PostMainMessageLoopRun();
content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();
diff --git a/devel/electron30/files/patch-electron_spec_api-app-spec.ts b/devel/electron30/files/patch-electron_spec_api-app-spec.ts
index 3b711305d2e5..08d89b9974f9 100644
--- a/devel/electron30/files/patch-electron_spec_api-app-spec.ts
+++ b/devel/electron30/files/patch-electron_spec_api-app-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec/api-app-spec.ts.orig 2024-07-09 23:10:34 UTC
+--- electron/spec/api-app-spec.ts.orig 2024-07-18 11:13:59 UTC
+++ electron/spec/api-app-spec.ts
@@ -123,11 +123,11 @@ describe('app module', () => {
});
@@ -128,6 +128,6 @@
- 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/electron30/files/patch-electron_spec_version-bump-spec.ts b/devel/electron30/files/patch-electron_spec_version-bump-spec.ts
index b21840512b7c..0ff930e83197 100644
--- a/devel/electron30/files/patch-electron_spec_version-bump-spec.ts
+++ b/devel/electron30/files/patch-electron_spec_version-bump-spec.ts
@@ -1,9 +1,9 @@
---- electron/spec/version-bump-spec.ts.orig 2023-01-24 16:58:16 UTC
+--- electron/spec/version-bump-spec.ts.orig 2024-07-18 11:13:59 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', () => {