Date: Wed, 21 Jun 2023 06:14:50 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: f374f6630fdb - main - devel/electron24: update to 24.5.1 Message-ID: <202306210614.35L6EoHn015154@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=f374f6630fdba7fae6d4e9309b77116bcf21091b commit f374f6630fdba7fae6d4e9309b77116bcf21091b Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2023-06-21 06:13:06 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2023-06-21 06:14:40 +0000 devel/electron24: update to 24.5.1 Changelog: https://github.com/electron/electron/releases/tag/v24.5.1 Reported by: GitHub (watch releases) Security: aae2ab45-2d21-4cd5-a53b-07ec933400ac --- devel/electron24/Makefile | 2 +- devel/electron24/Makefile.version | 2 +- devel/electron24/distinfo | 10 +++++----- .../files/patch-electron_shell_app_node__main.cc | 8 ++++---- ...n_shell_browser_api_electron__api__web__contents.cc | 12 ++++++------ ...tch-electron_shell_browser_native__window__views.cc | 18 +++++++++--------- .../patch-electron_shell_common_node__bindings.cc | 8 ++++---- .../patch-electron_spec_api-browser-window-spec.ts | 8 ++++---- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/devel/electron24/Makefile b/devel/electron24/Makefile index 617c9266e945..b3282348d614 100644 --- a/devel/electron24/Makefile +++ b/devel/electron24/Makefile @@ -221,7 +221,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1686553181 +YARN_TIMESTAMP= 1687171959 .include "Makefile.version" .include <bsd.port.pre.mk> diff --git a/devel/electron24/Makefile.version b/devel/electron24/Makefile.version index 6441be6f3903..64d246b5d7ff 100644 --- a/devel/electron24/Makefile.version +++ b/devel/electron24/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 24.5.0 +ELECTRON_VER= 24.5.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron24/distinfo b/devel/electron24/distinfo index 173852842d79..086db438f948 100644 --- a/devel/electron24/distinfo +++ b/devel/electron24/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1686553577 +TIMESTAMP = 1687172641 SHA256 (electron/chromium-112.0.5615.204.tar.xz) = 4eb23f689df9685fc4ce38fe751023ac98aab2ca21af1ee7ebe47fa5c095a09d SIZE (electron/chromium-112.0.5615.204.tar.xz) = 1572906744 SHA256 (electron/a98dcca3c46a718770b2cb3430785ea4ed7e3f09) = 386332ab89cbe19c427a3febcf2e93ee89a3007243da3e3e466823f50d00eba5 SIZE (electron/a98dcca3c46a718770b2cb3430785ea4ed7e3f09) = 9822544 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-24.5.0.tar.xz) = 46ca5fb1e3137188f209594b93c64777b09a55f3c73356910b09939632eeb761 -SIZE (electron/electron-yarn-cache-24.5.0.tar.xz) = 41636604 -SHA256 (electron/electron-electron-v24.5.0_GH0.tar.gz) = 4345fbe99ef1631aa70889628a7d4f114c0058b62e853760e5892a2fd8e0f0fb -SIZE (electron/electron-electron-v24.5.0_GH0.tar.gz) = 10467160 +SHA256 (electron/electron-yarn-cache-24.5.1.tar.xz) = 3226c6f11d9ba07f2cfec4fbc8be627b4315360f4b87325105b901bcf61e88b5 +SIZE (electron/electron-yarn-cache-24.5.1.tar.xz) = 41637208 +SHA256 (electron/electron-electron-v24.5.1_GH0.tar.gz) = c88cf942ea69ed3b2d1f2c99066bb9dc5f65974375ba1df5c6486241e30de7d6 +SIZE (electron/electron-electron-v24.5.1_GH0.tar.gz) = 10483935 SHA256 (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 31bbccdff73269baebcc9f32c2ffe428f28be79841527c63e95da93e8c630829 SIZE (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 113058999 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron24/files/patch-electron_shell_app_node__main.cc b/devel/electron24/files/patch-electron_shell_app_node__main.cc index 63e99de3f649..44a2a7a1d972 100644 --- a/devel/electron24/files/patch-electron_shell_app_node__main.cc +++ b/devel/electron24/files/patch-electron_shell_app_node__main.cc @@ -1,4 +1,4 @@ ---- electron/shell/app/node_main.cc.orig 2023-04-03 22:25:21 UTC +--- electron/shell/app/node_main.cc.orig 2023-06-13 21:28:30 UTC +++ electron/shell/app/node_main.cc @@ -42,7 +42,7 @@ #include "content/public/common/content_descriptors.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" -@@ -94,7 +94,7 @@ int SetNodeCliFlags() { +@@ -98,7 +98,7 @@ int SetNodeCliFlags() { node::kDisallowedInEnvironment); } @@ -18,7 +18,7 @@ void SetCrashKeyStub(const std::string& key, const std::string& value) {} void ClearCrashKeyStub(const std::string& key) {} #endif -@@ -105,7 +105,7 @@ namespace electron { +@@ -109,7 +109,7 @@ namespace electron { v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) { std::map<std::string, std::string> keys; @@ -27,7 +27,7 @@ electron::crash_keys::GetCrashKeys(&keys); #endif return gin::ConvertToV8(isolate, keys); -@@ -239,7 +239,7 @@ int NodeMain(int argc, char* argv[]) { +@@ -243,7 +243,7 @@ int NodeMain(int argc, char* argv[]) { // Setup process.crashReporter in child node processes gin_helper::Dictionary reporter = gin::Dictionary::CreateEmpty(isolate); reporter.SetMethod("getParameters", &GetParameters); diff --git a/devel/electron24/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron24/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 69d4d7618f79..f7fc2653ca79 100644 --- a/devel/electron24/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron24/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-05-22 19:19:22 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-06-13 21:28:30 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -151,11 +151,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -14,7 +14,7 @@ #include "ui/gfx/font_render_params.h" #endif -@@ -516,7 +516,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval +@@ -517,7 +517,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval ui::TextInsertionCaretBlinkPeriodFromDefaults()); if (system_value) return *system_value; @@ -23,7 +23,7 @@ if (auto* linux_ui = ui::LinuxUi::instance()) return linux_ui->GetCursorBlinkInterval(); #elif BUILDFLAG(IS_WIN) -@@ -970,7 +970,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -971,7 +971,7 @@ void WebContents::InitWithSessionAndOptions( accept_languages.pop_back(); prefs->accept_languages = accept_languages; @@ -32,7 +32,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2510,7 +2510,7 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2511,7 +2511,7 @@ void WebContents::ForcefullyCrashRenderer() { content::RenderProcessHost* rph = rwh->GetProcess(); if (rph) { @@ -41,7 +41,7 @@ // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. // Instead we send an explicit IPC to crash on the renderer's IO thread. rph->ForceCrash(); -@@ -3153,7 +3153,7 @@ void WebContents::CopyImageAt(int x, int y) { +@@ -3154,7 +3154,7 @@ void WebContents::CopyImageAt(int x, int y) { void WebContents::Focus() { // Focusing on WebContents does not automatically focus the window on macOS // and Linux, do it manually to match the behavior on Windows. @@ -50,7 +50,7 @@ if (owner_window()) owner_window()->Focus(true); #endif -@@ -3959,7 +3959,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -3960,7 +3960,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron24/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron24/files/patch-electron_shell_browser_native__window__views.cc index 3624e721f353..fa42cbf9374d 100644 --- a/devel/electron24/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron24/files/patch-electron_shell_browser_native__window__views.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2023-06-07 21:26:15 UTC +--- electron/shell/browser/native_window_views.cc.orig 2023-06-13 21:28:30 UTC +++ electron/shell/browser/native_window_views.cc @@ -42,7 +42,7 @@ #include "ui/wm/core/shadow_types.h" @@ -54,7 +54,7 @@ void NativeWindowViews::Maximize() { if (IsVisible()) { widget()->Maximize(); -@@ -748,7 +748,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -752,7 +752,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou } #endif @@ -63,7 +63,7 @@ // On Linux and Windows the minimum and maximum size should be updated with // window size when window is not resizable. if (!resizable_) { -@@ -984,7 +984,7 @@ bool NativeWindowViews::IsClosable() { +@@ -988,7 +988,7 @@ bool NativeWindowViews::IsClosable() { return false; } return !(info.fState & MFS_DISABLED); @@ -72,7 +72,7 @@ return true; #endif } -@@ -1372,7 +1372,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1376,7 +1376,7 @@ void NativeWindowViews::SetProgressBar(double progress NativeWindow::ProgressState state) { #if BUILDFLAG(IS_WIN) taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state); @@ -81,7 +81,7 @@ if (unity::IsRunning()) { unity::SetProgressFraction(progress); } -@@ -1449,7 +1449,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1453,7 +1453,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM #if BUILDFLAG(IS_WIN) window_handle = reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget); @@ -90,7 +90,7 @@ window_handle = static_cast<uint32_t>(accelerated_widget); #endif aura::WindowTreeHost* const host = -@@ -1547,7 +1547,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1551,7 +1551,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC SendMessage(hwnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(app_icon_.get())); } @@ -99,7 +99,7 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget( GetAcceleratedWidget()); -@@ -1617,7 +1617,7 @@ bool NativeWindowViews::CanMaximize() const { +@@ -1621,7 +1621,7 @@ bool NativeWindowViews::CanMaximize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -108,7 +108,7 @@ return true; #endif } -@@ -1669,7 +1669,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1673,7 +1673,7 @@ void NativeWindowViews::HandleKeyboardEvent( if (widget_destroyed_) return; @@ -117,7 +117,7 @@ if (event.windows_key_code == ui::VKEY_BROWSER_BACK) NotifyWindowExecuteAppCommand(kBrowserBackward); else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD) -@@ -1688,7 +1688,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1692,7 +1692,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron24/files/patch-electron_shell_common_node__bindings.cc b/devel/electron24/files/patch-electron_shell_common_node__bindings.cc index 861d413fa164..91ec596c5ccb 100644 --- a/devel/electron24/files/patch-electron_shell_common_node__bindings.cc +++ b/devel/electron24/files/patch-electron_shell_common_node__bindings.cc @@ -1,6 +1,6 @@ ---- electron/shell/common/node_bindings.cc.orig 2023-06-07 21:26:15 UTC +--- electron/shell/common/node_bindings.cc.orig 2023-06-13 21:28:30 UTC +++ electron/shell/common/node_bindings.cc -@@ -38,7 +38,7 @@ +@@ -37,7 +37,7 @@ #include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h" // nogncheck #include "third_party/electron_node/src/debug_utils.h" @@ -9,7 +9,7 @@ #include "shell/common/crash_keys.h" #endif -@@ -156,7 +156,7 @@ bool g_is_initialized = false; +@@ -155,7 +155,7 @@ bool g_is_initialized = false; void V8FatalErrorCallback(const char* location, const char* message) { LOG(ERROR) << "Fatal error in V8: " << location << " " << message; @@ -18,7 +18,7 @@ electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message); electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location); #endif -@@ -431,7 +431,7 @@ void NodeBindings::Initialize() { +@@ -433,7 +433,7 @@ void NodeBindings::Initialize() { TRACE_EVENT0("electron", "NodeBindings::Initialize"); // Open node's error reporting system for browser process. diff --git a/devel/electron24/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron24/files/patch-electron_spec_api-browser-window-spec.ts index 12597fb8148b..46733a426d0d 100644 --- a/devel/electron24/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron24/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2023-05-31 15:28:22 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2023-06-13 21:28:30 UTC +++ electron/spec/api-browser-window-spec.ts @@ -59,7 +59,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -126,7 +126,7 @@ const w = new BrowserWindow(); const minimize = emittedOnce(w, 'minimize'); w.minimize(); -@@ -4554,7 +4554,7 @@ describe('BrowserWindow module', () => { +@@ -4569,7 +4569,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. @@ -135,7 +135,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -4646,7 +4646,7 @@ describe('BrowserWindow module', () => { +@@ -4661,7 +4661,7 @@ describe('BrowserWindow module', () => { }); }); @@ -144,7 +144,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -5710,7 +5710,7 @@ describe('BrowserWindow module', () => { +@@ -5767,7 +5767,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306210614.35L6EoHn015154>