devel/electron28: update to 28.3.1

Changelog: https://github.com/electron/electron/releases/tag/v28.3.1 Reported by: GitHub (watch releases) MFH: 2024Q2 Security: f90bf863-e43c-4db3-b5a8-d9603684657a (cherry picked from commit 27fe289)
freebsd · Apr 19, 2024 · c7d2f7e · c7d2f7e
1 parent e9e0870
commit c7d2f7e
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 21 deletions.
diff --git a/devel/electron28/Makefile.version b/devel/electron28/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	28.3.0
+ELECTRON_VER=	28.3.1
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron28/distinfo b/devel/electron28/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1712911782
+TIMESTAMP = 1713473841
 SHA256 (electron/chromium-120.0.6099.291.tar.xz) = edb20651392a67dbefced6489d2228a2b7d18ec2bbba4e5bbe355b34ba87fe49
 SIZE (electron/chromium-120.0.6099.291.tar.xz) = 1578614892
 SHA256 (electron/bb991b26ccca36a9b3912b51dec5b70e5dea9aea) = 8ada8e0554ecd02f649047f8f15a438590c67505b9f2e6a58fd973fe02c4ca52
 SIZE (electron/bb991b26ccca36a9b3912b51dec5b70e5dea9aea) = 9782997
 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
-SHA256 (electron/electron-yarn-cache-28.3.0.tar.xz) = ee4117440555d6be62f706646bb1b3c6737cc5b741b8e72377136c72a3474518
-SIZE (electron/electron-yarn-cache-28.3.0.tar.xz) = 29073696
-SHA256 (electron/electron-electron-v28.3.0_GH0.tar.gz) = 9ace77482b0f3f5a173cbc363785486eaea3e1b2604b22c1150751ce0addcef3
-SIZE (electron/electron-electron-v28.3.0_GH0.tar.gz) = 11504153
+SHA256 (electron/electron-yarn-cache-28.3.1.tar.xz) = ee4117440555d6be62f706646bb1b3c6737cc5b741b8e72377136c72a3474518
+SIZE (electron/electron-yarn-cache-28.3.1.tar.xz) = 29073696
+SHA256 (electron/electron-electron-v28.3.1_GH0.tar.gz) = 17fbdeab8ca413200d1cf0d06e6d813e49cd6cbae523a1dcb4a54e2ff0e2fa87
+SIZE (electron/electron-electron-v28.3.1_GH0.tar.gz) = 11508443
 SHA256 (electron/nodejs-node-v18.18.2_GH0.tar.gz) = b1c20070ec2cfc930572e8d3c3f1de4be8bc7e2259956031db00709b7775a0da
 SIZE (electron/nodejs-node-v18.18.2_GH0.tar.gz) = 112758381
 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb

diff --git a/devel/electron28/files/patch-electron_BUILD.gn b/devel/electron28/files/patch-electron_BUILD.gn
@@ -1,4 +1,4 @@
---- electron/BUILD.gn.orig	2023-12-04 18:19:02 UTC
+--- electron/BUILD.gn.orig	2024-04-16 10:35:16 UTC
 +++ electron/BUILD.gn
 @@ -519,7 +519,7 @@ source_set("electron_lib") {
      defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
@@ -22,7 +22,7 @@
    if (is_linux) {
      libs = [ "xshmfence" ]
      deps += [
-@@ -1195,7 +1201,7 @@ if (is_mac) {
+@@ -1197,7 +1203,7 @@ if (is_mac) {
        ":electron_lib",
        ":electron_win32_resources",
        ":packed_resources",
@@ -31,7 +31,7 @@
        "//content:sandbox_helper_win",
        "//electron/buildflags",
        "//ui/strings",
-@@ -1221,7 +1227,7 @@ if (is_mac) {
+@@ -1223,7 +1229,7 @@ if (is_mac) {
        public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
      }
 
@@ -40,7 +40,7 @@
        data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ]
      }
 
-@@ -1288,7 +1294,7 @@ if (is_mac) {
+@@ -1290,7 +1296,7 @@ if (is_mac) {
          configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
        }
 
@@ -49,7 +49,7 @@
          deps += [ "//sandbox/linux:chrome_sandbox" ]
        }
      }
-@@ -1415,7 +1421,7 @@ dist_zip("electron_dist_zip") {
+@@ -1417,7 +1423,7 @@ dist_zip("electron_dist_zip") {
      ":electron_version_file",
      ":licenses",
    ]

diff --git a/devel/electron28/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron28/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/api/electron_api_web_contents.cc.orig	2024-02-21 08:43:43 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig	2024-04-16 10:35:16 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.cc
-@@ -154,11 +154,11 @@
+@@ -153,11 +153,11 @@
  #include "ui/base/cocoa/defaults_utils.h"
  #endif
 
@@ -14,7 +14,7 @@
  #include "ui/gfx/font_render_params.h"
  #endif
 
-@@ -489,7 +489,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval
+@@ -488,7 +488,7 @@ absl::optional<base::TimeDelta> 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)
-@@ -937,7 +937,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -846,7 +846,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));
-@@ -2640,7 +2640,7 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2549,7 +2549,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();
-@@ -3318,7 +3318,7 @@ void WebContents::Focus() {
+@@ -3229,7 +3229,7 @@ void WebContents::Focus() {
  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
-@@ -4108,7 +4108,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -4019,7 +4019,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
  }
  #endif
 

diff --git a/devel/electron28/files/patch-electron_shell_browser_printing_printing__utils.cc b/devel/electron28/files/patch-electron_shell_browser_printing_printing__utils.cc
@@ -0,0 +1,11 @@
+--- electron/shell/browser/printing/printing_utils.cc.orig	2024-04-18 21:07:39 UTC
++++ electron/shell/browser/printing/printing_utils.cc
+@@ -20,7 +20,7 @@
+ #include <ApplicationServices/ApplicationServices.h>
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include <gtk/gtk.h>
+ #endif
+
diff --git a/devel/electron28/files/patch-electron_spec_chromium-spec.ts b/devel/electron28/files/patch-electron_spec_chromium-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec/chromium-spec.ts.orig	2024-03-07 18:09:49 UTC
+--- electron/spec/chromium-spec.ts.orig	2024-04-16 10:35:16 UTC
 +++ electron/spec/chromium-spec.ts
 @@ -470,13 +470,13 @@ describe('command line switches', () => {
      it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}|${currentPreferredLanguages}`));
@@ -18,7 +18,7 @@
    });
 
    describe('--remote-debugging-pipe switch', () => {
-@@ -2494,12 +2494,12 @@ describe('font fallback', () => {
+@@ -2626,12 +2626,12 @@ describe('font fallback', () => {
        expect(fonts[0].familyName).to.equal('Arial');
      } else if (process.platform === 'darwin') {
        expect(fonts[0].familyName).to.equal('Helvetica');
@@ -33,7 +33,7 @@
      const html = `
      <html lang="ja-JP">
        <head>
-@@ -2893,7 +2893,7 @@ describe('navigator.clipboard.write', () => {
+@@ -3025,7 +3025,7 @@ describe('navigator.clipboard.write', () => {
    });
  });