Date: Thu, 10 Aug 2023 14:32:21 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: 0dfd1ad1d7c2 - 2023Q3 - devel/electron25: update to 25.4.0 Message-ID: <202308101432.37AEWLbg041202@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=0dfd1ad1d7c2340b4f8fbd62c89c83aabfc62e2d commit 0dfd1ad1d7c2340b4f8fbd62c89c83aabfc62e2d Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2023-08-10 14:28:41 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2023-08-10 14:32:11 +0000 devel/electron25: update to 25.4.0 Changelog: https://github.com/electron/electron/releases/tag/v25.4.0 Reported by: GitHub (watch releases) MFH: 2023Q3 Security: f3a35fb8-2d70-47c9-a516-6aad7eb222b1 (cherry picked from commit 21e4baa1345c1327747211b4277b147842c284b8) --- devel/electron25/Makefile | 2 +- devel/electron25/Makefile.version | 2 +- devel/electron25/distinfo | 10 +++++----- ...ron_shell_browser_api_electron__api__web__contents.cc | 8 ++++---- ...tron_shell_browser_api_electron__api__web__contents.h | 4 ++-- .../files/patch-electron_spec_api-browser-window-spec.ts | 16 ++++++++-------- ...party_blink_renderer_core_exported_web__view__impl.cc | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/devel/electron25/Makefile b/devel/electron25/Makefile index 7a9d0d582ea0..75ac5210a4f7 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= 1690458722 +YARN_TIMESTAMP= 1691577929 .include "Makefile.version" .include <bsd.port.pre.mk> diff --git a/devel/electron25/Makefile.version b/devel/electron25/Makefile.version index 5d37a7b44fa8..7e1c9f4da498 100644 --- a/devel/electron25/Makefile.version +++ b/devel/electron25/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 25.3.2 +ELECTRON_VER= 25.4.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron25/distinfo b/devel/electron25/distinfo index 1984b89ca0fe..3012deeb8039 100644 --- a/devel/electron25/distinfo +++ b/devel/electron25/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1690459296 +TIMESTAMP = 1691578442 SHA256 (electron/chromium-114.0.5735.248.tar.xz) = a2401bc4dcbc53662071120bfc946408ca555be9250ec9b7bd68025303940a17 SIZE (electron/chromium-114.0.5735.248.tar.xz) = 1414185000 SHA256 (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 401097f07b4feb3e03ce7c2412e978b32aea5334f4fbaf26f873e60e8bb92647 SIZE (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 8880520 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-25.3.2.tar.xz) = cb36f72f96a1b13528df0572621aafa5f1d1d907081e61fa55453422393efc53 -SIZE (electron/electron-yarn-cache-25.3.2.tar.xz) = 41288772 -SHA256 (electron/electron-electron-v25.3.2_GH0.tar.gz) = 7f4171ba8ebcf0e9ce09c54691a57ac2e5e4fcac7699a27e99d6443a7ba0b685 -SIZE (electron/electron-electron-v25.3.2_GH0.tar.gz) = 11273260 +SHA256 (electron/electron-yarn-cache-25.4.0.tar.xz) = c848dc5ee60779725404eb666fb8717b3ddef362e6d33024da0d52dbdc3361cb +SIZE (electron/electron-yarn-cache-25.4.0.tar.xz) = 41288732 +SHA256 (electron/electron-electron-v25.4.0_GH0.tar.gz) = 88389057e368ecb38788fe72a9c56c6ba11fa557b68de4513cc5a35d77c9be97 +SIZE (electron/electron-electron-v25.4.0_GH0.tar.gz) = 11281929 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_api_electron__api__web__contents.cc b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 76db1edd511d..4da1a0b4b1bc 100644 --- a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron25/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-07-19 13:20:24 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-08-02 12:53:47 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -154,11 +154,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -32,7 +32,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2627,7 +2627,7 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2630,7 +2630,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(); -@@ -3298,7 +3298,7 @@ void WebContents::CopyImageAt(int x, int y) { +@@ -3301,7 +3301,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 -@@ -4112,7 +4112,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4115,7 +4115,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.h index 5493c88bd6b7..bbb5550092a4 100644 --- a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__web__contents.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_web_contents.h.orig 2023-07-19 13:20:24 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2023-08-02 12:53:47 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -731,7 +731,7 @@ class WebContents : public ExclusiveAccessContext, +@@ -732,7 +732,7 @@ class WebContents : public ExclusiveAccessContext, #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC) ui::ImageModel GetDevToolsWindowIcon() override; #endif diff --git a/devel/electron25/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron25/files/patch-electron_spec_api-browser-window-spec.ts index 51d38c9feeb6..1966b29d6c78 100644 --- a/devel/electron25/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron25/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2023-07-19 13:20:24 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2023-08-02 12:53:47 UTC +++ electron/spec/api-browser-window-spec.ts @@ -65,7 +65,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -90,7 +90,7 @@ expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -4229,7 +4229,7 @@ describe('BrowserWindow module', () => { +@@ -4228,7 +4228,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 }); -@@ -4500,7 +4500,7 @@ describe('BrowserWindow module', () => { +@@ -4499,7 +4499,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 = once(w, 'maximize'); w.maximize(); -@@ -4517,7 +4517,7 @@ describe('BrowserWindow module', () => { +@@ -4516,7 +4516,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 }); -@@ -4554,7 +4554,7 @@ describe('BrowserWindow module', () => { +@@ -4553,7 +4553,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 = once(w, 'minimize'); w.minimize(); -@@ -4987,7 +4987,7 @@ describe('BrowserWindow module', () => { +@@ -5007,7 +5007,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'); -@@ -5077,7 +5077,7 @@ describe('BrowserWindow module', () => { +@@ -5097,7 +5097,7 @@ describe('BrowserWindow module', () => { }); }); @@ -144,7 +144,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6183,7 +6183,7 @@ describe('BrowserWindow module', () => { +@@ -6203,7 +6203,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); diff --git a/devel/electron25/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/devel/electron25/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 780fed86fd1e..95001b9993e3 100644 --- a/devel/electron25/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/devel/electron25/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-06-07 04:52:05 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-08-09 11:06:02 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -409,7 +409,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3350,7 +3350,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3353,7 +3353,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308101432.37AEWLbg041202>