diff --git a/devel/electron39/Makefile b/devel/electron39/Makefile index 427b16a4ef7a..6557640b2843 100644 --- a/devel/electron39/Makefile +++ b/devel/electron39/Makefile @@ -1,7 +1,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER} -PORTREVISION= 1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= devel @@ -226,7 +225,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER CHROMIUM_VER= 142.0.7444.265 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 22.21.1 +NODE_VER= 22.22.0 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER diff --git a/devel/electron39/Makefile.version b/devel/electron39/Makefile.version index 7c8a22c2c808..4a7a99339897 100644 --- a/devel/electron39/Makefile.version +++ b/devel/electron39/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 39.3.0 +ELECTRON_VER= 39.5.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron39/distinfo b/devel/electron39/distinfo index 79d9566056b2..399a9a65b501 100644 --- a/devel/electron39/distinfo +++ b/devel/electron39/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1768986352 +TIMESTAMP = 1770289165 SHA256 (electron/chromium-142.0.7444.265.tar.xz.0) = 54ca3cf92f6a207a4e1b46fe016da7d515097f999b5e53ba4201adc906ae383e SIZE (electron/chromium-142.0.7444.265.tar.xz.0) = 2000000000 SHA256 (electron/chromium-142.0.7444.265.tar.xz.1) = 289722408b81d862eb63f98cf47516308add8e18f5d62d2455c98942a2ebface @@ -9,12 +9,12 @@ SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 SHA256 (electron/yarn-4.12.0.tgz) = bd58d06826ce9542c4cd904fe10bab7bc718ea2cc39a45d9fbd15f2edb45761c SIZE (electron/yarn-4.12.0.tgz) = 1056794 -SHA256 (electron/electron39-39.3.0-node-modules.tar.xz) = d6807d9aa0650ecccdb7fc89b1bdca4fb3bbc45e70a02e5353ead188e91208a2 -SIZE (electron/electron39-39.3.0-node-modules.tar.xz) = 59815804 -SHA256 (electron/electron-electron-v39.3.0_GH0.tar.gz) = ec1ff70789e0f323b586df0d5104e20b5c127b96281aa04a67bf91b86d288e58 -SIZE (electron/electron-electron-v39.3.0_GH0.tar.gz) = 16990760 -SHA256 (electron/nodejs-node-v22.21.1_GH0.tar.gz) = 4b5ad1795fb6adfb1862df9a626bdca85185866fcd7d0313e87a347eec293fd8 -SIZE (electron/nodejs-node-v22.21.1_GH0.tar.gz) = 129440814 +SHA256 (electron/electron39-39.5.1-node-modules.tar.xz) = 10cb6b074cc82c6db4d094396c7521bc876117f207b930b55ac77dab22cc97f2 +SIZE (electron/electron39-39.5.1-node-modules.tar.xz) = 59816148 +SHA256 (electron/electron-electron-v39.5.1_GH0.tar.gz) = 874ef70b43fcc14f6be4fe5ecd2173cb2179d763f440189d5ea09dfca5bff8af +SIZE (electron/electron-electron-v39.5.1_GH0.tar.gz) = 17126950 +SHA256 (electron/nodejs-node-v22.22.0_GH0.tar.gz) = b7f40aadbf71df0d78a2239f593e4f14bf2f129fd9c5643f024c68ec1b48a854 +SIZE (electron/nodejs-node-v22.22.0_GH0.tar.gz) = 129435366 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/electron39/files/packagejsons/package.json b/devel/electron39/files/packagejsons/package.json index 8d12c4e07e08..9d90d9ae63a6 100644 --- a/devel/electron39/files/packagejsons/package.json +++ b/devel/electron39/files/packagejsons/package.json @@ -10,7 +10,7 @@ "@electron/docs-parser": "^2.0.0", "@electron/fiddle-core": "^1.3.4", "@electron/github-app-auth": "^3.2.0", - "@electron/lint-roller": "^3.1.2", + "@electron/lint-roller": "^3.2.0", "@electron/typescript-definitions": "^9.1.2", "@octokit/rest": "^20.1.2", "@primer/octicons": "^10.0.0", diff --git a/devel/electron39/files/packagejsons/spec/package.json b/devel/electron39/files/packagejsons/spec/package.json index 545e704362c8..cc1804179717 100644 --- a/devel/electron39/files/packagejsons/spec/package.json +++ b/devel/electron39/files/packagejsons/spec/package.json @@ -23,7 +23,6 @@ "@types/mocha": "^7.0.2", "@types/send": "^0.14.5", "@types/sinon": "^9.0.4", - "@types/split": "^1.0.5", "@types/uuid": "^3.4.6", "@types/w3c-web-serial": "^1.0.7", "@types/ws": "^7.2.0", @@ -46,7 +45,6 @@ "q": "^1.5.1", "send": "^0.19.0", "sinon": "^9.0.1", - "split": "^1.0.1", "uuid": "^3.3.3", "winreg": "1.2.4", "ws": "^7.5.10", diff --git a/devel/electron39/files/packagejsons/yarn.lock b/devel/electron39/files/packagejsons/yarn.lock index 1ebfe1a54dff..21ed88d51c22 100644 --- a/devel/electron39/files/packagejsons/yarn.lock +++ b/devel/electron39/files/packagejsons/yarn.lock @@ -442,7 +442,7 @@ __metadata: "@electron/docs-parser": "npm:^2.0.0" "@electron/fiddle-core": "npm:^1.3.4" "@electron/github-app-auth": "npm:^3.2.0" - "@electron/lint-roller": "npm:^3.1.2" + "@electron/lint-roller": "npm:^3.2.0" "@electron/typescript-definitions": "npm:^9.1.2" "@octokit/rest": "npm:^20.1.2" "@primer/octicons": "npm:^10.0.0" @@ -656,9 +656,9 @@ __metadata: languageName: node linkType: hard -"@electron/lint-roller@npm:^3.1.2": - version: 3.1.2 - resolution: "@electron/lint-roller@npm:3.1.2" +"@electron/lint-roller@npm:^3.2.0": + version: 3.2.0 + resolution: "@electron/lint-roller@npm:3.2.0" dependencies: "@dsanders11/vscode-markdown-languageservice": "npm:^0.3.0" ajv: "npm:^8.16.0" @@ -683,7 +683,7 @@ __metadata: lint-roller-markdown-links: dist/bin/lint-markdown-links.js lint-roller-markdown-standard: dist/bin/lint-markdown-standard.js lint-roller-markdown-ts-check: dist/bin/lint-markdown-ts-check.js - checksum: 10c0/e98a65d44b99accf44e33d7dfb1e8d85a75580a7efa7b4a570b0f8e7274aad3eb60fc6d285b5d1d78ecd093e902820222cfdf3e193eec65a8a3536d4c75bb060 + checksum: 10c0/5331163518f41c1ea8ac302891d808891b5570f657587194717e3a8214c0d99e04949cf500ff138b02b77a373e317c3e77042b19c7fbda186d5c970b6b81df80 languageName: node linkType: hard @@ -2006,16 +2006,6 @@ __metadata: languageName: node linkType: hard -"@types/split@npm:^1.0.5": - version: 1.0.5 - resolution: "@types/split@npm:1.0.5" - dependencies: - "@types/node": "npm:*" - "@types/through": "npm:*" - checksum: 10c0/eb187a3b07e5064928e49bffd5c45ad1f1109135fee52344bb7623cdb55e2ebb16bd6ca009a30a0a6e2b262f7ebb7bf18030ff873819e80fafd4cbb51dba1a74 - languageName: node - linkType: hard - "@types/stream-chain@npm:*": version: 2.0.0 resolution: "@types/stream-chain@npm:2.0.0" @@ -2058,15 +2048,6 @@ __metadata: languageName: node linkType: hard -"@types/through@npm:*": - version: 0.0.33 - resolution: "@types/through@npm:0.0.33" - dependencies: - "@types/node": "npm:*" - checksum: 10c0/6a8edd7f40cd7e197318e86310a40e568cddd380609dde59b30d5cc6c5f8276ddc698905eac4b3b429eb39f2e8ee326bc20dc6e95a2cdc41c4d3fc9a1ebd4929 - languageName: node - linkType: hard - "@types/unist@npm:*, @types/unist@npm:^2.0.0": version: 2.0.6 resolution: "@types/unist@npm:2.0.6" @@ -4585,7 +4566,6 @@ __metadata: "@types/mocha": "npm:^7.0.2" "@types/send": "npm:^0.14.5" "@types/sinon": "npm:^9.0.4" - "@types/split": "npm:^1.0.5" "@types/uuid": "npm:^3.4.6" "@types/w3c-web-serial": "npm:^1.0.7" "@types/ws": "npm:^7.2.0" @@ -4608,7 +4588,6 @@ __metadata: q: "npm:^1.5.1" send: "npm:^0.19.0" sinon: "npm:^9.0.1" - split: "npm:^1.0.1" uuid: "npm:^3.3.3" winreg: "npm:1.2.4" ws: "npm:^7.5.10" diff --git a/devel/electron39/files/patch-electron_BUILD.gn b/devel/electron39/files/patch-electron_BUILD.gn index 0b8eb9a2b556..d7863e603230 100644 --- a/devel/electron39/files/patch-electron_BUILD.gn +++ b/devel/electron39/files/patch-electron_BUILD.gn @@ -1,6 +1,6 @@ ---- electron/BUILD.gn.orig 2025-10-27 17:58:27 UTC +--- electron/BUILD.gn.orig 2026-02-02 23:06:17 UTC +++ electron/BUILD.gn -@@ -548,7 +548,7 @@ source_set("electron_lib") { +@@ -580,7 +580,7 @@ source_set("electron_lib") { defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ] } @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app", "//components/crash/core/browser", -@@ -646,6 +646,12 @@ source_set("electron_lib") { +@@ -678,6 +678,12 @@ source_set("electron_lib") { cflags_objcc = [ "-fobjc-weak" ] } } @@ -22,7 +22,7 @@ if (is_linux) { libs = [ "xshmfence" ] deps += [ -@@ -1229,7 +1235,7 @@ if (is_mac) { +@@ -1261,7 +1267,7 @@ if (is_mac) { ":electron_lib", ":electron_win32_resources", ":packed_resources", @@ -31,7 +31,7 @@ "//content:sandbox_helper_win", "//electron/buildflags", "//third_party/electron_node:libnode", -@@ -1256,7 +1262,7 @@ if (is_mac) { +@@ -1288,7 +1294,7 @@ if (is_mac) { public_deps = [ "//tools/v8_context_snapshot" ] } @@ -40,7 +40,7 @@ data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] } -@@ -1323,7 +1329,7 @@ if (is_mac) { +@@ -1355,7 +1361,7 @@ if (is_mac) { configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } @@ -49,7 +49,7 @@ deps += [ "//sandbox/linux:chrome_sandbox" ] } } -@@ -1444,7 +1450,9 @@ dist_zip("electron_dist_zip") { +@@ -1476,7 +1482,9 @@ dist_zip("electron_dist_zip") { ] } diff --git a/devel/electron39/files/patch-electron_shell_app_electron__main__delegate.cc b/devel/electron39/files/patch-electron_shell_app_electron__main__delegate.cc index f5cfeb809a01..015c4bcd094e 100644 --- a/devel/electron39/files/patch-electron_shell_app_electron__main__delegate.cc +++ b/devel/electron39/files/patch-electron_shell_app_electron__main__delegate.cc @@ -1,6 +1,6 @@ ---- electron/shell/app/electron_main_delegate.cc.orig 2025-10-27 17:58:27 UTC +--- electron/shell/app/electron_main_delegate.cc.orig 2026-02-02 23:06:17 UTC +++ electron/shell/app/electron_main_delegate.cc -@@ -67,13 +67,13 @@ +@@ -64,13 +64,13 @@ #include "chrome/child/v8_crashpad_support_win.h" #endif @@ -16,16 +16,7 @@ #include "components/crash/core/app/crash_switches.h" // nogncheck #include "components/crash/core/app/crashpad.h" // nogncheck #include "components/crash/core/common/crash_key.h" -@@ -165,7 +165,7 @@ bool ElectronPathProvider(int key, base::FilePath* res - create_dir = true; - break; - } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - case DIR_APP_DATA: { - auto env = base::Environment::Create(); - cur = base::nix::GetXDGDirectory( -@@ -307,7 +307,7 @@ std::optional ElectronMainDelegate::BasicStartupC +@@ -210,7 +210,7 @@ std::optional ElectronMainDelegate::BasicStartupC base::win::PinUser32(); #endif @@ -34,7 +25,7 @@ // Check for --no-sandbox parameter when running as root. if (getuid() == 0 && IsSandboxEnabled(command_line)) LOG(FATAL) << "Running as root without --" -@@ -357,7 +357,7 @@ void ElectronMainDelegate::PreSandboxStartup() { +@@ -260,7 +260,7 @@ void ElectronMainDelegate::PreSandboxStartup() { /* is_preinit = */ IsBrowserProcess() || IsZygoteProcess()); #endif @@ -43,7 +34,7 @@ crash_reporter::InitializeCrashKeys(); #endif -@@ -392,7 +392,7 @@ void ElectronMainDelegate::PreSandboxStartup() { +@@ -295,7 +295,7 @@ void ElectronMainDelegate::PreSandboxStartup() { } #endif @@ -52,7 +43,7 @@ crash_keys::SetCrashKeysFromCommandLine(*command_line); crash_keys::SetPlatformCrashKey(); #endif -@@ -432,7 +432,7 @@ std::optional ElectronMainDelegate::PreBrowserMai +@@ -335,7 +335,7 @@ std::optional ElectronMainDelegate::PreBrowserMai #if BUILDFLAG(IS_MAC) RegisterAtomCrApp(); #endif diff --git a/devel/electron39/files/patch-electron_shell_common_electron__paths.cc b/devel/electron39/files/patch-electron_shell_common_electron__paths.cc new file mode 100644 index 000000000000..7e6040cfab63 --- /dev/null +++ b/devel/electron39/files/patch-electron_shell_common_electron__paths.cc @@ -0,0 +1,20 @@ +--- electron/shell/common/electron_paths.cc.orig 2026-02-05 11:25:03 UTC ++++ electron/shell/common/electron_paths.cc +@@ -12,7 +12,7 @@ + #include "shell/common/platform_util.h" + #include "shell/common/thread_restrictions.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/nix/xdg_util.h" + #endif + +@@ -62,7 +62,7 @@ bool ElectronPathProvider(int key, base::FilePath* res + create_dir = true; + break; + } +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case DIR_APP_DATA: { + auto env = base::Environment::Create(); + cur = base::nix::GetXDGDirectory( diff --git a/devel/electron39/files/patch-electron_shell_common_electron__paths.h b/devel/electron39/files/patch-electron_shell_common_electron__paths.h index 5ca6a126e4b3..eba148ec1249 100644 --- a/devel/electron39/files/patch-electron_shell_common_electron__paths.h +++ b/devel/electron39/files/patch-electron_shell_common_electron__paths.h @@ -1,6 +1,6 @@ ---- electron/shell/common/electron_paths.h.orig 2022-08-03 15:31:32 UTC +--- electron/shell/common/electron_paths.h.orig 2026-02-02 23:06:17 UTC +++ electron/shell/common/electron_paths.h -@@ -30,7 +30,7 @@ enum { +@@ -31,7 +31,7 @@ enum { DIR_RECENT, // Directory where recent files live #endif diff --git a/devel/electron39/files/patch-electron_shell_common_node__bindings.cc b/devel/electron39/files/patch-electron_shell_common_node__bindings.cc index 43d1112ed2d4..7a5deb233490 100644 --- a/devel/electron39/files/patch-electron_shell_common_node__bindings.cc +++ b/devel/electron39/files/patch-electron_shell_common_node__bindings.cc @@ -1,4 +1,4 @@ ---- electron/shell/common/node_bindings.cc.orig 2025-10-27 17:58:27 UTC +--- electron/shell/common/node_bindings.cc.orig 2026-02-02 23:06:17 UTC +++ electron/shell/common/node_bindings.cc @@ -49,7 +49,7 @@ #include "third_party/electron_node/src/debug_utils.h" @@ -9,7 +9,7 @@ #include "shell/common/crash_keys.h" #endif -@@ -164,7 +164,7 @@ void V8FatalErrorCallback(const char* location, const +@@ -165,7 +165,7 @@ void V8FatalErrorCallback(const char* location, const void V8FatalErrorCallback(const char* location, const char* message) { LOG(ERROR) << "Fatal error in V8: " << location << " " << message; @@ -18,7 +18,7 @@ electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message); electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location); #endif -@@ -186,7 +186,7 @@ void V8OOMErrorCallback(const char* location, const v8 +@@ -187,7 +187,7 @@ void V8OOMErrorCallback(const char* location, const v8 LOG(ERROR) << "OOM detail: " << details.detail; } @@ -27,7 +27,7 @@ electron::crash_keys::SetCrashKey("electron.v8-oom.is_heap_oom", std::to_string(details.is_heap_oom)); if (location) { -@@ -636,7 +636,7 @@ void NodeBindings::Initialize(v8::Isolate* const isola +@@ -637,7 +637,7 @@ void NodeBindings::Initialize(v8::Isolate* const isola TRACE_EVENT0("electron", "NodeBindings::Initialize"); // Open node's error reporting system for browser process.