git: dbdf333abfed - main - devel/electron34: update to 34.5.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Sat, 19 Apr 2025 12:15:10 UTC
The branch main has been updated by tagattie:

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

commit dbdf333abfed34c3f6b95962e7797619da6ad009
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2025-04-19 12:12:10 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-04-19 12:15:02 +0000

    devel/electron34: update to 34.5.1
    
    Changelog:
    - https://github.com/electron/electron/releases/tag/v34.5.0
    - https://github.com/electron/electron/releases/tag/v34.5.1
    
    Reported by:    GitHub (watch releases)
---
 devel/electron34/Makefile                          |  3 +-
 devel/electron34/Makefile.version                  |  2 +-
 devel/electron34/distinfo                          | 14 ++++----
 .../electron34/files/patch-build_rust_std_BUILD.gn |  6 ++--
 ...hell_browser_api_electron__api__base__window.cc |  8 ++---
 ...shell_browser_api_electron__api__base__window.h |  4 +--
 ...ell_browser_api_electron__api__web__contents.cc | 10 +++---
 ...electron_shell_browser_native__window__views.cc | 42 +++++++++++-----------
 ...n_shell_common_gin__converters_std__converter.h |  8 ++---
 9 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/devel/electron34/Makefile b/devel/electron34/Makefile
index 667f28aba955..4fb71e179bcd 100644
--- a/devel/electron34/Makefile
+++ b/devel/electron34/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER}
-PORTREVISION=	1
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	devel
@@ -222,7 +221,7 @@ SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
 CHROMIUM_VER=			132.0.6834.210
 # See ${WRKSRC}/electron/DEPS for NODE_VER
-NODE_VER=			20.18.3
+NODE_VER=			20.19.0
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=			e14bdcd1f72d62bca1d541b66da43130384ec213
 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
diff --git a/devel/electron34/Makefile.version b/devel/electron34/Makefile.version
index 6d1ad3ba70ad..8bf22d588380 100644
--- a/devel/electron34/Makefile.version
+++ b/devel/electron34/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	34.4.1
+ELECTRON_VER=	34.5.1
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron34/distinfo b/devel/electron34/distinfo
index 4eef7bb54e29..0bab4bf86302 100644
--- a/devel/electron34/distinfo
+++ b/devel/electron34/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1743155379
+TIMESTAMP = 1744883818
 SHA256 (electron/chromium-132.0.6834.210.tar.xz.0) = ede58a1501f175aaa6c92e47793b773ed10b31a43d600375cb40727c4ae677d5
 SIZE (electron/chromium-132.0.6834.210.tar.xz.0) = 2000000000
 SHA256 (electron/chromium-132.0.6834.210.tar.xz.1) = 6d080b3948ef1d63d08b8cc1390662a439e635b881561434787b8b67ea99b08d
@@ -7,12 +7,12 @@ SHA256 (electron/chromium-132.0.6834.210.tar.xz.2) = 989e234492cf50454303ec6f490
 SIZE (electron/chromium-132.0.6834.210.tar.xz.2) = 484148560
 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-34.4.1.tar.xz) = f0fa33e22a0b00e5440fbc57517f7b303d43ca07c25e43f35e28f97c2ce12c83
-SIZE (electron/electron-yarn-cache-34.4.1.tar.xz) = 29062184
-SHA256 (electron/electron-electron-v34.4.1_GH0.tar.gz) = 692ef9a90b762c0e08f25e1b1b81df72cc4f0b77e1574df5a0312724da6c1192
-SIZE (electron/electron-electron-v34.4.1_GH0.tar.gz) = 14845210
-SHA256 (electron/nodejs-node-v20.18.3_GH0.tar.gz) = a2049a1607fbc5b9ec4336d9d04faeeb9b8efdc9ec853e8ddf7cf419be9dbb3d
-SIZE (electron/nodejs-node-v20.18.3_GH0.tar.gz) = 115601859
+SHA256 (electron/electron-yarn-cache-34.5.1.tar.xz) = f0fa33e22a0b00e5440fbc57517f7b303d43ca07c25e43f35e28f97c2ce12c83
+SIZE (electron/electron-yarn-cache-34.5.1.tar.xz) = 29062184
+SHA256 (electron/electron-electron-v34.5.1_GH0.tar.gz) = 996a48c05b9686fd6d22e7fb0d24ade4db068e293545055aed7816abc9e24af4
+SIZE (electron/electron-electron-v34.5.1_GH0.tar.gz) = 14847394
+SHA256 (electron/nodejs-node-v20.19.0_GH0.tar.gz) = 110955872bb826e0e59eb88018219dd0828d2276b77598c64f50140e97a9d704
+SIZE (electron/nodejs-node-v20.19.0_GH0.tar.gz) = 116087668
 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
 SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646
 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01
diff --git a/devel/electron34/files/patch-build_rust_std_BUILD.gn b/devel/electron34/files/patch-build_rust_std_BUILD.gn
index 473f4c097e4b..0efb06e75eb1 100644
--- a/devel/electron34/files/patch-build_rust_std_BUILD.gn
+++ b/devel/electron34/files/patch-build_rust_std_BUILD.gn
@@ -1,6 +1,6 @@
---- build/rust/std/BUILD.gn.orig	2025-04-05 13:54:50 UTC
+--- build/rust/std/BUILD.gn.orig	2025-02-24 19:59:26 UTC
 +++ build/rust/std/BUILD.gn
-@@ -89,13 +89,20 @@ if (toolchain_has_rust) {
+@@ -74,13 +74,20 @@ if (toolchain_has_rust) {
      # These are no longer present in the Windows toolchain.
      stdlib_files += [
        "addr2line",
@@ -22,7 +22,7 @@
    }
  
    if (toolchain_for_rust_host_build_tools) {
-@@ -115,7 +122,6 @@ if (toolchain_has_rust) {
+@@ -100,7 +107,6 @@ if (toolchain_has_rust) {
    # don't need to pass to the C++ linker because they're used for specialized
    # purposes.
    skip_stdlib_files = [
diff --git a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.cc b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.cc
index 8fd44bacabf1..147b610b4673 100644
--- a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.cc
+++ b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/api/electron_api_base_window.cc.orig	2025-03-10 00:01:50 UTC
+--- electron/shell/browser/api/electron_api_base_window.cc.orig	2025-04-08 22:12:25 UTC
 +++ electron/shell/browser/api/electron_api_base_window.cc
 @@ -41,7 +41,7 @@
  #include "shell/browser/ui/views/win_frame_view.h"
@@ -9,7 +9,7 @@
  #include "shell/browser/ui/views/opaque_frame_view.h"
  #endif
  
-@@ -998,7 +998,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
+@@ -986,7 +986,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
    static_cast<NativeWindowViews*>(window_.get())
        ->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)),
                  native_image->GetHICON(GetSystemMetrics(SM_CXICON)));
@@ -18,7 +18,7 @@
    static_cast<NativeWindowViews*>(window_.get())
        ->SetIcon(native_image->image().AsImageSkia());
  #endif
-@@ -1055,7 +1055,7 @@ void BaseWindow::SetAppDetails(const gin_helper::Dicti
+@@ -1043,7 +1043,7 @@ void BaseWindow::SetAppDetails(const gin_helper::Dicti
  }
  #endif
  
@@ -27,7 +27,7 @@
  void BaseWindow::SetTitleBarOverlay(const gin_helper::Dictionary& options,
                                      gin_helper::Arguments* args) {
    // Ensure WCO is already enabled on this window
-@@ -1306,7 +1306,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
+@@ -1294,7 +1294,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
        .SetMethod("setThumbnailToolTip", &BaseWindow::SetThumbnailToolTip)
        .SetMethod("setAppDetails", &BaseWindow::SetAppDetails)
  #endif
diff --git a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.h b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.h
index 39b751e3ce9d..e4bf43ae5072 100644
--- a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.h
+++ b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__base__window.h
@@ -1,6 +1,6 @@
---- electron/shell/browser/api/electron_api_base_window.h.orig	2025-03-10 00:01:50 UTC
+--- electron/shell/browser/api/electron_api_base_window.h.orig	2025-04-08 22:12:25 UTC
 +++ electron/shell/browser/api/electron_api_base_window.h
-@@ -250,7 +250,7 @@ class BaseWindow : public gin_helper::TrackableObject<
+@@ -251,7 +251,7 @@ class BaseWindow : public gin_helper::TrackableObject<
    void SetAppDetails(const gin_helper::Dictionary& options);
  #endif
  
diff --git a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index 4e641366d230..5738b7a8af18 100644
--- a/devel/electron34/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron34/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	2025-03-27 16:32:44 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig	2025-04-08 22:12:25 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.cc
-@@ -156,11 +156,11 @@
+@@ -157,11 +157,11 @@
  #include "ui/base/cocoa/defaults_utils.h"
  #endif
  
@@ -14,7 +14,7 @@
  #include "ui/aura/window.h"
  #include "ui/gfx/font_render_params.h"
  #endif
-@@ -192,7 +192,7 @@
+@@ -193,7 +193,7 @@
  #include "content/public/browser/plugin_service.h"
  #endif
  
@@ -23,7 +23,7 @@
  #include "chrome/browser/hang_monitor/hang_crash_dump.h"  // nogncheck
  #endif
  
-@@ -566,7 +566,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval(
+@@ -567,7 +567,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval(
        ui::TextInsertionCaretBlinkPeriodFromDefaults());
    if (system_value)
      return *system_value;
@@ -32,7 +32,7 @@
    if (auto* linux_ui = ui::LinuxUi::instance())
      return linux_ui->GetCursorBlinkInterval();
  #elif BUILDFLAG(IS_WIN)
-@@ -927,7 +927,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -928,7 +928,7 @@ void WebContents::InitWithSessionAndOptions(
    accept_languages.pop_back();
    prefs->accept_languages = accept_languages;
  
diff --git a/devel/electron34/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron34/files/patch-electron_shell_browser_native__window__views.cc
index c5ac0e0dbe55..e30f7edbb8eb 100644
--- a/devel/electron34/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron34/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.cc.orig	2025-03-10 00:01:50 UTC
+--- electron/shell/browser/native_window_views.cc.orig	2025-04-08 22:12:25 UTC
 +++ electron/shell/browser/native_window_views.cc
 @@ -49,7 +49,7 @@
  #include "ui/wm/core/shadow_types.h"
@@ -9,7 +9,7 @@
  #include "base/strings/string_util.h"
  #include "shell/browser/browser.h"
  #include "shell/browser/linux/unity_service.h"
-@@ -293,7 +293,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -294,7 +294,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
      params.parent = parent->GetNativeWindow();
  
    params.native_widget = new ElectronDesktopNativeWidgetAura(this);
@@ -18,7 +18,7 @@
    std::string name = Browser::Get()->GetName();
    // Set WM_WINDOW_ROLE.
    params.wm_role_name = "browser-window";
-@@ -319,7 +319,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -320,7 +320,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
    std::string window_type;
    options.Get(options::kType, &window_type);
  
@@ -27,7 +27,7 @@
    // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.
    bool use_dark_theme = false;
    if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) {
-@@ -426,7 +426,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -427,7 +427,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
    if (window)
      window->AddPreTargetHandler(this);
  
@@ -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);
-@@ -462,7 +462,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us
+@@ -463,7 +463,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us
  }
  
  void NativeWindowViews::SetGTKDarkThemeEnabled(bool use_dark_theme) {
@@ -45,7 +45,7 @@
    if (IsX11()) {
      const std::string color = use_dark_theme ? "dark" : "light";
      auto* connection = x11::Connection::Get();
-@@ -524,7 +524,7 @@ void NativeWindowViews::Show() {
+@@ -525,7 +525,7 @@ void NativeWindowViews::Show() {
  
    NotifyWindowShow();
  
@@ -54,7 +54,7 @@
    if (global_menu_bar_)
      global_menu_bar_->OnWindowMapped();
  
-@@ -540,7 +540,7 @@ void NativeWindowViews::ShowInactive() {
+@@ -541,7 +541,7 @@ void NativeWindowViews::ShowInactive() {
  
    NotifyWindowShow();
  
@@ -63,7 +63,7 @@
    if (global_menu_bar_)
      global_menu_bar_->OnWindowMapped();
  
-@@ -559,7 +559,7 @@ void NativeWindowViews::Hide() {
+@@ -560,7 +560,7 @@ void NativeWindowViews::Hide() {
  
    NotifyWindowHide();
  
@@ -72,7 +72,7 @@
    if (global_menu_bar_)
      global_menu_bar_->OnWindowUnmapped();
  #endif
-@@ -590,7 +590,7 @@ bool NativeWindowViews::IsEnabled() const {
+@@ -591,7 +591,7 @@ bool NativeWindowViews::IsEnabled() const {
  bool NativeWindowViews::IsEnabled() const {
  #if BUILDFLAG(IS_WIN)
    return ::IsWindowEnabled(GetAcceleratedWidget());
@@ -81,7 +81,7 @@
    if (IsX11())
      return !event_disabler_.get();
    NOTIMPLEMENTED();
-@@ -833,7 +833,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -831,7 +831,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
    }
  #endif
  
@@ -90,7 +90,7 @@
    // On Linux and Windows the minimum and maximum size should be updated with
    // window size when window is not resizable.
    if (!resizable_) {
-@@ -1091,7 +1091,7 @@ bool NativeWindowViews::IsClosable() const {
+@@ -1089,7 +1089,7 @@ bool NativeWindowViews::IsClosable() const {
      return false;
    }
    return !(info.fState & MFS_DISABLED);
@@ -99,7 +99,7 @@
    return true;
  #endif
  }
-@@ -1131,7 +1131,7 @@ void NativeWindowViews::Center() {
+@@ -1129,7 +1129,7 @@ void NativeWindowViews::Center() {
  // for now to avoid breaking API contract, but should consider the long
  // term plan for this aligning with upstream.
  void NativeWindowViews::Center() {
@@ -108,7 +108,7 @@
    auto display =
        display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeWindow());
    gfx::Rect window_bounds_in_screen = display.work_area();
-@@ -1352,7 +1352,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
+@@ -1350,7 +1350,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
  }
  
  void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) {
@@ -117,7 +117,7 @@
    // Remove global menu bar.
    if (global_menu_bar_ && menu_model == nullptr) {
      global_menu_bar_.reset();
-@@ -1407,7 +1407,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* 
+@@ -1405,7 +1405,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* 
  void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
    NativeWindow::SetParentWindow(parent);
  
@@ -126,7 +126,7 @@
    if (IsX11()) {
      auto* connection = x11::Connection::Get();
      connection->SetProperty(
-@@ -1453,7 +1453,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1451,7 +1451,7 @@ void NativeWindowViews::SetProgressBar(double progress
                                         NativeWindow::ProgressState state) {
  #if BUILDFLAG(IS_WIN)
    taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
@@ -135,7 +135,7 @@
    if (unity::IsRunning()) {
      unity::SetProgressFraction(progress);
    }
-@@ -1524,7 +1524,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
+@@ -1522,7 +1522,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
  }
  
  bool NativeWindowViews::IsVisibleOnAllWorkspaces() const {
@@ -144,7 +144,7 @@
    if (IsX11()) {
      // Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to
      // determine whether the current window is visible on all workspaces.
-@@ -1547,7 +1547,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1545,7 +1545,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
  #if BUILDFLAG(IS_WIN)
    window_handle =
        reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
@@ -153,7 +153,7 @@
    window_handle = static_cast<uint32_t>(accelerated_widget);
  #endif
    aura::WindowTreeHost* const host =
-@@ -1645,7 +1645,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1643,7 +1643,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
    SendMessage(hwnd, WM_SETICON, ICON_BIG,
                reinterpret_cast<LPARAM>(app_icon_.get()));
  }
@@ -162,7 +162,7 @@
  void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
    auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
        GetAcceleratedWidget());
-@@ -1741,7 +1741,7 @@ bool NativeWindowViews::CanMinimize() const {
+@@ -1739,7 +1739,7 @@ bool NativeWindowViews::CanMinimize() const {
  bool NativeWindowViews::CanMinimize() const {
  #if BUILDFLAG(IS_WIN)
    return minimizable_;
@@ -171,7 +171,7 @@
    return true;
  #endif
  }
-@@ -1797,7 +1797,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1795,7 +1795,7 @@ void NativeWindowViews::HandleKeyboardEvent(
    if (widget_destroyed_)
      return;
  
@@ -180,7 +180,7 @@
    if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
      NotifyWindowExecuteAppCommand(kBrowserBackward);
    else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-@@ -1816,7 +1816,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1814,7 +1814,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
    // Alt+Click should not toggle menu bar.
    root_view_.ResetAltState();
  
diff --git a/devel/electron34/files/patch-electron_shell_common_gin__converters_std__converter.h b/devel/electron34/files/patch-electron_shell_common_gin__converters_std__converter.h
index 8fb16f713e95..b17676a14e13 100644
--- a/devel/electron34/files/patch-electron_shell_common_gin__converters_std__converter.h
+++ b/devel/electron34/files/patch-electron_shell_common_gin__converters_std__converter.h
@@ -1,8 +1,8 @@
---- electron/shell/common/gin_converters/std_converter.h.orig	2023-08-14 18:19:06 UTC
+--- electron/shell/common/gin_converters/std_converter.h.orig	2025-04-08 22:12:25 UTC
 +++ electron/shell/common/gin_converters/std_converter.h
-@@ -28,7 +28,7 @@ v8::Local<v8::Value> ConvertToV8(v8::Isolate* isolate,
-       isolate, std::forward<T>(input));
- }
+@@ -57,7 +57,7 @@ struct Converter<std::array<T, N>> {
+   }
+ };
  
 -#if !BUILDFLAG(IS_LINUX)
 +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)