devel/electron24: update to 24.6.0

Changelog: https://github.com/electron/electron/releases/tag/v24.6.0 Reported by: GitHub (watch releases) Security: a03b2d9e-b3f2-428c-8f66-21092ed2ba94
freebsd · Jun 25, 2023 · dfecbd2 · dfecbd2
1 parent 1628143
commit dfecbd2
Show file tree

Hide file tree

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

diff --git a/devel/electron24/Makefile.version b/devel/electron24/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	24.5.1
+ELECTRON_VER=	24.6.0
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron24/distinfo b/devel/electron24/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1687172641
+TIMESTAMP = 1687606092
 SHA256 (electron/chromium-112.0.5615.204.tar.xz) = 4eb23f689df9685fc4ce38fe751023ac98aab2ca21af1ee7ebe47fa5c095a09d
 SIZE (electron/chromium-112.0.5615.204.tar.xz) = 1572906744
 SHA256 (electron/a98dcca3c46a718770b2cb3430785ea4ed7e3f09) = 386332ab89cbe19c427a3febcf2e93ee89a3007243da3e3e466823f50d00eba5
 SIZE (electron/a98dcca3c46a718770b2cb3430785ea4ed7e3f09) = 9822544
 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
-SHA256 (electron/electron-yarn-cache-24.5.1.tar.xz) = 3226c6f11d9ba07f2cfec4fbc8be627b4315360f4b87325105b901bcf61e88b5
-SIZE (electron/electron-yarn-cache-24.5.1.tar.xz) = 41637208
-SHA256 (electron/electron-electron-v24.5.1_GH0.tar.gz) = c88cf942ea69ed3b2d1f2c99066bb9dc5f65974375ba1df5c6486241e30de7d6
-SIZE (electron/electron-electron-v24.5.1_GH0.tar.gz) = 10483935
+SHA256 (electron/electron-yarn-cache-24.6.0.tar.xz) = 8665ed5c603629ebd64e26a1545dee8230cc887ac0eb03d15218925da4af1d49
+SIZE (electron/electron-yarn-cache-24.6.0.tar.xz) = 41637148
+SHA256 (electron/electron-electron-v24.6.0_GH0.tar.gz) = 89bb6fcea7975c24f207568e9cb4cba3ee48d1f1f6658e83ee18ea74a87de0d6
+SIZE (electron/electron-electron-v24.6.0_GH0.tar.gz) = 10490089
 SHA256 (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 31bbccdff73269baebcc9f32c2ffe428f28be79841527c63e95da93e8c630829
 SIZE (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 113058999
 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39

diff --git a/devel/electron24/files/patch-electron_shell_browser_api_electron__api__app.cc b/devel/electron24/files/patch-electron_shell_browser_api_electron__api__app.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/api/electron_api_app.cc.orig	2023-02-06 19:29:11 UTC
+--- electron/shell/browser/api/electron_api_app.cc.orig	2023-06-16 17:43:47 UTC
 +++ electron/shell/browser/api/electron_api_app.cc
-@@ -709,7 +709,7 @@ void App::OnWillFinishLaunching() {
+@@ -697,7 +697,7 @@ void App::OnWillFinishLaunching() {
  }
 
  void App::OnFinishLaunching(base::Value::Dict launch_info) {
@@ -9,7 +9,7 @@
    // Set the application name for audio streams shown in external
    // applications. Only affects pulseaudio currently.
    media::AudioManager::SetGlobalAppName(Browser::Get()->GetName());
-@@ -1039,7 +1039,7 @@ void App::SetPath(gin_helper::ErrorThrower thrower,
+@@ -1027,7 +1027,7 @@ void App::SetPath(gin_helper::ErrorThrower thrower,
  }
 
  void App::SetDesktopName(const std::string& desktop_name) {
@@ -18,7 +18,7 @@
    auto env = base::Environment::Create();
    env->SetVar("CHROME_DESKTOP", desktop_name);
  #endif
-@@ -1428,7 +1428,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
+@@ -1416,7 +1416,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
        pid_dict.Set("name", process_metric.second->name);
      }
 
@@ -27,7 +27,7 @@
      auto memory_info = process_metric.second->GetMemoryInfo();
 
      gin_helper::Dictionary memory_dict = gin::Dictionary::CreateEmpty(isolate);
-@@ -1735,7 +1735,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1723,7 +1723,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
        .SetMethod(
            "removeAsDefaultProtocolClient",
            base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
@@ -36,7 +36,7 @@
        .SetMethod(
            "getApplicationInfoForProtocol",
            base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser))
-@@ -1793,7 +1793,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1781,7 +1781,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
        .SetMethod("getJumpListSettings", &App::GetJumpListSettings)
        .SetMethod("setJumpList", &App::SetJumpList)
  #endif

diff --git a/...24/files/patch-electron_shell_browser_ui_views_inspectable__web__contents__view__views.cc b/...24/files/patch-electron_shell_browser_ui_views_inspectable__web__contents__view__views.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/ui/views/inspectable_web_contents_view_views.cc.orig	2023-02-06 19:29:11 UTC
+--- electron/shell/browser/ui/views/inspectable_web_contents_view_views.cc.orig	2023-06-16 17:43:47 UTC
 +++ electron/shell/browser/ui/views/inspectable_web_contents_view_views.cc
-@@ -186,7 +186,7 @@ void InspectableWebContentsViewViews::SetIsDocked(bool
+@@ -182,7 +182,7 @@ void InspectableWebContentsViewViews::SetIsDocked(bool
      params.delegate = devtools_window_delegate_;
      params.bounds = inspectable_web_contents()->GetDevToolsBounds();
 

diff --git a/devel/electron24/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron24/files/patch-electron_spec_api-browser-window-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec/api-browser-window-spec.ts.orig	2023-06-13 21:28:30 UTC
+--- electron/spec/api-browser-window-spec.ts.orig	2023-06-16 17:43:47 UTC
 +++ electron/spec/api-browser-window-spec.ts
 @@ -59,7 +59,7 @@ describe('BrowserWindow module', () => {
        }).not.to.throw();
@@ -81,16 +81,16 @@
        it('sets 1 regardless of parameter', () => {
          const w = new BrowserWindow({ show: false });
          w.setOpacity(0);
-@@ -3305,7 +3305,7 @@ describe('BrowserWindow module', () => {
-         expect(test.versions).to.deep.equal(process.versions);
-         expect(test.contextId).to.be.a('string');
+@@ -3308,7 +3308,7 @@ describe('BrowserWindow module', () => {
+         expect(test.nodeTimers).to.equal(true);
+         expect(test.nodeUrl).to.equal(true);
 
 -        if (process.platform === 'linux' && test.osSandbox) {
 +        if ((process.platform === 'linux' || process.platform === 'freebsd') && test.osSandbox) {
            expect(test.creationTime).to.be.null('creation time');
            expect(test.systemMemoryInfo).to.be.null('system memory info');
          } else {
-@@ -3811,7 +3811,7 @@ describe('BrowserWindow module', () => {
+@@ -3814,7 +3814,7 @@ describe('BrowserWindow module', () => {
      });
    });
 
@@ -99,7 +99,7 @@
      afterEach(closeAllWindows);
      it('emits an event when window is maximized', async () => {
        const w = new BrowserWindow({ show: false });
-@@ -4082,7 +4082,7 @@ describe('BrowserWindow module', () => {
+@@ -4085,7 +4085,7 @@ describe('BrowserWindow module', () => {
      // TODO(zcbenz):
      // This test does not run on Linux CI. See:
      // https://github.com/electron/electron/issues/28699
@@ -108,7 +108,7 @@
        const w = new BrowserWindow({});
        const maximize = emittedOnce(w, 'maximize');
        w.maximize();
-@@ -4099,7 +4099,7 @@ describe('BrowserWindow module', () => {
+@@ -4102,7 +4102,7 @@ describe('BrowserWindow module', () => {
    });
 
    // TODO(dsanders11): Enable once maximize event works on Linux again on CI
@@ -117,7 +117,7 @@
      afterEach(closeAllWindows);
      it('should show the window if it is not currently shown', async () => {
        const w = new BrowserWindow({ show: false });
-@@ -4136,7 +4136,7 @@ describe('BrowserWindow module', () => {
+@@ -4139,7 +4139,7 @@ describe('BrowserWindow module', () => {
 
      // TODO(dsanders11): Enable once minimize event works on Linux again.
      //                   See https://github.com/electron/electron/issues/28699
@@ -126,7 +126,7 @@
        const w = new BrowserWindow();
        const minimize = emittedOnce(w, 'minimize');
        w.minimize();
-@@ -4569,7 +4569,7 @@ describe('BrowserWindow module', () => {
+@@ -4572,7 +4572,7 @@ describe('BrowserWindow module', () => {
        });
 
        // On Linux there is no "resizable" property of a window.
@@ -135,7 +135,7 @@
          const w = new BrowserWindow({ show: false });
          expect(w.resizable).to.be.true('resizable');
 
-@@ -4661,7 +4661,7 @@ describe('BrowserWindow module', () => {
+@@ -4664,7 +4664,7 @@ describe('BrowserWindow module', () => {
      });
    });
 
@@ -144,7 +144,7 @@
      // Not implemented on Linux.
      afterEach(closeAllWindows);
 
-@@ -5767,7 +5767,7 @@ describe('BrowserWindow module', () => {
+@@ -5770,7 +5770,7 @@ describe('BrowserWindow module', () => {
    describe('"transparent" option', () => {
      afterEach(closeAllWindows);