Date: Thu, 24 Aug 2023 11:07:12 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: bcf0b54a35f7 - 2023Q3 - devel/electron24: update to 24.8.1 Message-ID: <202308241107.37OB7Cmk064381@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=bcf0b54a35f74ce67900a118c9def1921eceb228 commit bcf0b54a35f74ce67900a118c9def1921eceb228 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2023-08-24 11:02:17 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2023-08-24 11:07:03 +0000 devel/electron24: update to 24.8.1 Changelog: https://github.com/electron/electron/releases/tag/v24.8.1 Reported by: GitHub (watch releases) MFH: 2023Q3 Security: 99bc2966-55be-4411-825f-b04017a4c100 (cherry picked from commit d5100d8e8fa2d218e97d37af5c1ecfc5970391e7) --- devel/electron24/Makefile | 2 +- devel/electron24/Makefile.version | 2 +- devel/electron24/distinfo | 10 ++++---- ...electron_shell_browser_native__window__views.cc | 28 +++++++++++----------- .../patch-electron_spec_api-browser-window-spec.ts | 26 ++++++++++---------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/devel/electron24/Makefile b/devel/electron24/Makefile index 278ccb8e3df1..2904060b4ec9 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= 1692344341 +YARN_TIMESTAMP= 1692860336 .include "Makefile.version" .include <bsd.port.pre.mk> diff --git a/devel/electron24/Makefile.version b/devel/electron24/Makefile.version index 140aa2a3c258..f28cd22af959 100644 --- a/devel/electron24/Makefile.version +++ b/devel/electron24/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 24.8.0 +ELECTRON_VER= 24.8.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron24/distinfo b/devel/electron24/distinfo index 57d06c78a67b..42d9d656d138 100644 --- a/devel/electron24/distinfo +++ b/devel/electron24/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1692344800 +TIMESTAMP = 1692862383 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.8.0.tar.xz) = 643892d7c07b9e91b8fe7603957e355c8599ae8d57e2849e646df0bb1fefd974 -SIZE (electron/electron-yarn-cache-24.8.0.tar.xz) = 41635668 -SHA256 (electron/electron-electron-v24.8.0_GH0.tar.gz) = fbeedf127bd93ae6c0b5a545b64ac7c35e2640c2edd1a9ec8fdd837203e900aa -SIZE (electron/electron-electron-v24.8.0_GH0.tar.gz) = 10513046 +SHA256 (electron/electron-yarn-cache-24.8.1.tar.xz) = a23345244073df7db4e1201cc84fa494c931c15a8339637d08a1509f52775e9a +SIZE (electron/electron-yarn-cache-24.8.1.tar.xz) = 41635664 +SHA256 (electron/electron-electron-v24.8.1_GH0.tar.gz) = af1191fa76dffdb699d0b801e21610b4533da9e80ce5fa810e6651287be7e674 +SIZE (electron/electron-electron-v24.8.1_GH0.tar.gz) = 10518514 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_browser_native__window__views.cc b/devel/electron24/files/patch-electron_shell_browser_native__window__views.cc index 563ae679293b..88ac99ad95c2 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-27 15:34:12 UTC +--- electron/shell/browser/native_window_views.cc.orig 2023-08-21 11:49: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/electron24/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron24/files/patch-electron_spec_api-browser-window-spec.ts index 460400524f8d..baea4ff12b2c 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-08-02 13:09:53 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2023-08-21 11:49:54 UTC +++ electron/spec/api-browser-window-spec.ts @@ -59,7 +59,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -45,7 +45,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1258,7 +1258,7 @@ describe('BrowserWindow module', () => { +@@ -1269,7 +1269,7 @@ describe('BrowserWindow module', () => { }); }); @@ -54,7 +54,7 @@ it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = emittedOnce(w, 'maximize'); -@@ -1385,7 +1385,7 @@ describe('BrowserWindow module', () => { +@@ -1396,7 +1396,7 @@ describe('BrowserWindow module', () => { }); }); @@ -63,7 +63,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = emittedOnce(w, 'minimize'); -@@ -2351,7 +2351,7 @@ describe('BrowserWindow module', () => { +@@ -2362,7 +2362,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.setOpacity(opacity)', () => { afterEach(closeAllWindows); @@ -72,7 +72,7 @@ it('make window with initial opacity', () => { const w = new BrowserWindow({ show: false, opacity: 0.5 }); expect(w.getOpacity()).to.equal(0.5); -@@ -2377,7 +2377,7 @@ describe('BrowserWindow module', () => { +@@ -2388,7 +2388,7 @@ describe('BrowserWindow module', () => { }); }); @@ -81,7 +81,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3308,7 +3308,7 @@ describe('BrowserWindow module', () => { +@@ -3319,7 +3319,7 @@ describe('BrowserWindow module', () => { expect(test.nodeTimers).to.equal(true); expect(test.nodeUrl).to.equal(true); @@ -90,7 +90,7 @@ expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -3814,7 +3814,7 @@ describe('BrowserWindow module', () => { +@@ -3825,7 +3825,7 @@ describe('BrowserWindow module', () => { }); }); @@ -99,7 +99,7 @@ afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); -@@ -4085,7 +4085,7 @@ describe('BrowserWindow module', () => { +@@ -4096,7 +4096,7 @@ describe('BrowserWindow module', () => { // TODO(zcbenz): // This test does not run on Linux CI. See: // https://github.com/electron/electron/issues/28699 @@ -108,7 +108,7 @@ const w = new BrowserWindow({}); const maximize = emittedOnce(w, 'maximize'); w.maximize(); -@@ -4102,7 +4102,7 @@ describe('BrowserWindow module', () => { +@@ -4113,7 +4113,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI @@ -117,7 +117,7 @@ afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -4139,7 +4139,7 @@ describe('BrowserWindow module', () => { +@@ -4150,7 +4150,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 @@ -126,7 +126,7 @@ const w = new BrowserWindow(); const minimize = emittedOnce(w, 'minimize'); w.minimize(); -@@ -4593,7 +4593,7 @@ describe('BrowserWindow module', () => { +@@ -4604,7 +4604,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'); -@@ -4685,7 +4685,7 @@ describe('BrowserWindow module', () => { +@@ -4696,7 +4696,7 @@ describe('BrowserWindow module', () => { }); }); @@ -144,7 +144,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -5791,7 +5791,7 @@ describe('BrowserWindow module', () => { +@@ -5802,7 +5802,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?202308241107.37OB7Cmk064381>