devel/electron36: update to 36.2.1

tagattie · tagattie · commit 705ca9901fcc · 2025-05-16T12:35:57.000+09:00
Changelog: https://github.com/electron/electron/releases/tag/v36.2.1
diff --git a/devel/electron36/Makefile b/devel/electron36/Makefile
@@ -217,7 +217,7 @@ SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
-CHROMIUM_VER=			136.0.7103.49
+CHROMIUM_VER=			136.0.7103.93
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=			22.15.0
 # See ${WRKSRC}/electron/DEPS for NAN_VER
diff --git a/devel/electron36/Makefile.version b/devel/electron36/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	36.2.0
+ELECTRON_VER=	36.2.1
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron36/distinfo b/devel/electron36/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1746924726
-SHA256 (electron/chromium-136.0.7103.49.tar.xz) = e00fdc12ba53d1c65c129e1476b0a30f6b054892f8ae4bde8f59842de6542435
-SIZE (electron/chromium-136.0.7103.49.tar.xz) = 7182205772
+TIMESTAMP = 1747316807
+SHA256 (electron/chromium-136.0.7103.93.tar.xz) = db98c44d9e47325b79b0aa24885d41e42ed6254973c34ee85f197a510a42f54b
+SIZE (electron/chromium-136.0.7103.93.tar.xz) = 7189003340
 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-36.2.0.tar.xz) = 95bd287084ffb970f023ff11d8700b543db04a4fb7ccc4692420d2e7ac46f7f5
-SIZE (electron/electron-yarn-cache-36.2.0.tar.xz) = 29892300
-SHA256 (electron/electron-electron-v36.2.0_GH0.tar.gz) = 1d6d102919dc80df4753f42f274de4256b9e253f890576529a090be475072554
-SIZE (electron/electron-electron-v36.2.0_GH0.tar.gz) = 15774986
+SHA256 (electron/electron-yarn-cache-36.2.1.tar.xz) = 95bd287084ffb970f023ff11d8700b543db04a4fb7ccc4692420d2e7ac46f7f5
+SIZE (electron/electron-yarn-cache-36.2.1.tar.xz) = 29892300
+SHA256 (electron/electron-electron-v36.2.1_GH0.tar.gz) = 1336a88dd5fbc49c34939de5eb95000bf4e36400274d59e48d7ee38b45b07090
+SIZE (electron/electron-electron-v36.2.1_GH0.tar.gz) = 15777294
 SHA256 (electron/nodejs-node-v22.15.0_GH0.tar.gz) = 4f2515e143ffd73f069916ecc5daf503e7a05166c0ae4f1c1f8afdc8ab2f8a82
 SIZE (electron/nodejs-node-v22.15.0_GH0.tar.gz) = 122833296
 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
diff --git a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron36/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	2025-05-07 07:36:13 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig	2025-05-12 02:18:43 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.cc
 @@ -159,11 +159,11 @@
  #include "ui/base/cocoa/defaults_utils.h"
@@ -32,7 +32,7 @@
    if (auto* linux_ui = ui::LinuxUi::instance())
      return linux_ui->GetCursorBlinkInterval();
  #elif BUILDFLAG(IS_WIN)
-@@ -930,7 +930,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -929,7 +929,7 @@ void WebContents::InitWithSessionAndOptions(
    accept_languages.pop_back();
    prefs->accept_languages = accept_languages;
  
@@ -41,7 +41,7 @@
    // Update font settings.
    static const gfx::FontRenderParams params(
        gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
-@@ -2665,13 +2665,13 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2662,13 +2662,13 @@ void WebContents::ForcefullyCrashRenderer() {
  
    content::RenderProcessHost* rph = rwh->GetProcess();
    if (rph) {
@@ -57,7 +57,7 @@
      CrashDumpHungChildProcess(rph->GetProcess().Handle());
  #endif
      rph->Shutdown(content::RESULT_CODE_HUNG);
-@@ -3362,7 +3362,7 @@ void WebContents::Focus() {
+@@ -3339,7 +3339,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.
@@ -66,7 +66,7 @@
    if (owner_window())
      owner_window()->Focus(true);
  #endif
-@@ -4238,7 +4238,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -4215,7 +4215,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
  }
  #endif
  
diff --git a/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/native_window_views.cc.orig	2025-05-07 07:36:13 UTC
+--- electron/shell/browser/native_window_views.cc.orig	2025-05-12 02:18:43 UTC
 +++ electron/shell/browser/native_window_views.cc
-@@ -50,7 +50,7 @@
+@@ -51,7 +51,7 @@
  #include "ui/wm/core/shadow_types.h"
  #include "ui/wm/core/window_util.h"
  
@@ -9,7 +9,7 @@
  #include "base/strings/string_util.h"
  #include "shell/browser/browser.h"
  #include "shell/browser/linux/unity_service.h"
-@@ -294,7 +294,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -295,7 +295,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.
    if (options.ValueOrDefault(options::kDarkTheme, false))
      SetGTKDarkThemeEnabled(true);
-@@ -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) {
@@ -108,7 +108,7 @@
    auto display =
        display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeWindow());
    gfx::Rect window_bounds_in_screen = display.work_area();
-@@ -1361,7 +1361,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
+@@ -1362,7 +1362,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();
-@@ -1416,7 +1416,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* 
+@@ -1417,7 +1417,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(
-@@ -1462,7 +1462,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1463,7 +1463,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);
    }
-@@ -1556,7 +1556,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
+@@ -1557,7 +1557,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
    if (const auto* view_native_widget = widget()->native_widget_private())
      return view_native_widget->IsVisibleOnAllWorkspaces();
  
@@ -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.
-@@ -1579,7 +1579,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1580,7 +1580,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 =
-@@ -1677,7 +1677,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1678,7 +1678,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());
-@@ -1773,7 +1773,7 @@ bool NativeWindowViews::CanMinimize() const {
+@@ -1774,7 +1774,7 @@ bool NativeWindowViews::CanMinimize() const {
  bool NativeWindowViews::CanMinimize() const {
  #if BUILDFLAG(IS_WIN)
    return minimizable_;
@@ -171,7 +171,7 @@
    return true;
  #endif
  }
-@@ -1829,7 +1829,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1830,7 +1830,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)
-@@ -1848,7 +1848,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1849,7 +1849,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
    // Alt+Click should not toggle menu bar.
    root_view_.ResetAltState();
  
diff --git a/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec/api-browser-window-spec.ts.orig	2025-05-07 07:36:13 UTC
+--- electron/spec/api-browser-window-spec.ts.orig	2025-05-12 02:18:43 UTC
 +++ electron/spec/api-browser-window-spec.ts
 @@ -69,7 +69,7 @@ describe('BrowserWindow module', () => {
        }).not.to.throw();
@@ -162,7 +162,7 @@
          const w = new BrowserWindow({ show: false });
          expect(w.resizable).to.be.true('resizable');
  
-@@ -5430,7 +5430,7 @@ describe('BrowserWindow module', () => {
+@@ -5481,7 +5481,7 @@ describe('BrowserWindow module', () => {
      });
    });
  
diff --git a/devel/electron36/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c b/devel/electron36/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c
@@ -1,6 +1,6 @@
---- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig	2025-03-24 20:50:14 UTC
+--- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig	2025-05-05 19:42:33 UTC
 +++ third_party/sqlite/src/amalgamation_dev/sqlite3.c
-@@ -14187,7 +14187,7 @@ struct fts5_api {
+@@ -14486,7 +14486,7 @@ struct fts5_api {
  ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
  ** it.
  */
diff --git a/devel/electron36/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/devel/electron36/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
@@ -1,6 +1,6 @@
---- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2024-10-16 21:34:25 UTC
+--- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2025-05-05 19:42:33 UTC
 +++ third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -14187,7 +14187,7 @@ struct fts5_api {
+@@ -14486,7 +14486,7 @@ struct fts5_api {
  ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
  ** it.
  */
@@ -9,7 +9,7 @@
  #  define _XOPEN_SOURCE 600
  #endif
  
-@@ -45183,7 +45183,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -45387,7 +45387,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
    memset(zBuf, 0, nBuf);
    randomnessPid = osGetpid(0);
  #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS)
@@ -22,7 +22,7 @@
      int fd, got;
      fd = robust_open("/dev/urandom", O_RDONLY, 0);
      if( fd<0 ){
-@@ -45198,6 +45203,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -45402,6 +45407,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
        robust_close(0, fd, __LINE__);
      }
    }
diff --git a/devel/electron36/files/patch-ui_gtk_gtk__compat.cc b/devel/electron36/files/patch-ui_gtk_gtk__compat.cc
@@ -1,12 +1,12 @@
---- ui/gtk/gtk_compat.cc.orig	2025-05-11 11:50:45 UTC
+--- ui/gtk/gtk_compat.cc.orig	2025-05-15 14:01:16 UTC
 +++ ui/gtk/gtk_compat.cc
 @@ -65,22 +65,38 @@ void* GetLibGio() {
  }
  
  void* GetLibGio() {
 +#if BUILDFLAG(IS_BSD)
 +  static void* libgio = DlOpen("libgio-2.0.so");
-+#else  
++#else
    static void* libgio = DlOpen("libgio-2.0.so.0");
 +#endif
    return libgio;
diff --git a/devel/electron36/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc b/devel/electron36/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
@@ -0,0 +1,13 @@
+--- ui/ozone/platform/wayland/host/wayland_frame_manager.cc.orig	2025-05-05 19:42:33 UTC
++++ ui/ozone/platform/wayland/host/wayland_frame_manager.cc
+@@ -461,8 +461,10 @@ std::optional<bool> WaylandFrameManager::ApplySurfaceC
+   surface->UpdateBufferDamageRegion(
+       gfx::ToEnclosingRectIgnoringError(surface_damage));
+ 
++#if !BUILDFLAG(IS_BSD)
+   if (!config.access_fence_handle.is_null())
+     surface->set_acquire_fence(std::move(config.access_fence_handle));
++#endif
+ 
+   bool needs_commit = false;
+ 
diff --git a/devel/electron36/files/patch-ui_platform__window_platform__window__delegate.h b/devel/electron36/files/patch-ui_platform__window_platform__window__delegate.h
@@ -1,6 +1,6 @@
---- ui/platform_window/platform_window_delegate.h.orig	2025-04-22 20:15:27 UTC
+--- ui/platform_window/platform_window_delegate.h.orig	2025-05-05 19:42:33 UTC
 +++ ui/platform_window/platform_window_delegate.h
-@@ -140,7 +140,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
+@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
    virtual void OnWindowStateChanged(PlatformWindowState old_state,
                                      PlatformWindowState new_state) = 0;
  

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-ELECTRON_VER= 36.2.0`
	`1`	`+ELECTRON_VER= 36.2.1`
`2`	`2`	`ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}`