diff options
-rw-r--r-- | devel/electron36/Makefile | 3 | ||||
-rw-r--r-- | devel/electron36/Makefile.version | 2 | ||||
-rw-r--r-- | devel/electron36/distinfo | 14 | ||||
-rw-r--r-- | devel/electron36/files/patch-electron_BUILD.gn | 28 | ||||
-rw-r--r-- | devel/electron36/files/patch-electron_shell_services_node_node__service.cc | 6 | ||||
-rw-r--r-- | devel/electron36/files/patch-electron_spec_api-tray-spec.ts | 18 | ||||
-rw-r--r-- | devel/electron36/files/patch-net_dns_BUILD.gn | 10 |
7 files changed, 49 insertions, 32 deletions
diff --git a/devel/electron36/Makefile b/devel/electron36/Makefile index a18a2d86dff5..18efc64ae1a2 100644 --- a/devel/electron36/Makefile +++ b/devel/electron36/Makefile @@ -1,7 +1,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER} -PORTREVISION= 1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= devel @@ -225,7 +224,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER CHROMIUM_VER= 136.0.7103.177 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 22.18.0 +NODE_VER= 22.19.0 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER diff --git a/devel/electron36/Makefile.version b/devel/electron36/Makefile.version index 95dcd5dbb623..560a90f25889 100644 --- a/devel/electron36/Makefile.version +++ b/devel/electron36/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 36.8.1 +ELECTRON_VER= 36.9.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron36/distinfo b/devel/electron36/distinfo index 6d7c84c4dd6a..935a18245319 100644 --- a/devel/electron36/distinfo +++ b/devel/electron36/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1755784434 +TIMESTAMP = 1757835335 SHA256 (electron/chromium-136.0.7103.177.tar.xz.0) = 75e7a4c47e9a958aae70a026c8d005c07b76b02bf315071f209070fddaaa7665 SIZE (electron/chromium-136.0.7103.177.tar.xz.0) = 2000000000 SHA256 (electron/chromium-136.0.7103.177.tar.xz.1) = a86bdf58829129e0ef42a1bc6e5864701fba4572456631660c04c20e6d5bcee3 @@ -7,12 +7,12 @@ SHA256 (electron/chromium-136.0.7103.177.tar.xz.2) = 81a0db12277369bfae95002de9b SIZE (electron/chromium-136.0.7103.177.tar.xz.2) = 248456988 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-36.8.1.tar.xz) = 7823d2fceaf2aac5bb0b342866049b0dfdeca98a65ac00559abfaff47bdba536 -SIZE (electron/electron-yarn-cache-36.8.1.tar.xz) = 30480408 -SHA256 (electron/electron-electron-v36.8.1_GH0.tar.gz) = c9ce73a67a2ec73eeaea05750d2f8a25986d2de5a1ce3cf3a4fc7ae588d76cbe -SIZE (electron/electron-electron-v36.8.1_GH0.tar.gz) = 15822424 -SHA256 (electron/nodejs-node-v22.18.0_GH0.tar.gz) = f0f7022d2bcf1e286a42ccf46bf184e67e469daa83ecd9fda2326e872bab7aa0 -SIZE (electron/nodejs-node-v22.18.0_GH0.tar.gz) = 123027912 +SHA256 (electron/electron-yarn-cache-36.9.0.tar.xz) = 7823d2fceaf2aac5bb0b342866049b0dfdeca98a65ac00559abfaff47bdba536 +SIZE (electron/electron-yarn-cache-36.9.0.tar.xz) = 30480408 +SHA256 (electron/electron-electron-v36.9.0_GH0.tar.gz) = f2438f5d450ffc29ce17c7523dadbf009c470270c54f70531c65c88a242b2aba +SIZE (electron/electron-electron-v36.9.0_GH0.tar.gz) = 15826210 +SHA256 (electron/nodejs-node-v22.19.0_GH0.tar.gz) = 8f28e6635c2fe9d1ea29347606df81128c52bc3a2b820aca5851bd6b89c96aa4 +SIZE (electron/nodejs-node-v22.19.0_GH0.tar.gz) = 123089614 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/electron36/files/patch-electron_BUILD.gn b/devel/electron36/files/patch-electron_BUILD.gn index 1e399556d7df..877b28360e82 100644 --- a/devel/electron36/files/patch-electron_BUILD.gn +++ b/devel/electron36/files/patch-electron_BUILD.gn @@ -1,6 +1,6 @@ ---- electron/BUILD.gn.orig 2025-08-18 21:37:48 UTC +--- electron/BUILD.gn.orig 2025-09-08 12:48:33 UTC +++ electron/BUILD.gn -@@ -547,7 +547,7 @@ source_set("electron_lib") { +@@ -548,7 +548,7 @@ source_set("electron_lib") { defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ] } @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app", "//components/crash/core/browser", -@@ -640,6 +640,12 @@ source_set("electron_lib") { +@@ -641,6 +641,12 @@ source_set("electron_lib") { cflags_objcc = [ "-fobjc-weak" ] } } @@ -22,7 +22,7 @@ if (is_linux) { libs = [ "xshmfence" ] deps += [ -@@ -1218,7 +1224,7 @@ if (is_mac) { +@@ -1219,7 +1225,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", -@@ -1245,7 +1251,7 @@ if (is_mac) { +@@ -1246,7 +1252,7 @@ if (is_mac) { public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ] } @@ -40,7 +40,7 @@ data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] } -@@ -1312,7 +1318,7 @@ if (is_mac) { +@@ -1313,7 +1319,7 @@ if (is_mac) { configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } @@ -49,12 +49,14 @@ deps += [ "//sandbox/linux:chrome_sandbox" ] } } -@@ -1420,7 +1426,7 @@ dist_zip("electron_dist_zip") { - ":electron_version_file", - ":licenses", - ] -- if (is_linux) { -+ if (is_linux && !is_bsd) { - data_deps += [ "//sandbox/linux:chrome_sandbox" ] +@@ -1434,7 +1440,9 @@ dist_zip("electron_dist_zip") { + ] + } + +- data_deps += [ "//sandbox/linux:chrome_sandbox" ] ++ if (!is_bsd) { ++ data_deps += [ "//sandbox/linux:chrome_sandbox" ] ++ } } deps = data_deps + outputs = [ "$root_build_dir/dist.zip" ] diff --git a/devel/electron36/files/patch-electron_shell_services_node_node__service.cc b/devel/electron36/files/patch-electron_shell_services_node_node__service.cc index 51fe435d783f..e30819eff56e 100644 --- a/devel/electron36/files/patch-electron_shell_services_node_node__service.cc +++ b/devel/electron36/files/patch-electron_shell_services_node_node__service.cc @@ -1,6 +1,6 @@ ---- electron/shell/services/node/node_service.cc.orig 2025-01-29 20:10:57 UTC +--- electron/shell/services/node/node_service.cc.orig 2025-09-08 12:48:33 UTC +++ electron/shell/services/node/node_service.cc -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "shell/common/node_includes.h" #include "shell/services/node/parent_port.h" @@ -9,7 +9,7 @@ #include "shell/common/crash_keys.h" #endif -@@ -39,7 +39,7 @@ void V8FatalErrorCallback(const char* location, const +@@ -40,7 +40,7 @@ void V8FatalErrorCallback(const char* location, const g_client_remote->OnV8FatalError(location, outstream.str()); } diff --git a/devel/electron36/files/patch-electron_spec_api-tray-spec.ts b/devel/electron36/files/patch-electron_spec_api-tray-spec.ts index cb822fdca402..2116612eaff6 100644 --- a/devel/electron36/files/patch-electron_spec_api-tray-spec.ts +++ b/devel/electron36/files/patch-electron_spec_api-tray-spec.ts @@ -1,5 +1,21 @@ ---- electron/spec/api-tray-spec.ts.orig 2024-10-09 13:53:06 UTC +--- electron/spec/api-tray-spec.ts.orig 2025-09-08 12:48:33 UTC +++ electron/spec/api-tray-spec.ts +@@ -30,13 +30,13 @@ describe('tray module', () => { + }).to.throw(/Failed to load image from path (.+)/); + }); + +- ifit(process.platform !== 'linux')('throws a descriptive error if an invalid guid is given', () => { ++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('throws a descriptive error if an invalid guid is given', () => { + expect(() => { + tray = new Tray(nativeImage.createEmpty(), 'I am not a guid'); + }).to.throw('Invalid GUID format'); + }); + +- ifit(process.platform !== 'linux')('accepts a valid guid', () => { ++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('accepts a valid guid', () => { + expect(() => { + tray = new Tray(nativeImage.createEmpty(), '0019A433-3526-48BA-A66C-676742C0FEFB'); + }).to.not.throw(); @@ -131,7 +131,7 @@ describe('tray module', () => { describe('tray.getBounds()', () => { afterEach(() => { tray.destroy(); }); diff --git a/devel/electron36/files/patch-net_dns_BUILD.gn b/devel/electron36/files/patch-net_dns_BUILD.gn index e1fd322aea84..9cc82b31ad6e 100644 --- a/devel/electron36/files/patch-net_dns_BUILD.gn +++ b/devel/electron36/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC +--- net/dns/BUILD.gn.orig 2025-09-14 07:58:52 UTC +++ net/dns/BUILD.gn -@@ -138,7 +138,7 @@ source_set("dns") { +@@ -140,7 +140,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,7 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -172,6 +172,9 @@ source_set("dns") { +@@ -174,6 +174,9 @@ source_set("dns") { } deps = [ "//net:net_deps" ] @@ -19,7 +19,7 @@ public_deps = [ ":dns_client", -@@ -179,6 +182,7 @@ source_set("dns") { +@@ -181,6 +184,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -27,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -447,9 +451,9 @@ source_set("tests") { +@@ -452,9 +456,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] |