devel/electron33: update to 33.2.1

Changelog: https://github.com/electron/electron/releases/tag/v33.2.1
tagattie · Dec 2, 2024 · d6d7de6 · d6d7de6
1 parent af07889
commit d6d7de6
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 63 deletions.
diff --git a/devel/electron33/Makefile b/devel/electron33/Makefile
@@ -4,13 +4,17 @@ DISTVERSION=	${ELECTRON_VER}
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	devel
-MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \
+MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v33.2.1/:chromium \
 		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
-DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
+DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
+		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.1:chromium \
+		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.2:chromium \
 		pulseaudio-${PULSEV}.tar.gz:pulseaudio \
 		electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
 DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX} \
+		${DISTFILES:C/:[^:]+$//:C/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}\.[0-9]//}
 
 MAINTAINER=	[email protected]
 COMMENT=	Build cross-platform desktop apps with JavaScript, HTML, and CSS
@@ -216,9 +220,9 @@ SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
-CHROMIUM_VER=			130.0.6723.118
+CHROMIUM_VER=			130.0.6723.137
 # See ${WRKSRC}/electron/DEPS for NODE_VER
-NODE_VER=			20.18.0
+NODE_VER=			20.18.1
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=			e14bdcd1f72d62bca1d541b66da43130384ec213
 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
@@ -316,6 +320,12 @@ pre-fetch:
 		${RM} -r ${WRKDIR}; \
 	fi
 
+post-fetch:
+	@if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX} ]; then \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.? > \
+			${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}; \
+	fi
+
 post-extract:
 # Move extracted sources to appropriate locations
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}

diff --git a/devel/electron33/Makefile.version b/devel/electron33/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	33.2.0
+ELECTRON_VER=	33.2.1
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron33/distinfo b/devel/electron33/distinfo
@@ -1,14 +1,18 @@
-TIMESTAMP = 1731316814
-SHA256 (electron/chromium-130.0.6723.118.tar.xz) = a0a9a740ebb864e89febf4d5480ffbf31b45ac5a506ae70184fa842e27b2d177
-SIZE (electron/chromium-130.0.6723.118.tar.xz) = 6627498992
+TIMESTAMP = 1733130867
+SHA256 (electron/chromium-130.0.6723.137.tar.xz.0) = 809af97db87e314bc2afe2e4035da77f75b3a32437fc8392a815763c690fc7c8
+SIZE (electron/chromium-130.0.6723.137.tar.xz.0) = 2000000000
+SHA256 (electron/chromium-130.0.6723.137.tar.xz.1) = 46c687884e198bcccd2c24427cd71b0be4ca33706d03c3d644fc0d2b1382bdea
+SIZE (electron/chromium-130.0.6723.137.tar.xz.1) = 2000000000
+SHA256 (electron/chromium-130.0.6723.137.tar.xz.2) = 8a66cfac90e1ee27b0df23856f0609e46871836f46b3cb80442be0b9f0d1118c
+SIZE (electron/chromium-130.0.6723.137.tar.xz.2) = 683090356
 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-33.2.0.tar.xz) = fbfce89a9781eba6a8dc2582fcc979f2cb4adbd95c42a09f595c7dfa45a47fdf
-SIZE (electron/electron-yarn-cache-33.2.0.tar.xz) = 32181868
-SHA256 (electron/electron-electron-v33.2.0_GH0.tar.gz) = 6a0589bbdbf1d5ccc8508b536c1beeb5f49cedb1806dc0de9b04f568946be056
-SIZE (electron/electron-electron-v33.2.0_GH0.tar.gz) = 14663878
-SHA256 (electron/nodejs-node-v20.18.0_GH0.tar.gz) = 651bb82f6af18084070893559643759165ce050b5839f830d4cc098130d3ad89
-SIZE (electron/nodejs-node-v20.18.0_GH0.tar.gz) = 115526827
+SHA256 (electron/electron-yarn-cache-33.2.1.tar.xz) = fbfce89a9781eba6a8dc2582fcc979f2cb4adbd95c42a09f595c7dfa45a47fdf
+SIZE (electron/electron-yarn-cache-33.2.1.tar.xz) = 32181868
+SHA256 (electron/electron-electron-v33.2.1_GH0.tar.gz) = c515353b586a3b1ef0a3ebbf71d198f67d75ce42bf790a445d1b96c2bc20f9b3
+SIZE (electron/electron-electron-v33.2.1_GH0.tar.gz) = 14673660
+SHA256 (electron/nodejs-node-v20.18.1_GH0.tar.gz) = e52a6d719db786fffdc7ac3dc623023803336d8ce7a1dd61d9f68bd851d2a921
+SIZE (electron/nodejs-node-v20.18.1_GH0.tar.gz) = 115585611
 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/electron33/files/patch-electron_shell_browser_api_electron__api__app.cc b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__app.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/api/electron_api_app.cc.orig	2024-09-04 18:50:02 UTC
+--- electron/shell/browser/api/electron_api_app.cc.orig	2024-11-27 04:18:00 UTC
 +++ electron/shell/browser/api/electron_api_app.cc
 @@ -92,7 +92,7 @@
  #include "shell/browser/ui/cocoa/electron_bundle_mover.h"
@@ -36,7 +36,7 @@
    auto env = base::Environment::Create();
    env->SetVar("CHROME_DESKTOP", desktop_name);
  #endif
-@@ -1033,7 +1033,7 @@ bool App::RequestSingleInstanceLock(gin::Arguments* ar
+@@ -1032,7 +1032,7 @@ bool App::RequestSingleInstanceLock(gin::Arguments* ar
        base::BindRepeating(NotificationCallbackWrapper, cb));
  #endif
 
@@ -45,7 +45,7 @@
    // Read the xdg-activation token and set it in the command line for the
    // duration of the notification in order to ensure this is propagated to an
    // already running electron app instance if it exists.
-@@ -1328,7 +1328,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
+@@ -1327,7 +1327,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
        pid_dict.Set("name", process_metric.second->name);
      }
 
@@ -54,7 +54,7 @@
      auto memory_info = process_metric.second->GetMemoryInfo();
 
      auto memory_dict = gin_helper::Dictionary::CreateEmpty(isolate);
-@@ -1702,7 +1702,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1701,7 +1701,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
        .SetMethod(
            "removeAsDefaultProtocolClient",
            base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
@@ -63,7 +63,7 @@
        .SetMethod(
            "getApplicationInfoForProtocol",
            base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser))
-@@ -1760,7 +1760,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1759,7 +1759,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
        .SetMethod("getJumpListSettings", &App::GetJumpListSettings)
        .SetMethod("setJumpList", &App::SetJumpList)
  #endif

diff --git a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/api/electron_api_crash_reporter.cc.orig	2024-10-22 02:29:46 UTC
+--- electron/shell/browser/api/electron_api_crash_reporter.cc.orig	2024-11-27 04:18:00 UTC
 +++ electron/shell/browser/api/electron_api_crash_reporter.cc
 @@ -29,7 +29,7 @@
  #include "shell/common/process_util.h"
@@ -36,7 +36,7 @@
  void GetUploadedReports(
      v8::Isolate* isolate,
      base::OnceCallback<void(v8::Local<v8::Value>)> callback) {
-@@ -237,13 +237,13 @@ void SetUploadToServer(bool upload) {
+@@ -236,13 +236,13 @@ void SetUploadToServer(bool upload) {
  #endif
 
  void SetUploadToServer(bool upload) {
@@ -52,7 +52,7 @@
    return false;
  #else
    return ElectronCrashReporterClient::Get()->GetCollectStatsConsent();
-@@ -252,7 +252,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolat
+@@ -251,7 +251,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolat
 
  v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
    std::map<std::string, std::string> keys;
@@ -61,7 +61,7 @@
    electron::crash_keys::GetCrashKeys(&keys);
  #endif
    return gin::ConvertToV8(isolate, keys);
-@@ -264,7 +264,7 @@ void Initialize(v8::Local<v8::Object> exports,
+@@ -263,7 +263,7 @@ void Initialize(v8::Local<v8::Object> exports,
                  void* priv) {
    gin_helper::Dictionary dict(context->GetIsolate(), exports);
    dict.SetMethod("start", &electron::api::crash_reporter::Start);

diff --git a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron33/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	2024-11-07 16:14:43 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig	2024-11-27 04:18:00 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.cc
-@@ -153,11 +153,11 @@
+@@ -155,11 +155,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
-@@ -188,7 +188,7 @@
+@@ -190,7 +190,7 @@
  #include "content/public/browser/plugin_service.h"
  #endif
 
@@ -23,7 +23,7 @@
  #include "chrome/browser/hang_monitor/hang_crash_dump.h"  // nogncheck
  #endif
 
-@@ -513,7 +513,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval(
+@@ -515,7 +515,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)
-@@ -893,7 +893,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -885,7 +885,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));
-@@ -2657,13 +2657,13 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2667,13 +2667,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);
-@@ -3336,7 +3336,7 @@ void WebContents::Focus() {
+@@ -3346,7 +3346,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
-@@ -4212,7 +4212,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -4222,7 +4222,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
  }
  #endif
 

diff --git a/devel/electron33/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron33/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.cc.orig	2024-10-22 02:29:46 UTC
+--- electron/shell/browser/native_window_views.cc.orig	2024-11-27 04:18:00 UTC
 +++ electron/shell/browser/native_window_views.cc
 @@ -49,7 +49,7 @@
  #include "ui/wm/core/shadow_types.h"
@@ -171,7 +171,7 @@
  void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
    auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
        GetAcceleratedWidget());
-@@ -1681,7 +1681,7 @@ bool NativeWindowViews::CanMinimize() const {
+@@ -1691,7 +1691,7 @@ bool NativeWindowViews::CanMinimize() const {
  bool NativeWindowViews::CanMinimize() const {
  #if BUILDFLAG(IS_WIN)
    return minimizable_;
@@ -180,7 +180,7 @@
    return true;
  #endif
  }
-@@ -1737,7 +1737,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1747,7 +1747,7 @@ void NativeWindowViews::HandleKeyboardEvent(
    if (widget_destroyed_)
      return;
 
@@ -189,7 +189,7 @@
    if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
      NotifyWindowExecuteAppCommand(kBrowserBackward);
    else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-@@ -1756,7 +1756,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1766,7 +1766,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
    // Alt+Click should not toggle menu bar.
    root_view_.ResetAltState();
 

diff --git a/devel/electron33/files/patch-electron_shell_common_api_electron__api__clipboard.cc b/devel/electron33/files/patch-electron_shell_common_api_electron__api__clipboard.cc
@@ -1,6 +1,6 @@
---- electron/shell/common/api/electron_api_clipboard.cc.orig	2024-04-16 14:29:17 UTC
+--- electron/shell/common/api/electron_api_clipboard.cc.orig	2024-11-27 04:18:00 UTC
 +++ electron/shell/common/api/electron_api_clipboard.cc
-@@ -58,7 +58,7 @@ std::string Clipboard::Read(const std::string& format_
+@@ -59,7 +59,7 @@ std::string Clipboard::Read(const std::string& format_
        ui::ClipboardFormatType::CustomPlatformType(format_string));
    bool rawFormatAvailable = clipboard->IsFormatAvailable(
        rawFormat, ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr);
@@ -9,7 +9,7 @@
    if (!rawFormatAvailable) {
      rawFormatAvailable = clipboard->IsFormatAvailable(
          rawFormat, ui::ClipboardBuffer::kSelection, /* data_dst = */ nullptr);
-@@ -74,7 +74,7 @@ std::string Clipboard::Read(const std::string& format_
+@@ -75,7 +75,7 @@ std::string Clipboard::Read(const std::string& format_
    custom_format_names =
        clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste,
                                              /* data_dst = */ nullptr);

diff --git a/devel/electron33/files/patch-electron_shell_common_api_electron__api__native__image.cc b/devel/electron33/files/patch-electron_shell_common_api_electron__api__native__image.cc
@@ -1,6 +1,6 @@
---- electron/shell/common/api/electron_api_native_image.cc.orig	2024-10-22 02:29:46 UTC
+--- electron/shell/common/api/electron_api_native_image.cc.orig	2024-11-27 04:18:00 UTC
 +++ electron/shell/common/api/electron_api_native_image.cc
-@@ -639,7 +639,7 @@ void Initialize(v8::Local<v8::Object> exports,
+@@ -638,7 +638,7 @@ void Initialize(v8::Local<v8::Object> exports,
    native_image.SetMethod("createFromDataURL", &NativeImage::CreateFromDataURL);
    native_image.SetMethod("createFromNamedImage",
                           &NativeImage::CreateFromNamedImage);