From nobody Sat Sep 16 04:27:33 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 4RndM935Mpz4smlg; Sat, 16 Sep 2023 04:27:33 +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 4RndM92SLcz4cMB; Sat, 16 Sep 2023 04:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694838453; 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=1Qz0mDBCz10Zcsop6vGkfbqGoirfijZkDfeorGRD3zw=; b=NtOWmtuZRWNqZ0R0aoJX+/2dPTBSDQvEs6prb7128ZrOWVVF8U7mxDSLJYii6gSCft+Ozw 2AQtEJ7R55eycNI7u4gofFXohcZmuuMTGjercuYw1HK/ek3LuaS669fV3D2ogq/y0sJR+K +ckgQVrWvgEZbbEK/jnb+yetx5lcwWfpco03Db7IZo2cegMg5caTCrjvyFhFFn9jsiguqe SRtfyHmkwXSYnx4YB6cDjeGORvLhoNdj0Av8tlb6gKyIp9RcZZkTVs4uoHu9ftWGcHQjqN JEAg99wRRLba82MxG9oBfjP3i/G8KdcMI0ztEd20GXjo8Gu3NNvUf9lO9RZ+eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694838453; a=rsa-sha256; cv=none; b=y4Dn+8FxYnT5VafvikGqH+O7Ift3UB+cblDosrYbZLpi0qjHx1zpcLV8WAmr+WPrILUHpX W0t88BeOHscDxhQPVuyeW0t88TikM/SndbcfaJ/NoSsfEKm+6JH9KZNf+da/U3uV3SqTFp uO9ZEW/1YllXVv0vVtoDaTs2HWqBaZ6NhyIN3i5ZPWVAKmwrtzw0N1UZ57FEIXJE0q5AUc Q56I7SutxUziFJISlaTPg/SYXwREt5iUHWE0TD0LEv6zHxT5TLFlSUb2uPMuE39zGD594e e8Z6TPUcAwT3QTCbuM7OOpsFlnqoxICpSbLCY8/wLxXXIVpR7ye5QBxCAgQqaQ== 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=1694838453; 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=1Qz0mDBCz10Zcsop6vGkfbqGoirfijZkDfeorGRD3zw=; b=Ge9EploD5vUMqs5h3rWHyuDUAh8b+nbUPmHoL0qYUSSe2xJ8An59vOXGKy9hirkbUgvzZh Y6FFs8NqZm1efNQeb+vjZ1aQw4oSLg6pkkL4Bovd8ZqwO/ZSss0fbinhigHP5/K5X+6BUi sJv4Es3WlqhyMN7RBesq7tyLCKOFKDcDYImdGinzlX36xsBkdedMSM2bXVjipSzPckSAMC kNrEfnxidjz3pYtEAUroMdYKIYfdSJrH+Kb3BZxQprWIYgRJOPPHflIoqJHLmegUVlrpjj /akkPAulBmgBGzweCnZXg1+Wac3n3jDZpaG/0eFIIU1yZ0cJXiVSFTELNcRS3A== 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 4RndM91TF0zsVv; Sat, 16 Sep 2023 04:27:33 +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 38G4RXl0020258; Sat, 16 Sep 2023 04:27:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38G4RXW2020255; Sat, 16 Sep 2023 04:27:33 GMT (envelope-from git) Date: Sat, 16 Sep 2023 04:27:33 GMT Message-Id: <202309160427.38G4RXW2020255@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: 9c766637b73b - 2023Q3 - devel/electron25: update to 25.8.1 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: 9c766637b73b07a305280155cd464b8419bc9b28 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c766637b73b07a305280155cd464b8419bc9b28 commit 9c766637b73b07a305280155cd464b8419bc9b28 Author: Hiroki Tagato AuthorDate: 2023-09-16 04:24:41 +0000 Commit: Hiroki Tagato CommitDate: 2023-09-16 04:27:24 +0000 devel/electron25: update to 25.8.1 Changelog: https://github.com/electron/electron/releases/tag/v25.8.1 Reported by: GitHub (watch releases) MFH: 2023Q3 Security: 773ce35b-eabb-47e0-98ca-669b2b98107a (cherry picked from commit 1f41a7f2a3b3838e6d3051f67d201ca622fad414) --- devel/electron25/Makefile | 2 +- devel/electron25/Makefile.version | 2 +- devel/electron25/distinfo | 10 +++++----- devel/electron25/files/patch-electron_lib_browser_init.ts | 4 ++-- ...electron_shell_browser_api_electron__api__web__contents.cc | 6 +++--- .../files/patch-electron_spec_api-content-tracing-spec.ts | 11 +++++++++++ 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/devel/electron25/Makefile b/devel/electron25/Makefile index b675358f4d1b..cf46c751931e 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= 1693653500 +YARN_TIMESTAMP= 1694828193 .include "Makefile.version" .include diff --git a/devel/electron25/Makefile.version b/devel/electron25/Makefile.version index 8ab97781a47d..d9fbcdb71e8f 100644 --- a/devel/electron25/Makefile.version +++ b/devel/electron25/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 25.8.0 +ELECTRON_VER= 25.8.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron25/distinfo b/devel/electron25/distinfo index 82f90c8ead2f..0c4443bd381c 100644 --- a/devel/electron25/distinfo +++ b/devel/electron25/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1693653845 +TIMESTAMP = 1694828878 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.8.0.tar.xz) = 13b30b4549d4c47c8821f629b1340a8dea0a5f4830033b04808b8b07e80d506d -SIZE (electron/electron-yarn-cache-25.8.0.tar.xz) = 41289472 -SHA256 (electron/electron-electron-v25.8.0_GH0.tar.gz) = c3f1c4b7de1ffc53ee6f1fddf26943b9c051f748934c76c6bdc098385870b40f -SIZE (electron/electron-electron-v25.8.0_GH0.tar.gz) = 11312518 +SHA256 (electron/electron-yarn-cache-25.8.1.tar.xz) = e3fe92f19bc789bc6e3497343552411020d4a9c4e745c46c938f58526809643e +SIZE (electron/electron-yarn-cache-25.8.1.tar.xz) = 41289428 +SHA256 (electron/electron-electron-v25.8.1_GH0.tar.gz) = b68e215aa18e02310c44334416dd47b53d4f92888b68facc2b867c4bf9c10202 +SIZE (electron/electron-electron-v25.8.1_GH0.tar.gz) = 11322834 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_lib_browser_init.ts b/devel/electron25/files/patch-electron_lib_browser_init.ts index 363f43f0c286..d68397815c13 100644 --- a/devel/electron25/files/patch-electron_lib_browser_init.ts +++ b/devel/electron25/files/patch-electron_lib_browser_init.ts @@ -1,6 +1,6 @@ ---- electron/lib/browser/init.ts.orig 2022-05-18 15:31:32 UTC +--- electron/lib/browser/init.ts.orig 2023-09-12 18:44:33 UTC +++ electron/lib/browser/init.ts -@@ -149,7 +149,7 @@ const mainStartupScript = packageJson.main || 'index.j +@@ -158,7 +158,7 @@ const mainStartupScript = packageJson.main || 'index.j const KNOWN_XDG_DESKTOP_VALUES = ['Pantheon', 'Unity:Unity7', 'pop:GNOME']; function currentPlatformSupportsAppIndicator () { 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 116bf60fe3d5..5ef480c1cd7a 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-08-30 15:08:12 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-09-12 18:44:33 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -154,11 +154,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -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(); -@@ -3314,7 +3314,7 @@ void WebContents::CopyImageAt(int x, int y) { +@@ -3306,7 +3306,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 -@@ -4128,7 +4128,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4120,7 +4120,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron25/files/patch-electron_spec_api-content-tracing-spec.ts b/devel/electron25/files/patch-electron_spec_api-content-tracing-spec.ts new file mode 100644 index 000000000000..729fcf2d12aa --- /dev/null +++ b/devel/electron25/files/patch-electron_spec_api-content-tracing-spec.ts @@ -0,0 +1,11 @@ +--- electron/spec/api-content-tracing-spec.ts.orig 2023-09-16 01:56:56 UTC ++++ electron/spec/api-content-tracing-spec.ts +@@ -6,7 +6,7 @@ import { setTimeout } from 'timers/promises'; + import { ifdescribe } from './lib/spec-helpers'; + + // FIXME: The tests are skipped on linux arm/arm64 +-ifdescribe(!(['arm', 'arm64'].includes(process.arch)) || (process.platform !== 'linux'))('contentTracing', () => { ++ifdescribe(!(['arm', 'arm64'].includes(process.arch)) || (process.platform !== 'linux' && process.platform !== 'freebsd'))('contentTracing', () => { + const record = async (options: TraceConfig | TraceCategoriesAndOptions, outputFilePath: string | undefined, recordTimeInMilliseconds = 1e1) => { + await app.whenReady(); +