git: 1f41a7f2a3b3 - main - devel/electron25: update to 25.8.1

From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Sat, 16 Sep 2023 04:26:38 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1f41a7f2a3b3838e6d3051f67d201ca622fad414

commit 1f41a7f2a3b3838e6d3051f67d201ca622fad414
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2023-09-16 04:24:41 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2023-09-16 04:26:28 +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
---
 devel/electron25/Makefile                                     |  3 +--
 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(+), 13 deletions(-)

diff --git a/devel/electron25/Makefile b/devel/electron25/Makefile
index 14293a901b31..cf46c751931e 100644
--- a/devel/electron25/Makefile
+++ b/devel/electron25/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/v25.5.0/:chromium \
 		https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
@@ -224,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 <bsd.port.pre.mk>
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();
+