git: 69284495a28c - main - devel/electron18: update to 18.3.7

From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Sat, 06 Aug 2022 06:06:46 UTC
The branch main has been updated by tagattie:

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

commit 69284495a28c3e525036e0454f733db8d9bbd827
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2022-08-06 06:05:41 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2022-08-06 06:06:39 +0000

    devel/electron18: update to 18.3.7
    
    Changelog: https://github.com/electron/electron/releases/tag/v18.3.7
---
 devel/electron18/Makefile                          |  2 +-
 devel/electron18/Makefile.version                  |  2 +-
 devel/electron18/distinfo                          | 10 +++++-----
 devel/electron18/files/package.json                |  2 +-
 .../files/patch-build_config_compiler_BUILD.gn     | 22 +++++++++++-----------
 ...ell_browser_api_electron__api__web__contents.cc | 10 +++++-----
 ...electron_shell_browser_native__window__views.cc | 18 +++++++++---------
 editors/vscode/Makefile                            |  2 +-
 8 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/devel/electron18/Makefile b/devel/electron18/Makefile
index 356ecf8d5d58..44db7f89d670 100644
--- a/devel/electron18/Makefile
+++ b/devel/electron18/Makefile
@@ -152,7 +152,7 @@ REACTIVEOBJC_VER=		74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
 # See ${WRKSRC}/electron/DEPS for MANTLE_VER
 MANTLE_VER=			78d3966b3c331292ea29ec38661b25df0a245948
 
-YARN_TIMESTAMP=	1659493244
+YARN_TIMESTAMP=	1659680636
 
 GN_ARGS+=		clang_use_chrome_plugins=false \
 			enable_hangout_services_extension=true \
diff --git a/devel/electron18/Makefile.version b/devel/electron18/Makefile.version
index ff09034e3c41..b453915b46a0 100644
--- a/devel/electron18/Makefile.version
+++ b/devel/electron18/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	18.3.6
+ELECTRON_VER=	18.3.7
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron18/distinfo b/devel/electron18/distinfo
index 4d7de46f635f..0c9f8c572992 100644
--- a/devel/electron18/distinfo
+++ b/devel/electron18/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1659493840
+TIMESTAMP = 1659681346
 SHA256 (electron/chromium-100.0.4896.160.tar.xz) = a3f755dff069c6fae3eb7f07b33c0dd3f0762fa82959f41c7bd347da8efbacff
 SIZE (electron/chromium-100.0.4896.160.tar.xz) = 1228994280
 SHA256 (electron/aad6877c8cd3cff0ef1ba628d71acc981c520c29) = 9793d0cfb94bf2ff099682dcd31ef46d1d7f42346c8a2f6355a5f8fda3dcd506
 SIZE (electron/aad6877c8cd3cff0ef1ba628d71acc981c520c29) = 12028653
 SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
 SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650
-SHA256 (electron/electron-yarn-cache-18.3.6.tar.xz) = 024ce2590f2b69f51167b19a9d759298c785eefbbc60623bdc5a68f505681560
-SIZE (electron/electron-yarn-cache-18.3.6.tar.xz) = 38390636
-SHA256 (electron/electron-electron-v18.3.6_GH0.tar.gz) = d055c96172849b65ddd672e5d26ec052ce4061217eed47a5a1a100c661c38016
-SIZE (electron/electron-electron-v18.3.6_GH0.tar.gz) = 10555061
+SHA256 (electron/electron-yarn-cache-18.3.7.tar.xz) = 92136fa751a835aace8ebe68768892ceaf168d7269ef7df0baf62555bcf218b9
+SIZE (electron/electron-yarn-cache-18.3.7.tar.xz) = 38391132
+SHA256 (electron/electron-electron-v18.3.7_GH0.tar.gz) = 8baf3b4860c28b366020522ff5bc57f5fbf5871eb04954dd3f9c1054e18b1bf0
+SIZE (electron/electron-electron-v18.3.7_GH0.tar.gz) = 10564191
 SHA256 (electron/nodejs-node-v16.13.2_GH0.tar.gz) = 93c65be15bfe8151b4a99d529538b23ffc6b5e0202dc7df0e32aa780ab49ad97
 SIZE (electron/nodejs-node-v16.13.2_GH0.tar.gz) = 87972240
 SHA256 (electron/nodejs-nan-65b32af46e9d7fab2e4ff657751205b3865f4920_GH0.tar.gz) = a649b75bfa9c1a0254c73d022c6e98924b9471f593bcc83832daaf68da4cae8d
diff --git a/devel/electron18/files/package.json b/devel/electron18/files/package.json
index 7061669e91db..096a7d8243dc 100644
--- a/devel/electron18/files/package.json
+++ b/devel/electron18/files/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "18.3.6",
+  "version": "18.3.7",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/devel/electron18/files/patch-build_config_compiler_BUILD.gn b/devel/electron18/files/patch-build_config_compiler_BUILD.gn
index e19141bd19a2..1fad9280d1e5 100644
--- a/devel/electron18/files/patch-build_config_compiler_BUILD.gn
+++ b/devel/electron18/files/patch-build_config_compiler_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/compiler/BUILD.gn.orig	2022-05-19 05:17:34 UTC
+--- build/config/compiler/BUILD.gn.orig	2022-08-05 06:39:43 UTC
 +++ build/config/compiler/BUILD.gn
 @@ -236,13 +236,16 @@ config("default_include_dirs") {
  # Compiler instrumentation can introduce dependencies in DSOs to symbols in
@@ -28,8 +28,8 @@
 +
    # Linux-specific compiler flags setup.
    # ------------------------------------
-   if ((is_posix || is_fuchsia) && !is_apple && use_lld) {
-@@ -534,7 +541,7 @@ config("compiler") {
+   if (use_gold) {
+@@ -527,7 +534,7 @@ config("compiler") {
      ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
@@ -38,7 +38,7 @@
      cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
  
      # TODO(hans): Remove this once Clang generates better optimized debug info
-@@ -908,7 +915,7 @@ config("compiler_cpu_abi") {
+@@ -901,7 +908,7 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
@@ -47,7 +47,7 @@
          cflags += [ "--target=arm-linux-gnueabihf" ]
          ldflags += [ "--target=arm-linux-gnueabihf" ]
        }
-@@ -922,7 +929,7 @@ config("compiler_cpu_abi") {
+@@ -915,7 +922,7 @@ config("compiler_cpu_abi") {
          cflags += [ "-mtune=$arm_tune" ]
        }
      } else if (current_cpu == "arm64") {
@@ -56,7 +56,7 @@
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
        }
-@@ -1243,7 +1250,7 @@ config("compiler_deterministic") {
+@@ -1236,7 +1243,7 @@ config("compiler_deterministic") {
      # different build directory like "out/feature_a" and "out/feature_b" if
      # we build same files with same compile flag.
      # Other paths are already given in relative, no need to normalize them.
@@ -65,7 +65,7 @@
        # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
        cflags += [
          "-Xclang",
-@@ -1533,7 +1540,7 @@ config("default_warnings") {
+@@ -1526,7 +1533,7 @@ config("default_warnings") {
          "-Wno-ignored-pragma-optimize",
        ]
  
@@ -74,7 +74,7 @@
          # TODO(https://crbug.com/1016945): Re-enable once ChromeOS toolchain is up to date
          cflags += [ "-Wno-builtin-assume-aligned-alignment" ]
        }
-@@ -1725,7 +1732,7 @@ config("no_chromium_code") {
+@@ -1718,7 +1725,7 @@ config("no_chromium_code") {
        # third-party libraries.
        "-Wno-c++11-narrowing",
      ]
@@ -83,7 +83,7 @@
        cflags += [
          # Disabled for similar reasons as -Wunused-variable.
          "-Wno-unused-but-set-variable",
-@@ -2239,7 +2246,7 @@ config("afdo_optimize_size") {
+@@ -2232,7 +2239,7 @@ config("afdo_optimize_size") {
  # There are some targeted places that AFDO regresses, so we provide a separate
  # config to allow AFDO to be disabled per-target.
  config("afdo") {
@@ -92,7 +92,7 @@
      cflags = []
      if (clang_emit_debug_info_for_profiling) {
        # Add the following flags to generate debug info for profiling.
-@@ -2255,7 +2262,7 @@ config("afdo") {
+@@ -2248,7 +2255,7 @@ config("afdo") {
        cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
        inputs = [ _clang_sample_profile ]
      }
@@ -101,7 +101,7 @@
      cflags = [ "-fauto-profile=${auto_profile_path}" ]
      inputs = [ auto_profile_path ]
    }
-@@ -2398,7 +2405,8 @@ config("symbols") {
+@@ -2391,7 +2398,8 @@ config("symbols") {
      }
    }
  
diff --git a/devel/electron18/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron18/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index f22e974692bd..a92dfcdc2307 100644
--- a/devel/electron18/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron18/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	2022-07-28 16:21:57 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig	2022-08-03 15:32:21 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.cc
 @@ -150,11 +150,11 @@
  #include "ui/base/cocoa/defaults_utils.h"
@@ -23,7 +23,7 @@
    if (auto* linux_ui = views::LinuxUI::instance())
      return linux_ui->GetCursorBlinkInterval();
  #elif BUILDFLAG(IS_WIN)
-@@ -834,7 +834,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -832,7 +832,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));
-@@ -2360,7 +2360,7 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2355,7 +2355,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();
-@@ -2940,7 +2940,7 @@ void WebContents::CopyImageAt(int x, int y) {
+@@ -2935,7 +2935,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
-@@ -3773,7 +3773,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -3768,7 +3768,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
  }
  #endif
  
diff --git a/devel/electron18/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron18/files/patch-electron_shell_browser_native__window__views.cc
index e880528ed9df..02a906063b3a 100644
--- a/devel/electron18/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron18/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.cc.orig	2022-07-28 16:21:57 UTC
+--- electron/shell/browser/native_window_views.cc.orig	2022-08-03 15:32:21 UTC
 +++ electron/shell/browser/native_window_views.cc
 @@ -43,7 +43,7 @@
  #include "ui/wm/core/shadow_types.h"
@@ -54,7 +54,7 @@
  void NativeWindowViews::Maximize() {
    if (IsVisible()) {
      widget()->Maximize();
-@@ -732,7 +732,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -731,7 +731,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_) {
-@@ -964,7 +964,7 @@ bool NativeWindowViews::IsClosable() {
+@@ -963,7 +963,7 @@ bool NativeWindowViews::IsClosable() {
      return false;
    }
    return !(info.fState & MFS_DISABLED);
@@ -72,7 +72,7 @@
    return true;
  #endif
  }
-@@ -1356,7 +1356,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1355,7 +1355,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);
    }
-@@ -1418,7 +1418,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1417,7 +1417,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 =
-@@ -1521,7 +1521,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1520,7 +1520,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());
-@@ -1591,7 +1591,7 @@ bool NativeWindowViews::CanMaximize() const {
+@@ -1590,7 +1590,7 @@ bool NativeWindowViews::CanMaximize() const {
  bool NativeWindowViews::CanMinimize() const {
  #if BUILDFLAG(IS_WIN)
    return minimizable_;
@@ -108,7 +108,7 @@
    return true;
  #endif
  }
-@@ -1665,7 +1665,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1664,7 +1664,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)
-@@ -1684,7 +1684,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1683,7 +1683,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
    // Alt+Click should not toggle menu bar.
    root_view_->ResetAltState();
  
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index ae6527320b9f..e352ad483294 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vscode
 DISTVERSION=	1.69.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \
 		https://nodejs.org/dist/v${NODE_VER}/:node_headers \