Date: Thu, 24 Aug 2023 23:04:23 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: c4289c1ddb12 - 2023Q3 - devel/electron25: update to 25.7.0 Message-ID: <202308242304.37ON4NQD058635@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=c4289c1ddb1279e50bc711c35d0ccc0d379a5017 commit c4289c1ddb1279e50bc711c35d0ccc0d379a5017 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2023-08-24 23:00:28 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2023-08-24 23:04:12 +0000 devel/electron25: update to 25.7.0 Changelog: https://github.com/electron/electron/releases/tag/v25.7.0 Reported by: GitHub (watch releases) MFH: 2023Q3 Security: 5999fc39-72d0-4b99-851c-ade7ff7125c3 (cherry picked from commit fc05ffb11108c689dcd82f336f81c5a964c87221) --- devel/electron25/Makefile | 2 +- devel/electron25/Makefile.version | 2 +- devel/electron25/distinfo | 10 ++++---- ...electron_shell_browser_native__window__views.cc | 28 +++++++++++----------- .../patch-electron_shell_common_node__bindings.cc | 4 ++-- ...patch-electron_spec_api-utility-process-spec.ts | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/devel/electron25/Makefile b/devel/electron25/Makefile index c15462af52f2..3aaa62017d8c 100644 --- a/devel/electron25/Makefile +++ b/devel/electron25/Makefile @@ -223,7 +223,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1692355328 +YARN_TIMESTAMP= 1692875487 .include "Makefile.version" .include <bsd.port.pre.mk> diff --git a/devel/electron25/Makefile.version b/devel/electron25/Makefile.version index 4cb6e98ae0b7..6e02c1726ca4 100644 --- a/devel/electron25/Makefile.version +++ b/devel/electron25/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 25.6.0 +ELECTRON_VER= 25.7.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron25/distinfo b/devel/electron25/distinfo index 9697c3fafab7..d29bab5823df 100644 --- a/devel/electron25/distinfo +++ b/devel/electron25/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1692355964 +TIMESTAMP = 1692875668 SHA256 (electron/chromium-114.0.5735.289.tar.xz) = 12dee4e585dab6e7dc2117f4ee40484a947ac7a6b5a33c87dfae7cbf8b8799b0 SIZE (electron/chromium-114.0.5735.289.tar.xz) = 1413670648 SHA256 (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 401097f07b4feb3e03ce7c2412e978b32aea5334f4fbaf26f873e60e8bb92647 SIZE (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 8880520 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-25.6.0.tar.xz) = a6b161415d95605b3511b6fcc6906eb1cfb9efe7f115c6ddfda7702763f72e82 -SIZE (electron/electron-yarn-cache-25.6.0.tar.xz) = 41288764 -SHA256 (electron/electron-electron-v25.6.0_GH0.tar.gz) = cc1a9bacef4b397ef408333ef51632327e6a092c1887df45e3a5dcb6843a072e -SIZE (electron/electron-electron-v25.6.0_GH0.tar.gz) = 11283151 +SHA256 (electron/electron-yarn-cache-25.7.0.tar.xz) = b770dbca14131c47a392e0c41af0f190d9eca447b1674829ddb0b0b07ea98b0b +SIZE (electron/electron-yarn-cache-25.7.0.tar.xz) = 41289416 +SHA256 (electron/electron-electron-v25.7.0_GH0.tar.gz) = 76956fbeb6ecaac18e9baa1cf8b09c4382e7265e68a349bdeadea072d4fdfaaa +SIZE (electron/electron-electron-v25.7.0_GH0.tar.gz) = 11301990 SHA256 (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 33c4b5b77c98398a3c0d99a146f602d164e014ff3a5713697beef1a971faf573 SIZE (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 111925667 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron25/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron25/files/patch-electron_shell_browser_native__window__views.cc index 3d60b14c9935..4b9646d2a0ff 100644 --- a/devel/electron25/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron25/files/patch-electron_shell_browser_native__window__views.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.cc.orig 2023-07-19 13:20:24 UTC +--- electron/shell/browser/native_window_views.cc.orig 2023-08-22 15:28:54 UTC +++ electron/shell/browser/native_window_views.cc @@ -43,7 +43,7 @@ #include "ui/wm/core/shadow_types.h" @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "shell/browser/browser.h" #include "shell/browser/linux/unity_service.h" -@@ -277,7 +277,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -281,7 +281,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: params.parent = parent->GetNativeWindow(); params.native_widget = new ElectronDesktopNativeWidgetAura(this); @@ -18,7 +18,7 @@ std::string name = Browser::Get()->GetName(); // Set WM_WINDOW_ROLE. params.wm_role_name = "browser-window"; -@@ -302,7 +302,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -306,7 +306,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: std::string window_type; options.Get(options::kType, &window_type); @@ -27,7 +27,7 @@ // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set. bool use_dark_theme = false; if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) { -@@ -404,7 +404,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -408,7 +408,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: if (window) window->AddPreTargetHandler(this); @@ -36,7 +36,7 @@ // On linux after the widget is initialized we might have to force set the // bounds if the bounds are smaller than the current display SetBounds(gfx::Rect(GetPosition(), bounds.size()), false); -@@ -564,7 +564,7 @@ bool NativeWindowViews::IsVisible() { +@@ -568,7 +568,7 @@ bool NativeWindowViews::IsVisible() { bool NativeWindowViews::IsEnabled() { #if BUILDFLAG(IS_WIN) return ::IsWindowEnabled(GetAcceleratedWidget()); @@ -45,7 +45,7 @@ #if defined(USE_OZONE_PLATFORM_X11) if (IsX11()) return !event_disabler_.get(); -@@ -622,7 +622,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable +@@ -626,7 +626,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable #endif } @@ -54,7 +54,7 @@ void NativeWindowViews::Maximize() { if (IsVisible()) { widget()->Maximize(); -@@ -753,7 +753,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -757,7 +757,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_) { -@@ -989,7 +989,7 @@ bool NativeWindowViews::IsClosable() { +@@ -993,7 +993,7 @@ bool NativeWindowViews::IsClosable() { return false; } return !(info.fState & MFS_DISABLED); @@ -72,7 +72,7 @@ return true; #endif } -@@ -1377,7 +1377,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1381,7 +1381,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); } -@@ -1453,7 +1453,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1457,7 +1457,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 = -@@ -1551,7 +1551,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1555,7 +1555,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()); -@@ -1621,7 +1621,7 @@ bool NativeWindowViews::CanMaximize() const { +@@ -1625,7 +1625,7 @@ bool NativeWindowViews::CanMaximize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -108,7 +108,7 @@ return true; #endif } -@@ -1673,7 +1673,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1677,7 +1677,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) -@@ -1692,7 +1692,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1696,7 +1696,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron25/files/patch-electron_shell_common_node__bindings.cc b/devel/electron25/files/patch-electron_shell_common_node__bindings.cc index a1b9372970bd..4bdce21b4485 100644 --- a/devel/electron25/files/patch-electron_shell_common_node__bindings.cc +++ b/devel/electron25/files/patch-electron_shell_common_node__bindings.cc @@ -1,4 +1,4 @@ ---- electron/shell/common/node_bindings.cc.orig 2023-08-16 14:00:49 UTC +--- electron/shell/common/node_bindings.cc.orig 2023-08-22 15:28:54 UTC +++ electron/shell/common/node_bindings.cc @@ -38,7 +38,7 @@ #include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h" // nogncheck @@ -18,7 +18,7 @@ electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message); electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location); #endif -@@ -432,7 +432,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c +@@ -436,7 +436,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c TRACE_EVENT0("electron", "NodeBindings::Initialize"); // Open node's error reporting system for browser process. diff --git a/devel/electron25/files/patch-electron_spec_api-utility-process-spec.ts b/devel/electron25/files/patch-electron_spec_api-utility-process-spec.ts index 7ea72eb9ba1a..a0dbe2b3e92a 100644 --- a/devel/electron25/files/patch-electron_spec_api-utility-process-spec.ts +++ b/devel/electron25/files/patch-electron_spec_api-utility-process-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-utility-process-spec.ts.orig 2023-05-31 14:28:29 UTC +--- electron/spec/api-utility-process-spec.ts.orig 2023-08-22 15:28:54 UTC +++ electron/spec/api-utility-process-spec.ts -@@ -308,7 +308,7 @@ describe('utilityProcess module', () => { +@@ -332,7 +332,7 @@ describe('utilityProcess module', () => { await closeWindow(w); });
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308242304.37ON4NQD058635>