From nobody Thu Aug 24 23:04:22 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RWzDQ4dnwz4rhd7; Thu, 24 Aug 2023 23:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWzDQ4C1Qz3gpL; Thu, 24 Aug 2023 23:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692918262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N/JzTi7VO+Q223hk8NnVSrmRTCY0OCnTPU05Ax/v3lQ=; b=B6s75fc3gfwlfE96RKhquxQAv5TkwrTv/mGW7NaeYVztf6LP+vq0rHW7e8W8huIoNAsEAc T1Q6jfK1qIqqPlVlzv1nKBOgU950ZVQz1qk7y/IaLVINzrG9PpeL7cgvxJhzxflLkEERBc R2fZabq+Sh8oixb7Jr2GG1/YmcOTwNMLIXlGd5Mtew2KcDSaNpdyQz7XBpZmz4AI2kxDi8 bJg7nRBT8ixvt/FOR3u6ZhTomcE7M0a1j7KsdNnoWZgcDfv3G6l6Vl/QoYbxmqxNoVysBj icQLQ7lNRaJgOgl54GzqY/cmxpKtfadnwl1ajH7A8KivZo4AL2SY2XyGMmiwPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692918262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N/JzTi7VO+Q223hk8NnVSrmRTCY0OCnTPU05Ax/v3lQ=; b=fcrdD1MFqwz/xvEdoFnf8B6n6oM15/NXJG/N4M4cEYUTTDof/wtRMnaOUG4S+c2TZpXctC E6Ok92KAc5gCZvbAu+6a94ftUcBVa5635RLtfPpt0H/GnWkYRYhS59o93LNl93rKxjNtZb xheYlHl50la96ACd3QjtBz7ldQqQH8BeB3vDu8vun9GaBMIC9pv4wy65YqnU6cZdcaMWJC 1Ao71PJ3pVawNfGiWk9NTiP5LhEIE5DqlAPlv5N9Jd2FJCEs+r2R4t/Bn3N+1uj1BipjPi MkLhabhPCDxbNMlY+WFK+87FppXdgP1nw7uL7Lm7GwTulPARXXlPJSYmqtxFJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692918262; a=rsa-sha256; cv=none; b=WBOU5yU7fYq8FYz5Rdbioza2QY45UuyeWIZKgtE0ihQgLfts37JxTtlHpDve7f9GLgVUXb KUj6CKoVAGGsojGPCDEeRw9n0xlcft6/abFzYIsS5ADQ3fVYIQD7eXVoPn6L0rON17UzNo 8GENcWqSxYwa5GWGZ/0FCdCDnBWu6jiP+ulPglN0SYtQ5mnyhWYDsHtis27OfQlLoEruQK 92VHdS7O43pdzN68CX7z3Um28xvNO8+bJsWtvAuXWWfwmXFrCiO3NXbJUlO8oPJKHQiaB7 0gGcWPsEh2Y1Ykxl8nvSMVxMwTv30EvOzh8u3Buxm24qVB3XNAVwg6I/wkkvpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWzDQ38T0zm3S; Thu, 24 Aug 2023 23:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ON4MiU058599; Thu, 24 Aug 2023 23:04:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ON4MWR058596; Thu, 24 Aug 2023 23:04:22 GMT (envelope-from git) Date: Thu, 24 Aug 2023 23:04:22 GMT Message-Id: <202308242304.37ON4MWR058596@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Hiroki Tagato Subject: git: 9b35d93cd6f2 - 2023Q3 - devel/electron25: update to 25.6.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 9b35d93cd6f21b4b9fb42fbad0a8463081a1490e Auto-Submitted: auto-generated The branch 2023Q3 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b35d93cd6f21b4b9fb42fbad0a8463081a1490e commit 9b35d93cd6f21b4b9fb42fbad0a8463081a1490e Author: Hiroki Tagato AuthorDate: 2023-08-19 01:41:41 +0000 Commit: Hiroki Tagato CommitDate: 2023-08-24 23:04:11 +0000 devel/electron25: update to 25.6.0 Changelog: https://github.com/electron/electron/releases/tag/v25.6.0 Reported by: GitHub (watch releases) (cherry picked from commit c0621e2d45405147644d85b7f5fae3ad672bb981) --- devel/electron25/Makefile | 2 +- devel/electron25/Makefile.version | 2 +- devel/electron25/distinfo | 10 ++++----- .../files/patch-electron_shell_app_node__main.cc | 10 ++++----- ...hell_browser_api_electron__api__web__contents.h | 4 ++-- .../patch-electron_shell_common_node__bindings.cc | 4 ++-- .../patch-electron_spec_api-browser-window-spec.ts | 26 +++++++++++----------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/devel/electron25/Makefile b/devel/electron25/Makefile index 4579b9a56308..c15462af52f2 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= 1691826400 +YARN_TIMESTAMP= 1692355328 .include "Makefile.version" .include diff --git a/devel/electron25/Makefile.version b/devel/electron25/Makefile.version index 734507927776..4cb6e98ae0b7 100644 --- a/devel/electron25/Makefile.version +++ b/devel/electron25/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 25.5.0 +ELECTRON_VER= 25.6.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron25/distinfo b/devel/electron25/distinfo index 2b3b85e83d62..9697c3fafab7 100644 --- a/devel/electron25/distinfo +++ b/devel/electron25/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1691826692 +TIMESTAMP = 1692355964 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.5.0.tar.xz) = 43881af099a4ca816a3a631de053d83562ba486b5eefebbfc24ce1272b5d99c4 -SIZE (electron/electron-yarn-cache-25.5.0.tar.xz) = 41288764 -SHA256 (electron/electron-electron-v25.5.0_GH0.tar.gz) = db5c9fa62c9bf817e8cd5324580f3b6fa3ef492712979ef168ab4b4485650d3f -SIZE (electron/electron-electron-v25.5.0_GH0.tar.gz) = 11282712 +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/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_app_node__main.cc b/devel/electron25/files/patch-electron_shell_app_node__main.cc index fc071ff0c76f..e6f29015f44b 100644 --- a/devel/electron25/files/patch-electron_shell_app_node__main.cc +++ b/devel/electron25/files/patch-electron_shell_app_node__main.cc @@ -1,4 +1,4 @@ ---- electron/shell/app/node_main.cc.orig 2023-06-14 06:17:49 UTC +--- electron/shell/app/node_main.cc.orig 2023-08-16 14:00:49 UTC +++ electron/shell/app/node_main.cc @@ -42,7 +42,7 @@ #include "content/public/common/content_descriptors.h" @@ -9,8 +9,8 @@ #include "components/crash/core/app/crashpad.h" // nogncheck #include "shell/app/electron_crash_reporter_client.h" #include "shell/common/crash_keys.h" -@@ -98,7 +98,7 @@ int SetNodeCliFlags() { - node::kDisallowedInEnvironment); +@@ -76,7 +76,7 @@ void ExitIfContainsDisallowedFlags(const std::vector GetParameters(v8::Isolate* isolate) { std::map keys; @@ -27,7 +27,7 @@ electron::crash_keys::GetCrashKeys(&keys); #endif return gin::ConvertToV8(isolate, keys); -@@ -243,7 +243,7 @@ int NodeMain(int argc, char* argv[]) { +@@ -223,7 +223,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/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 bbb5550092a4..9fa942961441 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-08-02 12:53:47 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2023-08-16 14:00:49 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -732,7 +732,7 @@ class WebContents : public ExclusiveAccessContext, +@@ -733,7 +733,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_shell_common_node__bindings.cc b/devel/electron25/files/patch-electron_shell_common_node__bindings.cc index 0c862512559a..a1b9372970bd 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-06-14 06:17:49 UTC +--- electron/shell/common/node_bindings.cc.orig 2023-08-16 14:00:49 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 -@@ -433,7 +433,7 @@ void NodeBindings::Initialize(v8::Local c +@@ -432,7 +432,7 @@ void NodeBindings::Initialize(v8::Local 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-browser-window-spec.ts b/devel/electron25/files/patch-electron_spec_api-browser-window-spec.ts index 1966b29d6c78..26f5030f3d95 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-08-02 12:53:47 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2023-08-16 14:00:49 UTC +++ electron/spec/api-browser-window-spec.ts @@ -65,7 +65,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 }); -@@ -1622,7 +1622,7 @@ describe('BrowserWindow module', () => { +@@ -1633,7 +1633,7 @@ describe('BrowserWindow module', () => { }); }); @@ -54,7 +54,7 @@ it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = once(w, 'maximize'); -@@ -1802,7 +1802,7 @@ describe('BrowserWindow module', () => { +@@ -1813,7 +1813,7 @@ describe('BrowserWindow module', () => { }); }); @@ -63,7 +63,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -2768,7 +2768,7 @@ describe('BrowserWindow module', () => { +@@ -2779,7 +2779,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); -@@ -2794,7 +2794,7 @@ describe('BrowserWindow module', () => { +@@ -2805,7 +2805,7 @@ describe('BrowserWindow module', () => { }); }); @@ -81,7 +81,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3723,7 +3723,7 @@ describe('BrowserWindow module', () => { +@@ -3734,7 +3734,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 { -@@ -4228,7 +4228,7 @@ describe('BrowserWindow module', () => { +@@ -4239,7 +4239,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 }); -@@ -4499,7 +4499,7 @@ describe('BrowserWindow module', () => { +@@ -4510,7 +4510,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(); -@@ -4516,7 +4516,7 @@ describe('BrowserWindow module', () => { +@@ -4527,7 +4527,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 }); -@@ -4553,7 +4553,7 @@ describe('BrowserWindow module', () => { +@@ -4564,7 +4564,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(); -@@ -5007,7 +5007,7 @@ describe('BrowserWindow module', () => { +@@ -5018,7 +5018,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'); -@@ -5097,7 +5097,7 @@ describe('BrowserWindow module', () => { +@@ -5108,7 +5108,7 @@ describe('BrowserWindow module', () => { }); }); @@ -144,7 +144,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6203,7 +6203,7 @@ describe('BrowserWindow module', () => { +@@ -6214,7 +6214,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows);