devel/electron23: update to 23.3.3

Changelog: https://github.com/electron/electron/releases/tag/v23.3.3 Reported by: GitHub (watch releases) Security: b09d77d0-b27c-48ae-b69b-9641bb68b39e
freebsd · May 20, 2023 · 4812f3a · 4812f3a
1 parent 572a797
commit 4812f3a
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 35 deletions.
diff --git a/devel/electron23/Makefile b/devel/electron23/Makefile
@@ -222,7 +222,7 @@ REACTIVEOBJC_VER=		74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
 # See ${WRKSRC}/electron/DEPS for MANTLE_VER
 MANTLE_VER=			78d3966b3c331292ea29ec38661b25df0a245948
 
-YARN_TIMESTAMP=	1683963302
+YARN_TIMESTAMP=	1684476173
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>

diff --git a/devel/electron23/Makefile.version b/devel/electron23/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	23.3.2
+ELECTRON_VER=	23.3.3
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron23/distinfo b/devel/electron23/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1683963953
+TIMESTAMP = 1684476846
 SHA256 (electron/chromium-110.0.5481.208.tar.xz) = 9f364e9a61a961b808ac241076fe25f8c48e5d7349a3236a9023a51018890ccc
 SIZE (electron/chromium-110.0.5481.208.tar.xz) = 1554639732
 SHA256 (electron/32dc8abec1486818f6ef4afc4996abc002b5218e) = b7f797156b45c21a104f732366dad74e5b401bae8e3ce75fe1e54769cda3c0c2
 SIZE (electron/32dc8abec1486818f6ef4afc4996abc002b5218e) = 9903987
 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
-SHA256 (electron/electron-yarn-cache-23.3.2.tar.xz) = ea945d5fca61f112c54b038a0be90f3f63402e720406153981ac8f79688abbd0
-SIZE (electron/electron-yarn-cache-23.3.2.tar.xz) = 38872716
-SHA256 (electron/electron-electron-v23.3.2_GH0.tar.gz) = 35ab9f3a575d58a192a2ba19cbe2bcfca776219f6a227a0af39d651abd6efdd0
-SIZE (electron/electron-electron-v23.3.2_GH0.tar.gz) = 10488019
+SHA256 (electron/electron-yarn-cache-23.3.3.tar.xz) = 027f1fa58cf24d3461042885141fdf3ee7762230467827162796daf130beae67
+SIZE (electron/electron-yarn-cache-23.3.3.tar.xz) = 38873020
+SHA256 (electron/electron-electron-v23.3.3_GH0.tar.gz) = 0fa75e83ef92c2a0a889e6b3eebb10949403426a4c2dcac0b89c5fa890fae94b
+SIZE (electron/electron-electron-v23.3.3_GH0.tar.gz) = 10489446
 SHA256 (electron/nodejs-node-v18.12.1_GH0.tar.gz) = 7e7962209d25ed6c28b722b78a0b0ca304307d7bf536aca142be330901b11d50
 SIZE (electron/nodejs-node-v18.12.1_GH0.tar.gz) = 108947341
 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39

diff --git a/devel/electron23/files/patch-electron_script_spec-runner.js b/devel/electron23/files/patch-electron_script_spec-runner.js
@@ -1,6 +1,6 @@
---- electron/script/spec-runner.js.orig	2023-04-12 09:18:42 UTC
+--- electron/script/spec-runner.js.orig	2023-05-17 12:49:10 UTC
 +++ electron/script/spec-runner.js
-@@ -162,7 +162,7 @@ async function runTestUsingElectron (specDir, testName
+@@ -163,7 +163,7 @@ async function runTestUsingElectron (specDir, testName
      exe = path.resolve(BASE, utils.getElectronExec());
    }
    const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)];

diff --git a/devel/electron23/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron23/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.cc.orig	2023-02-06 19:29:11 UTC
+--- electron/shell/browser/native_window_views.cc.orig	2023-05-17 12:49:10 UTC
 +++ electron/shell/browser/native_window_views.cc
 @@ -42,7 +42,7 @@
  #include "ui/wm/core/shadow_types.h"
@@ -36,7 +36,7 @@
    // On linux after the widget is initialized we might have to force set the
    // bounds if the bounds are smaller than the current display
    SetBounds(gfx::Rect(GetPosition(), bounds.size()), false);
-@@ -541,7 +541,7 @@ bool NativeWindowViews::IsVisible() {
+@@ -551,7 +551,7 @@ bool NativeWindowViews::IsVisible() {
  bool NativeWindowViews::IsEnabled() {
  #if BUILDFLAG(IS_WIN)
    return ::IsWindowEnabled(GetAcceleratedWidget());
@@ -45,7 +45,7 @@
  #if defined(USE_OZONE_PLATFORM_X11)
    if (IsX11())
      return !event_disabler_.get();
-@@ -599,7 +599,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
+@@ -609,7 +609,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
  #endif
  }
 
@@ -54,7 +54,7 @@
  void NativeWindowViews::Maximize() {
    if (IsVisible()) {
      widget()->Maximize();
-@@ -726,7 +726,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -736,7 +736,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
    }
  #endif
 
@@ -63,7 +63,7 @@
    // On Linux and Windows the minimum and maximum size should be updated with
    // window size when window is not resizable.
    if (!resizable_) {
-@@ -958,7 +958,7 @@ bool NativeWindowViews::IsClosable() {
+@@ -968,7 +968,7 @@ bool NativeWindowViews::IsClosable() {
      return false;
    }
    return !(info.fState & MFS_DISABLED);
@@ -72,7 +72,7 @@
    return true;
  #endif
  }
-@@ -1346,7 +1346,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1356,7 +1356,7 @@ void NativeWindowViews::SetProgressBar(double progress
                                         NativeWindow::ProgressState state) {
  #if BUILDFLAG(IS_WIN)
    taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
@@ -81,7 +81,7 @@
    if (unity::IsRunning()) {
      unity::SetProgressFraction(progress);
    }
-@@ -1408,7 +1408,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1418,7 +1418,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
  #if BUILDFLAG(IS_WIN)
    window_handle =
        reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
@@ -90,7 +90,7 @@
    window_handle = static_cast<uint32_t>(accelerated_widget);
  #endif
    aura::WindowTreeHost* const host =
-@@ -1506,7 +1506,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1516,7 +1516,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
    SendMessage(hwnd, WM_SETICON, ICON_BIG,
                reinterpret_cast<LPARAM>(app_icon_.get()));
  }
@@ -99,7 +99,7 @@
  void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
    auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
        GetAcceleratedWidget());
-@@ -1576,7 +1576,7 @@ bool NativeWindowViews::CanMaximize() const {
+@@ -1586,7 +1586,7 @@ bool NativeWindowViews::CanMaximize() const {
  bool NativeWindowViews::CanMinimize() const {
  #if BUILDFLAG(IS_WIN)
    return minimizable_;
@@ -108,7 +108,7 @@
    return true;
  #endif
  }
-@@ -1628,7 +1628,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1638,7 +1638,7 @@ void NativeWindowViews::HandleKeyboardEvent(
    if (widget_destroyed_)
      return;
 
@@ -117,7 +117,7 @@
    if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
      NotifyWindowExecuteAppCommand(kBrowserBackward);
    else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-@@ -1647,7 +1647,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1657,7 +1657,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
    // Alt+Click should not toggle menu bar.
    root_view_->ResetAltState();
 

diff --git a/devel/electron23/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron23/files/patch-electron_spec_api-browser-window-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec/api-browser-window-spec.ts.orig	2023-04-14 16:18:42 UTC
+--- electron/spec/api-browser-window-spec.ts.orig	2023-05-17 12:49:10 UTC
 +++ electron/spec/api-browser-window-spec.ts
 @@ -58,7 +58,7 @@ describe('BrowserWindow module', () => {
        }).not.to.throw();
@@ -9,7 +9,16 @@
        const appPath = path.join(fixtures, 'apps', 'xwindow-icon');
        const appProcess = childProcess.spawn(process.execPath, [appPath]);
        await new Promise((resolve) => { appProcess.once('exit', resolve); });
-@@ -736,7 +736,7 @@ describe('BrowserWindow module', () => {
+@@ -738,7 +738,7 @@ describe('BrowserWindow module', () => {
+
+     describe('BrowserWindow.minimize()', () => {
+       // TODO(codebytere): Enable for Linux once maximize/minimize events work in CI.
+-      ifit(process.platform !== 'linux')('should not be visible when the window is minimized', async () => {
++      ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should not be visible when the window is minimized', async () => {
+         const minimize = emittedOnce(w, 'minimize');
+         w.minimize();
+         await minimize;
+@@ -755,7 +755,7 @@ describe('BrowserWindow module', () => {
        });
 
        // TODO(dsanders11): Enable for Linux once CI plays nice with these kinds of tests
@@ -18,7 +27,7 @@
          const maximize = emittedOnce(w, 'maximize');
          const shown = emittedOnce(w, 'show');
          w.maximize();
-@@ -773,7 +773,7 @@ describe('BrowserWindow module', () => {
+@@ -792,7 +792,7 @@ describe('BrowserWindow module', () => {
          expect(w.isFocused()).to.equal(true);
        });
 
@@ -27,7 +36,7 @@
          const w1 = new BrowserWindow({ show: false });
          const w2 = new BrowserWindow({ show: false });
          const w3 = new BrowserWindow({ show: false });
-@@ -840,7 +840,7 @@ describe('BrowserWindow module', () => {
+@@ -859,7 +859,7 @@ describe('BrowserWindow module', () => {
          expect(w.isFocused()).to.equal(false);
        });
 
@@ -36,7 +45,7 @@
          const w1 = new BrowserWindow({ show: false });
          const w2 = new BrowserWindow({ show: false });
          const w3 = new BrowserWindow({ show: false });
-@@ -1238,7 +1238,7 @@ describe('BrowserWindow module', () => {
+@@ -1257,7 +1257,7 @@ describe('BrowserWindow module', () => {
          });
        });
 
@@ -45,7 +54,7 @@
          it('checks normal bounds when maximized', async () => {
            const bounds = w.getBounds();
            const maximize = emittedOnce(w, 'maximize');
-@@ -1365,7 +1365,7 @@ describe('BrowserWindow module', () => {
+@@ -1384,7 +1384,7 @@ describe('BrowserWindow module', () => {
          });
        });
 
@@ -54,7 +63,7 @@
          it('checks normal bounds when minimized', async () => {
            const bounds = w.getBounds();
            const minimize = emittedOnce(w, 'minimize');
-@@ -2278,7 +2278,7 @@ describe('BrowserWindow module', () => {
+@@ -2333,7 +2333,7 @@ describe('BrowserWindow module', () => {
    describe('BrowserWindow.setOpacity(opacity)', () => {
      afterEach(closeAllWindows);
 
@@ -63,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);
-@@ -2304,7 +2304,7 @@ describe('BrowserWindow module', () => {
+@@ -2359,7 +2359,7 @@ describe('BrowserWindow module', () => {
        });
      });
 
@@ -72,7 +81,7 @@
        it('sets 1 regardless of parameter', () => {
          const w = new BrowserWindow({ show: false });
          w.setOpacity(0);
-@@ -3232,7 +3232,7 @@ describe('BrowserWindow module', () => {
+@@ -3287,7 +3287,7 @@ describe('BrowserWindow module', () => {
          expect(test.versions).to.deep.equal(process.versions);
          expect(test.contextId).to.be.a('string');
 
@@ -81,7 +90,7 @@
            expect(test.creationTime).to.be.null('creation time');
            expect(test.systemMemoryInfo).to.be.null('system memory info');
          } else {
-@@ -3738,7 +3738,7 @@ describe('BrowserWindow module', () => {
+@@ -3793,7 +3793,7 @@ describe('BrowserWindow module', () => {
      });
    });
 
@@ -90,7 +99,7 @@
      afterEach(closeAllWindows);
      it('emits an event when window is maximized', async () => {
        const w = new BrowserWindow({ show: false });
-@@ -3998,7 +3998,7 @@ describe('BrowserWindow module', () => {
+@@ -4053,7 +4053,7 @@ describe('BrowserWindow module', () => {
      // TODO(zcbenz):
      // This test does not run on Linux CI. See:
      // https://github.com/electron/electron/issues/28699
@@ -99,7 +108,7 @@
        const w = new BrowserWindow({});
        const maximize = emittedOnce(w, 'maximize');
        w.maximize();
-@@ -4015,7 +4015,7 @@ describe('BrowserWindow module', () => {
+@@ -4070,7 +4070,7 @@ describe('BrowserWindow module', () => {
    });
 
    // TODO(dsanders11): Enable once maximize event works on Linux again on CI
@@ -108,7 +117,7 @@
      afterEach(closeAllWindows);
      it('should show the window if it is not currently shown', async () => {
        const w = new BrowserWindow({ show: false });
-@@ -4052,7 +4052,7 @@ describe('BrowserWindow module', () => {
+@@ -4107,7 +4107,7 @@ describe('BrowserWindow module', () => {
 
      // TODO(dsanders11): Enable once minimize event works on Linux again.
      //                   See https://github.com/electron/electron/issues/28699
@@ -117,7 +126,7 @@
        const w = new BrowserWindow();
        const minimize = emittedOnce(w, 'minimize');
        w.minimize();
-@@ -4415,7 +4415,7 @@ describe('BrowserWindow module', () => {
+@@ -4470,7 +4470,7 @@ describe('BrowserWindow module', () => {
        });
 
        // On Linux there is no "resizable" property of a window.
@@ -126,7 +135,7 @@
          const w = new BrowserWindow({ show: false });
          expect(w.resizable).to.be.true('resizable');
 
-@@ -4507,7 +4507,7 @@ describe('BrowserWindow module', () => {
+@@ -4562,7 +4562,7 @@ describe('BrowserWindow module', () => {
      });
    });
 
@@ -135,3 +144,12 @@
      // Not implemented on Linux.
      afterEach(closeAllWindows);
 
+@@ -5626,7 +5626,7 @@ describe('BrowserWindow module', () => {
+   describe('"transparent" option', () => {
+     afterEach(closeAllWindows);
+
+-    ifit(process.platform !== 'linux')('correctly returns isMaximized() when the window is maximized then minimized', async () => {
++    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('correctly returns isMaximized() when the window is maximized then minimized', async () => {
+       const w = new BrowserWindow({
+         frame: false,
+         transparent: true