From nobody Mon Oct 23 09:02:49 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 4SDTjj6RHrz4xnh3; Mon, 23 Oct 2023 09:02:49 +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 4SDTjj5d4gz3CwW; Mon, 23 Oct 2023 09:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698051769; 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=okY+BBd96bHlEZjbyTRkAB7JHer8fMVUlksO0kuqnlI=; b=Sd5Q5Om2Juxc6BHpi02uBYQ35eA3exPy5v4GLm49Qpj6B9Jsde/ahxJDSy/LZCtz7bROrl TcKj90laDLMSkrpXke1Sz5CZCb7smluIjJFaRWywkMmSWS/17KxK/FeyS48I3mbzw2A709 Mw4b0FknfbiETJyB/ZYfF/4KUzcnekxaS50I+hKnc/vApUZAiBhtCQ1m2YT8A4SPBxrrdM GbUmVvEmo67Ge1Kq2ai/9UbhMlEoO6I6/z9K9rksmqoWtxMRX74SNfljoB6F0PHAvKNTk4 /ZcIzvZ31Ky/+1uKtuFtuiX0blZYfU/rxXwOhTWvqCrLIihaOZ4nceRuJYLIAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698051769; a=rsa-sha256; cv=none; b=ERf/YCz70P5v9ypzS4uUaufCIyr2GN9y4aos8uKMxRxos10SbqWVKsIvdYxl0H3/DPyLXP DCpMG8VXHKnfXOlZSCKWv6hyfV77H7RLZidm74qEKSGtnP/kE0gs8PG7jbtEIVHOxDQ0dI b+WC35a18feyU+wb/if9jcJYoOo4SwSDecPWo5i56FBIlufVa/UKAtZ4LrFdCMEsBwhBk3 sW7W8IyNZdD7KWVvYOUB95S8HCGeABMVUEl4ryDsWkOREH9q0v9GXrjsf/MlAmJ8pb7XEl gce7spTN6ZPWyOuqLdTdiLzfaAUl6bVd5yO7YienWpEVJXQf2ED8gojn8B1xyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698051769; 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=okY+BBd96bHlEZjbyTRkAB7JHer8fMVUlksO0kuqnlI=; b=vxbvf8s+ArMA4Gy9JVlF1V20k/stK2NNahP4YtN7p9NDITbMb16Iq55lKz1Y9Oq8DQhRVR KwWBp0aaFPvnit2urrXQNobBlcwQxSzfMlSVZTu5PwUclAt3LY0s1ZyOygvZnc9GK8iTuv OLUn54zwm14AqlME59qzzB1qW4E+LwwbBxQQfGDhgOofbQoFeyx9ZKjWatwbEscOJ50Dhh UlKlw1a69gRso/ynprjhEpQ5/Cd0wgD/+aO4jwa5Suw3c/9nCBWknwcGaVGV/QPbBezbFY QNNBMu2J2exlsyGgbqInSREmMmNOBU4X/svQKRbZucBF9oCbKx8dAGsbYvKsLw== 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 4SDTjj4jXmzZJN; Mon, 23 Oct 2023 09:02:49 +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 39N92njB030023; Mon, 23 Oct 2023 09:02:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39N92n50030020; Mon, 23 Oct 2023 09:02:49 GMT (envelope-from git) Date: Mon, 23 Oct 2023 09:02:49 GMT Message-Id: <202310230902.39N92n50030020@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: 272042874f2e - main - devel/electron26: update to 26.4.1 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: 272042874f2e478be2817fd397f12f9642fee1b4 Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=272042874f2e478be2817fd397f12f9642fee1b4 commit 272042874f2e478be2817fd397f12f9642fee1b4 Author: Hiroki Tagato AuthorDate: 2023-10-23 09:00:44 +0000 Commit: Hiroki Tagato CommitDate: 2023-10-23 09:02:43 +0000 devel/electron26: update to 26.4.1 Changelog: https://github.com/electron/electron/releases/tag/v26.4.1 Reported by: GitHub (watch releases) Security: 9000591b-483b-45ac-9c87-b3df3a4198ec --- devel/electron26/Makefile | 2 +- devel/electron26/Makefile.version | 2 +- devel/electron26/distinfo | 10 +++++----- ...ell_browser_api_electron__api__web__contents.cc | 12 ++++++------ .../patch-electron_spec_api-browser-window-spec.ts | 22 +++++++++++----------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/devel/electron26/Makefile b/devel/electron26/Makefile index dfa707de8cc6..5598f2f2feb2 100644 --- a/devel/electron26/Makefile +++ b/devel/electron26/Makefile @@ -232,7 +232,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1697110471 +YARN_TIMESTAMP= 1697930106 .include "Makefile.version" .include diff --git a/devel/electron26/Makefile.version b/devel/electron26/Makefile.version index 1d20a88f54d3..a1c0e939b6dc 100644 --- a/devel/electron26/Makefile.version +++ b/devel/electron26/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 26.4.0 +ELECTRON_VER= 26.4.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron26/distinfo b/devel/electron26/distinfo index b8a72ff77455..049458c31e7f 100644 --- a/devel/electron26/distinfo +++ b/devel/electron26/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1697110703 +TIMESTAMP = 1697930998 SHA256 (electron/chromium-116.0.5845.228.tar.xz) = ccf3d7f2e17fd2fcda6ebaef576787b2aaba7a6b2b4e3103b92260ac26fbc6a1 SIZE (electron/chromium-116.0.5845.228.tar.xz) = 1447024772 SHA256 (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = f7f7f38661b107fc1d91b7918f36362d9180e87f34e3027562eb5db8735746fe SIZE (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = 8881070 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-26.4.0.tar.xz) = bc4c0e84f5f39f697188859e2198a525cb0b6c479cb55f15d27f750db1ec1e62 -SIZE (electron/electron-yarn-cache-26.4.0.tar.xz) = 32344624 -SHA256 (electron/electron-electron-v26.4.0_GH0.tar.gz) = bd20bc399031e733713bcb1a42496a1db8c4f91f73eb95eb911882899959362e -SIZE (electron/electron-electron-v26.4.0_GH0.tar.gz) = 11317347 +SHA256 (electron/electron-yarn-cache-26.4.1.tar.xz) = 8a7c7390a7fe4be6bda76f1058717d12e06ddaa736528b9d96589bdde7e3d016 +SIZE (electron/electron-yarn-cache-26.4.1.tar.xz) = 32346064 +SHA256 (electron/electron-electron-v26.4.1_GH0.tar.gz) = 211dff8f7a75377aaf1a1e646b62de9287b5037207d95f686e6c9ad4acd36424 +SIZE (electron/electron-electron-v26.4.1_GH0.tar.gz) = 11336814 SHA256 (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 750b09907a0b7054bda042bfc26879b9ccb84f9f436182a820ea188b654ce77b SIZE (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 112039326 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron26/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron26/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index d336a51e8f6e..1e06ffc387eb 100644 --- a/devel/electron26/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron26/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-10-10 23:44:27 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-10-18 09:32:19 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -155,11 +155,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -14,7 +14,7 @@ #include "ui/gfx/font_render_params.h" #endif -@@ -491,7 +491,7 @@ absl::optional GetCursorBlinkInterval +@@ -498,7 +498,7 @@ absl::optional GetCursorBlinkInterval ui::TextInsertionCaretBlinkPeriodFromDefaults()); if (system_value) return *system_value; @@ -23,7 +23,7 @@ if (auto* linux_ui = ui::LinuxUi::instance()) return linux_ui->GetCursorBlinkInterval(); #elif BUILDFLAG(IS_WIN) -@@ -946,7 +946,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -953,7 +953,7 @@ void WebContents::InitWithSessionAndOptions( accept_languages.pop_back(); prefs->accept_languages = accept_languages; @@ -32,7 +32,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2619,7 +2619,7 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2626,7 +2626,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(); -@@ -3282,7 +3282,7 @@ void WebContents::CopyImageAt(int x, int y) { +@@ -3289,7 +3289,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 -@@ -4096,7 +4096,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4097,7 +4097,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts index 5665145b0534..f14895fa453a 100644 --- a/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2023-10-10 23:44:27 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2023-10-18 09:32:19 UTC +++ electron/spec/api-browser-window-spec.ts @@ -65,7 +65,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -63,7 +63,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -2778,7 +2778,7 @@ describe('BrowserWindow module', () => { +@@ -2782,7 +2782,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); -@@ -2804,7 +2804,7 @@ describe('BrowserWindow module', () => { +@@ -2808,7 +2808,7 @@ describe('BrowserWindow module', () => { }); }); @@ -81,7 +81,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3733,7 +3733,7 @@ describe('BrowserWindow module', () => { +@@ -3737,7 +3737,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 { -@@ -4238,7 +4238,7 @@ describe('BrowserWindow module', () => { +@@ -4242,7 +4242,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 }); -@@ -4509,7 +4509,7 @@ describe('BrowserWindow module', () => { +@@ -4513,7 +4513,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(); -@@ -4526,7 +4526,7 @@ describe('BrowserWindow module', () => { +@@ -4530,7 +4530,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 }); -@@ -4563,7 +4563,7 @@ describe('BrowserWindow module', () => { +@@ -4567,7 +4567,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(); -@@ -5037,7 +5037,7 @@ describe('BrowserWindow module', () => { +@@ -5041,7 +5041,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'); -@@ -5127,7 +5127,7 @@ describe('BrowserWindow module', () => { +@@ -5131,7 +5131,7 @@ describe('BrowserWindow module', () => { }); }); @@ -144,7 +144,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6281,7 +6281,7 @@ describe('BrowserWindow module', () => { +@@ -6285,7 +6285,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows);