From nobody Mon Mar 6 00:25:53 2023 X-Original-To: dev-commits-ports-main@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 4PVK9s6q7xz3w9G2; Mon, 6 Mar 2023 00:25:53 +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 4PVK9s6H7wz4KHj; Mon, 6 Mar 2023 00:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062353; 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=JAKkfIGgn5E/xGT0rnlY/2EZAZSWuvIDKLVC7f0561M=; b=ONCklh0e8h0xoExPzFx4DT1xULSHjOYl6+aD9ElAbtPF/mM5P9UzUbBWkHDVZ+9hjoClju DXxNUNc6bkX/Jrq8RHakdHzf9FOkubpPqw0JPAndp/qHImgoqDS1I5lLJvRAtNwhhwbedX lpPFtIEiDNFyWmeVq70i90ZVf0i0W/wlLumZAwhcMT/0zdWP3LvWECgZNHBZw5lS9b8fNv Bi2pPnKgAub+jL6QEyfIBEEUwny5PHOLcbFW83q2Qpw5HqEJzgqPdAhiYHmCvm2SujLbdH f49lL3DsQgHK9jhixuD4Dww1EUZ6qiZ5W0Zv9AwCsXZRuqhCoCZh6A7GbphgVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062353; 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=JAKkfIGgn5E/xGT0rnlY/2EZAZSWuvIDKLVC7f0561M=; b=s1kWz32XNZpu+wCa0qS6cZtPBK69Co2d4angmHEy1M4NG375Mfox/ufNwpdoYbBzqJVNxs We1KB6NgCCOeWB20kLfa6rKqpMwrzOIF3+fJZMptKBWliH50GoKwuQp3+Io9rS00Ubr2sg O2BdKHUpv1enMeM+bTiXB8iQRfnt3rXZgeFkxWQdbN7DNx0jPpvqCjbkZNgrXCIpc/poMl 0qfG8oVgvpEAR4Ualp0JVuZZ7P5G+nTB7N2YtcIwnlH2R2TlfJWsN1xIsetIp7F3GC0Cig rf6EB0ans54/tXbR2UP5e6x24CvqLxks3LXIfDWjdmzJv5d7nTCYgjFmQQcNwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678062353; a=rsa-sha256; cv=none; b=V+JndRxrISm/ijsf9dhbxB1cn5SrPZZaID50CXJHkY99pHzRYntIwN/BESwfLJC753smuX WYmEmI0Hw82S7MIPm1T6cwVH9iqS1D3MGxMOWRnKQ41pUMWL1cZH2gS1NN0KpyCGSvoha4 xBjkrrB+vqPZxsTzaJyqlrQQ52HZv8TZKbTkMn/Eo6D9POl6Z0B70jDqe+aGFsO7kzLFoy /LT45D8/KCYmYNC16vYCsZDbnXYYRJG2lLSHa6RoR4+1c61+EYeGP4XgDCpT/yX6bFlqYi y9Bzuy5x4bvbvNxy/YSTC9xN4nSVXsMEzh5mdV3+VaDP/YIRc4DNG84zE7lKsA== 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 4PVK9s5KttzhKd; Mon, 6 Mar 2023 00:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3260PrKP032066; Mon, 6 Mar 2023 00:25:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3260PriK032065; Mon, 6 Mar 2023 00:25:53 GMT (envelope-from git) Date: Mon, 6 Mar 2023 00:25:53 GMT Message-Id: <202303060025.3260PriK032065@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 9a3b076dfaa1 - main - devel/electron22: update to 22.3.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 9a3b076dfaa14f6f32125c5df33e336951c43534 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a3b076dfaa14f6f32125c5df33e336951c43534 commit 9a3b076dfaa14f6f32125c5df33e336951c43534 Author: Hiroki Tagato AuthorDate: 2023-03-06 00:24:50 +0000 Commit: Hiroki Tagato CommitDate: 2023-03-06 00:25:45 +0000 devel/electron22: update to 22.3.2 Changelog: https://github.com/electron/electron/releases/tag/v22.3.2 --- devel/electron22/Makefile | 3 +-- devel/electron22/Makefile.version | 2 +- devel/electron22/distinfo | 10 +++++----- ..._shell_browser_api_electron__api__web__contents.cc | 4 ++-- .../patch-electron_spec_api-browser-window-spec.ts | 19 ++++++++++++++----- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/devel/electron22/Makefile b/devel/electron22/Makefile index 16126642d316..45d611dc4b18 100644 --- a/devel/electron22/Makefile +++ b/devel/electron22/Makefile @@ -1,7 +1,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v22.2.0/:chromium \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ @@ -222,7 +221,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1677373220 +YARN_TIMESTAMP= 1678001755 .include "Makefile.version" .include diff --git a/devel/electron22/Makefile.version b/devel/electron22/Makefile.version index 2bc4f5d9a3a0..1acb33dbacba 100644 --- a/devel/electron22/Makefile.version +++ b/devel/electron22/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 22.3.1 +ELECTRON_VER= 22.3.2 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron22/distinfo b/devel/electron22/distinfo index bd904d0623c2..5941bdfdd0d7 100644 --- a/devel/electron22/distinfo +++ b/devel/electron22/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1677373735 +TIMESTAMP = 1678002242 SHA256 (electron/chromium-108.0.5359.215.tar.xz) = aba0730b347269efda217affe804f6fced296aa02f810c8c9a6fd7d46cd7bf9a SIZE (electron/chromium-108.0.5359.215.tar.xz) = 1584734880 SHA256 (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 63706737ca75e0e5c97885186b2a7ab019ca71d1315ee08870193bbfa7486bfc SIZE (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 9900677 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-22.3.1.tar.xz) = 3596ed3067106923250423e0c11c7e3dea14e556019e7649f02fb318b5a8560e -SIZE (electron/electron-yarn-cache-22.3.1.tar.xz) = 38901024 -SHA256 (electron/electron-electron-v22.3.1_GH0.tar.gz) = b09349697d95fe019d0a513a705f072fa134406d0c3d7bd2a8172e178bb604c9 -SIZE (electron/electron-electron-v22.3.1_GH0.tar.gz) = 10518115 +SHA256 (electron/electron-yarn-cache-22.3.2.tar.xz) = 795decea8dce3bfe53de21315dbb35f5764a9f8a039e7f9bb4b51ae0500f2bbd +SIZE (electron/electron-yarn-cache-22.3.2.tar.xz) = 38904420 +SHA256 (electron/electron-electron-v22.3.2_GH0.tar.gz) = 525977208b1114bfba56c3b228c8aee22bad046859c7bbb339bfb9fac3b63e75 +SIZE (electron/electron-electron-v22.3.2_GH0.tar.gz) = 10519304 SHA256 (electron/nodejs-node-v16.17.1_GH0.tar.gz) = e63378aa6aa18b9e05486e46eaca6c6e09904366e5100d7e04c6dbd344a42f60 SIZE (electron/nodejs-node-v16.17.1_GH0.tar.gz) = 90485310 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron22/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index a9ae08a1d9eb..17bc44de302a 100644 --- a/devel/electron22/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron22/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-02-16 01:50:10 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-03-02 11:49:02 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -154,11 +154,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -50,7 +50,7 @@ if (owner_window()) owner_window()->Focus(true); #endif -@@ -3846,7 +3846,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -3854,7 +3854,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron22/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron22/files/patch-electron_spec_api-browser-window-spec.ts index f65db543a8a1..cd599979236d 100644 --- a/devel/electron22/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron22/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2022-08-10 15:31:37 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2023-03-02 11:49:02 UTC +++ electron/spec/api-browser-window-spec.ts @@ -58,7 +58,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -90,7 +90,16 @@ afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); -@@ -3980,7 +3980,7 @@ describe('BrowserWindow module', () => { +@@ -3981,7 +3981,7 @@ describe('BrowserWindow module', () => { + // TODO(zcbenz): + // This test does not run on Linux CI. See: + // https://github.com/electron/electron/issues/28699 +- ifit(process.platform === 'linux' && !process.env.CI)('should bring a minimized maximized window back to maximized state', async () => { ++ ifit((process.platform === 'linux' || process.platform === 'freebsd') && !process.env.CI)('should bring a minimized maximized window back to maximized state', async () => { + const w = new BrowserWindow({}); + const maximize = emittedOnce(w, 'maximize'); + w.maximize(); +@@ -3998,7 +3998,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI @@ -99,7 +108,7 @@ afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -4017,7 +4017,7 @@ describe('BrowserWindow module', () => { +@@ -4035,7 +4035,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 @@ -108,7 +117,7 @@ const w = new BrowserWindow(); const minimize = emittedOnce(w, 'minimize'); w.minimize(); -@@ -4380,7 +4380,7 @@ describe('BrowserWindow module', () => { +@@ -4398,7 +4398,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. @@ -117,7 +126,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -4472,7 +4472,7 @@ describe('BrowserWindow module', () => { +@@ -4490,7 +4490,7 @@ describe('BrowserWindow module', () => { }); });