Date: Wed, 11 Sep 2024 23:54:40 GMT From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d1dbf12c9250 - main - devel/electron30: update to 30.5.0 Message-ID: <202409112354.48BNseaD057384@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1dbf12c9250800edcc9e18602a26205adb65874 commit d1dbf12c9250800edcc9e18602a26205adb65874 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2024-09-11 23:49:27 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2024-09-11 23:54:24 +0000 devel/electron30: update to 30.5.0 Changelog: https://github.com/electron/electron/releases/tag/v30.5.0 Reported by: GitHub (watch releases) --- devel/electron30/Makefile | 3 +-- devel/electron30/Makefile.version | 2 +- devel/electron30/distinfo | 14 +++++++------- .../files/patch-electron_shell_app_node__main.cc | 5 ++--- ...tron_shell_browser_api_electron__api__base__window.cc | 4 ++-- ...n_shell_browser_api_electron__api__crash__reporter.cc | 14 +++++++------- ...shell_browser_api_electron__api__desktop__capturer.cc | 6 +++--- ...ctron_shell_browser_electron__browser__main__parts.cc | 16 ++++++++-------- ...patch-third__party_electron__node_deps_cares_BUILD.gn | 4 ++-- 9 files changed, 33 insertions(+), 35 deletions(-) diff --git a/devel/electron30/Makefile b/devel/electron30/Makefile index a23eee019d4a..66ee0c9272ad 100644 --- a/devel/electron30/Makefile +++ b/devel/electron30/Makefile @@ -1,7 +1,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v30.1.1/:chromium \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ @@ -227,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.1 +NODE_VER= 20.16.0 # 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 662998d32a71..d00e51566b23 100644 --- a/devel/electron30/Makefile.version +++ b/devel/electron30/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 30.4.0 +ELECTRON_VER= 30.5.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron30/distinfo b/devel/electron30/distinfo index b27e4cc4d846..b7613c98cdfd 100644 --- a/devel/electron30/distinfo +++ b/devel/electron30/distinfo @@ -1,16 +1,16 @@ -TIMESTAMP = 1724015117 +TIMESTAMP = 1726042075 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.4.0.tar.xz) = f1850543ce13619fe291e15e25418779cee8ed154d2424c5dbb49faa2e4c60f3 -SIZE (electron/electron-yarn-cache-30.4.0.tar.xz) = 29179584 -SHA256 (electron/electron-electron-v30.4.0_GH0.tar.gz) = 5c1b64b85b733275543056bb6499448516c3f030f18557024857f681cf2199bd -SIZE (electron/electron-electron-v30.4.0_GH0.tar.gz) = 13403540 -SHA256 (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 9c54c9338f78cf99227d006e65123fd9ef66cf8c271f3c25cad9a336f201507f -SIZE (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 115474342 +SHA256 (electron/electron-yarn-cache-30.5.0.tar.xz) = f1850543ce13619fe291e15e25418779cee8ed154d2424c5dbb49faa2e4c60f3 +SIZE (electron/electron-yarn-cache-30.5.0.tar.xz) = 29179584 +SHA256 (electron/electron-electron-v30.5.0_GH0.tar.gz) = 10ccd78b3c709d22aa78b5cc62627f3a08feb710c8efbc28dd893e4f7aa38df2 +SIZE (electron/electron-electron-v30.5.0_GH0.tar.gz) = 13407784 +SHA256 (electron/nodejs-node-v20.16.0_GH0.tar.gz) = d78104796225bcc150adf8ce4c486abfb390e1c71d0af7f28343803fe8588491 +SIZE (electron/nodejs-node-v20.16.0_GH0.tar.gz) = 115322530 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_app_node__main.cc b/devel/electron30/files/patch-electron_shell_app_node__main.cc index 887eeee21238..fe22ca3574ce 100644 --- a/devel/electron30/files/patch-electron_shell_app_node__main.cc +++ b/devel/electron30/files/patch-electron_shell_app_node__main.cc @@ -1,4 +1,4 @@ ---- electron/shell/app/node_main.cc.orig 2024-04-16 14:29:17 UTC +--- electron/shell/app/node_main.cc.orig 2024-09-05 10:01:25 UTC +++ electron/shell/app/node_main.cc @@ -48,7 +48,7 @@ #include "shell/common/mac/codesign_util.h" @@ -9,7 +9,7 @@ #include "components/crash/core/app/crashpad.h" // nogncheck #include "shell/app/electron_crash_reporter_client.h" #include "shell/common/crash_keys.h" -@@ -99,7 +99,7 @@ bool UnsetHijackableEnvs(base::Environment* env) { +@@ -99,14 +99,14 @@ bool UnsetHijackableEnvs(base::Environment* env) { } #endif @@ -18,7 +18,6 @@ void SetCrashKeyStub(const std::string& key, const std::string& value) {} void ClearCrashKeyStub(const std::string& key) {} #endif -@@ -110,7 +110,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolat v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) { std::map<std::string, std::string> keys; diff --git a/devel/electron30/files/patch-electron_shell_browser_api_electron__api__base__window.cc b/devel/electron30/files/patch-electron_shell_browser_api_electron__api__base__window.cc index 73bba1caeaa2..426f8a91496d 100644 --- a/devel/electron30/files/patch-electron_shell_browser_api_electron__api__base__window.cc +++ b/devel/electron30/files/patch-electron_shell_browser_api_electron__api__base__window.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_base_window.cc.orig 2024-07-09 23:10:34 UTC +--- electron/shell/browser/api/electron_api_base_window.cc.orig 2024-09-05 10:01:25 UTC +++ electron/shell/browser/api/electron_api_base_window.cc @@ -40,7 +40,7 @@ #include "shell/browser/ui/views/win_frame_view.h" @@ -27,7 +27,7 @@ void BaseWindow::SetTitleBarOverlay(const gin_helper::Dictionary& options, gin_helper::Arguments* args) { // Ensure WCO is already enabled on this window -@@ -1301,7 +1301,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, +@@ -1300,7 +1300,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, .SetMethod("setThumbnailToolTip", &BaseWindow::SetThumbnailToolTip) .SetMethod("setAppDetails", &BaseWindow::SetAppDetails) #endif diff --git a/devel/electron30/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc b/devel/electron30/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc index f229a1bde031..e79a6da3cd9f 100644 --- a/devel/electron30/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc +++ b/devel/electron30/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_crash_reporter.cc.orig 2023-06-07 10:09:25 UTC +--- electron/shell/browser/api/electron_api_crash_reporter.cc.orig 2024-09-05 10:01:25 UTC +++ electron/shell/browser/api/electron_api_crash_reporter.cc @@ -31,7 +31,7 @@ #include "shell/common/process_util.h" @@ -9,7 +9,7 @@ #include "components/crash/core/app/crashpad.h" // nogncheck #include "components/crash/core/browser/crash_upload_list_crashpad.h" // nogncheck #include "components/crash/core/common/crash_key.h" -@@ -66,7 +66,7 @@ bool g_crash_reporter_initialized = false; +@@ -66,7 +66,7 @@ namespace electron::api::crash_reporter { namespace electron::api::crash_reporter { @@ -18,7 +18,7 @@ namespace { void NoOp() {} -@@ -133,7 +133,7 @@ void Start(const std::string& submit_url, +@@ -137,7 +137,7 @@ void Start(const std::string& submit_url, const std::map<std::string, std::string>& extra, bool is_node_process) { TRACE_EVENT0("electron", "crash_reporter::Start"); @@ -27,7 +27,7 @@ if (g_crash_reporter_initialized) return; g_crash_reporter_initialized = true; -@@ -179,7 +179,7 @@ void Start(const std::string& submit_url, +@@ -183,7 +183,7 @@ namespace { namespace { @@ -36,7 +36,7 @@ void GetUploadedReports( v8::Isolate* isolate, base::OnceCallback<void(v8::Local<v8::Value>)> callback) { -@@ -235,13 +235,13 @@ v8::Local<v8::Value> GetUploadedReports(v8::Isolate* i +@@ -239,13 +239,13 @@ void SetUploadToServer(bool upload) { #endif void SetUploadToServer(bool upload) { @@ -52,7 +52,7 @@ return false; #else return ElectronCrashReporterClient::Get()->GetCollectStatsConsent(); -@@ -250,7 +250,7 @@ bool GetUploadToServer() { +@@ -254,7 +254,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolat v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) { std::map<std::string, std::string> keys; @@ -61,7 +61,7 @@ electron::crash_keys::GetCrashKeys(&keys); #endif return gin::ConvertToV8(isolate, keys); -@@ -262,7 +262,7 @@ void Initialize(v8::Local<v8::Object> exports, +@@ -266,7 +266,7 @@ void Initialize(v8::Local<v8::Object> exports, void* priv) { gin_helper::Dictionary dict(context->GetIsolate(), exports); dict.SetMethod("start", &electron::api::crash_reporter::Start); diff --git a/devel/electron30/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc b/devel/electron30/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc index 742632761bd8..fe3e024dfaf1 100644 --- a/devel/electron30/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc +++ b/devel/electron30/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc @@ -1,9 +1,9 @@ ---- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2024-08-13 16:47:53 UTC +--- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2024-09-05 10:01:25 UTC +++ electron/shell/browser/api/electron_api_desktop_capturer.cc -@@ -45,7 +45,7 @@ - #include "ui/base/cocoa/permissions_utils.h" +@@ -46,7 +46,7 @@ namespace { #endif + namespace { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Private function in ui/base/x/x11_display_util.cc 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 6483a0cbee7b..e556e583fba6 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-07-18 11:13:59 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2024-09-05 10:01:25 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -77,7 +77,7 @@ #include "ui/wm/core/wm_state.h" @@ -18,7 +18,7 @@ class LinuxUiGetterImpl : public ui::LinuxUiGetter { public: LinuxUiGetterImpl() = default; -@@ -213,7 +213,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() +@@ -208,7 +208,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() #if BUILDFLAG(IS_POSIX) HandleSIGCHLD(); #endif @@ -27,7 +27,7 @@ DetectOzonePlatform(); ui::OzonePlatform::PreEarlyInitialization(); #endif -@@ -303,7 +303,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -298,7 +298,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 -@@ -334,7 +334,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -329,7 +329,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) -@@ -394,7 +394,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() { +@@ -389,7 +389,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>(); -@@ -500,7 +500,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -495,7 +495,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo } void ElectronBrowserMainParts::PostCreateMainMessageLoop() { @@ -63,7 +63,7 @@ std::string app_name = electron::Browser::Get()->GetName(); #endif #if BUILDFLAG(IS_LINUX) -@@ -512,7 +512,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -507,7 +507,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. -@@ -611,7 +613,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -606,7 +608,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron30/files/patch-third__party_electron__node_deps_cares_BUILD.gn b/devel/electron30/files/patch-third__party_electron__node_deps_cares_BUILD.gn index 13e57fddd2b5..bff2bfc95144 100644 --- a/devel/electron30/files/patch-third__party_electron__node_deps_cares_BUILD.gn +++ b/devel/electron30/files/patch-third__party_electron__node_deps_cares_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/electron_node/deps/cares/BUILD.gn.orig 2024-06-13 08:39:37 UTC +--- third_party/electron_node/deps/cares/BUILD.gn.orig 2024-09-11 08:22:09 UTC +++ third_party/electron_node/deps/cares/BUILD.gn -@@ -151,9 +151,14 @@ static_library("cares") { +@@ -154,9 +154,14 @@ static_library("cares") { defines += [ "HAVE_CONFIG_H" ] }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409112354.48BNseaD057384>