git: c1d5a74398e0 - main - devel/electron31: update to 31.3.1

From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Wed, 31 Jul 2024 05:17:24 UTC
The branch main has been updated by tagattie:

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

commit c1d5a74398e01fddec1fa5df9729e33dda347653
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2024-07-31 05:15:39 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2024-07-31 05:17:14 +0000

    devel/electron31: update to 31.3.1
    
    Changelog: https://github.com/electron/electron/releases/tag/v31.3.1
    
    Reported by:    GitHub (watch releases)
---
 devel/electron31/Makefile                          |  2 +-
 devel/electron31/Makefile.version                  |  2 +-
 devel/electron31/distinfo                          | 14 +++++++-------
 ...ell_browser_api_electron__api__safe__storage.cc | 22 +++++++++++-----------
 ...atch-electron_spec_api-desktop-capturer-spec.ts |  4 ++--
 .../files/patch-electron_spec_api-protocol-spec.ts |  4 ++--
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/devel/electron31/Makefile b/devel/electron31/Makefile
index 04240e36691b..58f51099e20b 100644
--- a/devel/electron31/Makefile
+++ b/devel/electron31/Makefile
@@ -207,7 +207,7 @@ PIPEWIRE_VARS_OFF=	GN_ARGS+=rtc_use_pipewire=false \
 			GN_ARGS+=rtc_link_pipewire=false
 
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
-CHROMIUM_VER=			126.0.6478.183
+CHROMIUM_VER=			126.0.6478.185
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=			20.15.1
 # See ${WRKSRC}/electron/DEPS for NAN_VER
diff --git a/devel/electron31/Makefile.version b/devel/electron31/Makefile.version
index 92be2124a772..f16e688d19e4 100644
--- a/devel/electron31/Makefile.version
+++ b/devel/electron31/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	31.3.0
+ELECTRON_VER=	31.3.1
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron31/distinfo b/devel/electron31/distinfo
index e3f4776b223c..32c07659d505 100644
--- a/devel/electron31/distinfo
+++ b/devel/electron31/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1721973146
-SHA256 (electron/chromium-126.0.6478.183.tar.xz) = f2588c00acbbb6f6b26e12b870b74a2f7a5e47b1cfe68b9218f35caa247bebaf
-SIZE (electron/chromium-126.0.6478.183.tar.xz) = 4173374824
+TIMESTAMP = 1722324720
+SHA256 (electron/chromium-126.0.6478.185.tar.xz) = 8ca908730dec89aec5b34e3db16178b5c409ab9d335844530ac22dc5990ecf26
+SIZE (electron/chromium-126.0.6478.185.tar.xz) = 4174560832
 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-31.3.0.tar.xz) = 8b9a13b091dacb8b4f3ea7bb44826d7cf3062bc2700462d20a261da3d61ca189
-SIZE (electron/electron-yarn-cache-31.3.0.tar.xz) = 29172376
-SHA256 (electron/electron-electron-v31.3.0_GH0.tar.gz) = 6e2642999ede9ba1741fe8fe5d7f9ced246e562d9bfa0b5267ec3afbb5d9287d
-SIZE (electron/electron-electron-v31.3.0_GH0.tar.gz) = 13810801
+SHA256 (electron/electron-yarn-cache-31.3.1.tar.xz) = 8b9a13b091dacb8b4f3ea7bb44826d7cf3062bc2700462d20a261da3d61ca189
+SIZE (electron/electron-yarn-cache-31.3.1.tar.xz) = 29172376
+SHA256 (electron/electron-electron-v31.3.1_GH0.tar.gz) = 20bd571f4282f0189170484b1e2a0018c1f171b1c0dae758974dd8b8289856e6
+SIZE (electron/electron-electron-v31.3.1_GH0.tar.gz) = 13811672
 SHA256 (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 9c54c9338f78cf99227d006e65123fd9ef66cf8c271f3c25cad9a336f201507f
 SIZE (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 115474342
 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
diff --git a/devel/electron31/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc b/devel/electron31/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc
index b9302ba7f004..e2dc35a286a6 100644
--- a/devel/electron31/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc
+++ b/devel/electron31/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc
@@ -1,7 +1,7 @@
---- electron/shell/browser/api/electron_api_safe_storage.cc.orig	2023-08-14 18:19:06 UTC
+--- electron/shell/browser/api/electron_api_safe_storage.cc.orig	2024-07-27 19:47:12 UTC
 +++ electron/shell/browser/api/electron_api_safe_storage.cc
-@@ -22,7 +22,7 @@ static const char* kEncryptionVersionPrefixV11 = "v11"
- static bool use_password_v10 = false;
+@@ -20,7 +20,7 @@ bool IsEncryptionAvailable() {
+ bool use_password_v10 = false;
  
  bool IsEncryptionAvailable() {
 -#if BUILDFLAG(IS_LINUX)
@@ -9,21 +9,21 @@
    // Calling IsEncryptionAvailable() before the app is ready results in a crash
    // on Linux.
    // Refs: https://github.com/electron/electron/issues/32206.
-@@ -41,7 +41,7 @@ void SetUsePasswordV10(bool use) {
+@@ -39,7 +39,7 @@ void SetUsePasswordV10(bool use) {
    use_password_v10 = use;
  }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  std::string GetSelectedLinuxBackend() {
-   if (!Browser::Get()->is_ready())
+   if (!electron::Browser::Get()->is_ready())
      return "unknown";
-@@ -142,7 +142,7 @@ void Initialize(v8::Local<v8::Object> exports,
-   dict.SetMethod("decryptString", &electron::safestorage::DecryptString);
-   dict.SetMethod("setUsePlainTextEncryption",
-                  &electron::safestorage::SetUsePasswordV10);
+@@ -136,7 +136,7 @@ void Initialize(v8::Local<v8::Object> exports,
+   gin_helper::Dictionary dict(isolate, exports);
+   dict.SetMethod("decryptString", &DecryptString);
+   dict.SetMethod("encryptString", &EncryptString);
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   dict.SetMethod("getSelectedStorageBackend",
-                  &electron::safestorage::GetSelectedLinuxBackend);
+   dict.SetMethod("getSelectedStorageBackend", &GetSelectedLinuxBackend);
  #endif
+   dict.SetMethod("isEncryptionAvailable", &IsEncryptionAvailable);
diff --git a/devel/electron31/files/patch-electron_spec_api-desktop-capturer-spec.ts b/devel/electron31/files/patch-electron_spec_api-desktop-capturer-spec.ts
index 7001a56b8b90..cc2f69ff8c74 100644
--- a/devel/electron31/files/patch-electron_spec_api-desktop-capturer-spec.ts
+++ b/devel/electron31/files/patch-electron_spec_api-desktop-capturer-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec/api-desktop-capturer-spec.ts.orig	2023-08-14 18:19:06 UTC
+--- electron/spec/api-desktop-capturer-spec.ts.orig	2024-07-27 19:47:12 UTC
 +++ electron/spec/api-desktop-capturer-spec.ts
 @@ -43,7 +43,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl
    });
@@ -36,7 +36,7 @@
        it.skip('desktopCapturer.getSources returned an empty source list');
        return;
      }
-@@ -191,7 +191,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl
+@@ -205,7 +205,7 @@ ifdescribe(!process.arch.includes('arm') && process.pl
        // TODO(julien.isorce): investigate why |sources| is empty on the linux
        // bots while it is not on my workstation, as expected, with and without
        // the --ci parameter.
diff --git a/devel/electron31/files/patch-electron_spec_api-protocol-spec.ts b/devel/electron31/files/patch-electron_spec_api-protocol-spec.ts
index 29238b03385b..51c2cc6c6bbc 100644
--- a/devel/electron31/files/patch-electron_spec_api-protocol-spec.ts
+++ b/devel/electron31/files/patch-electron_spec_api-protocol-spec.ts
@@ -1,6 +1,6 @@
---- electron/spec/api-protocol-spec.ts.orig	2024-04-29 23:06:40 UTC
+--- electron/spec/api-protocol-spec.ts.orig	2024-07-27 19:47:12 UTC
 +++ electron/spec/api-protocol-spec.ts
-@@ -1710,7 +1710,7 @@ describe('protocol module', () => {
+@@ -1734,7 +1734,7 @@ describe('protocol module', () => {
      });
  
      // TODO(nornagon): this test doesn't pass on Linux currently, investigate.