diff --git a/devel/electron30/Makefile.version b/devel/electron30/Makefile.version index b092d61eb1eb..662998d32a71 100644 --- a/devel/electron30/Makefile.version +++ b/devel/electron30/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 30.3.1 +ELECTRON_VER= 30.4.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron30/distinfo b/devel/electron30/distinfo index c6fb625271d3..b27e4cc4d846 100644 --- a/devel/electron30/distinfo +++ b/devel/electron30/distinfo @@ -1,23 +1,23 @@ -TIMESTAMP = 1721886862 +TIMESTAMP = 1724015117 SHA256 (electron/chromium-124.0.6367.243.tar.xz) = 53ed2f29769fe105ae884e37fd9fd9d9756931cf1d6d16c6a252f5982b8496cb SIZE (electron/chromium-124.0.6367.243.tar.xz) = 1633060772 SHA256 (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = dcfaea4d353d1df3d4ac2d245ea7e32ad177d4bea1351f363714c9c22ca5c4f8 SIZE (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = 9761601 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-30.3.1.tar.xz) = f1850543ce13619fe291e15e25418779cee8ed154d2424c5dbb49faa2e4c60f3 -SIZE (electron/electron-yarn-cache-30.3.1.tar.xz) = 29179584 -SHA256 (electron/electron-electron-v30.3.1_GH0.tar.gz) = 5eb3550cc9d46bfc1d221a2764d5e75e5a05b1c25794fd7fe52bcdf487691f97 -SIZE (electron/electron-electron-v30.3.1_GH0.tar.gz) = 13379394 +SHA256 (electron/electron-yarn-cache-30.4.0.tar.xz) = f1850543ce13619fe291e15e25418779cee8ed154d2424c5dbb49faa2e4c60f3 +SIZE (electron/electron-yarn-cache-30.4.0.tar.xz) = 29179584 +SHA256 (electron/electron-electron-v30.4.0_GH0.tar.gz) = 5c1b64b85b733275543056bb6499448516c3f030f18557024857f681cf2199bd +SIZE (electron/electron-electron-v30.4.0_GH0.tar.gz) = 13403540 SHA256 (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 9c54c9338f78cf99227d006e65123fd9ef66cf8c271f3c25cad9a336f201507f SIZE (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 115474342 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 SIZE (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = 2112918 SHA256 (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 88e65f116c7a06fccedb43970fba63080a57a4e5dc29147d2cdfe1ee58dd0546 SIZE (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 1136238 SHA256 (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = a365df6d83e0be3cc000b70bd39734d80c28f0d9983ebe44698337a2ca464bb1 SIZE (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = 62962 SHA256 (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = c148f76220fc41a89ffeaf370c2cc175577be184688b12aa6fec5f8ac6c714c4 SIZE (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = 13014 diff --git a/devel/electron30/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc b/devel/electron30/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc index b278676a040f..742632761bd8 100644 --- a/devel/electron30/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc +++ b/devel/electron30/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc @@ -1,11 +1,11 @@ ---- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2024-04-16 14:29:17 UTC +--- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2024-08-13 16:47:53 UTC +++ electron/shell/browser/api/electron_api_desktop_capturer.cc -@@ -41,7 +41,7 @@ - #include "ui/gfx/x/randr.h" +@@ -45,7 +45,7 @@ + #include "ui/base/cocoa/permissions_utils.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Private function in ui/base/x/x11_display_util.cc base::flat_map GetMonitors( std::pair version, diff --git a/devel/electron30/files/patch-electron_shell_common_api_electron__bindings.cc b/devel/electron30/files/patch-electron_shell_common_api_electron__bindings.cc index 94fccd180528..b1aebb2672ee 100644 --- a/devel/electron30/files/patch-electron_shell_common_api_electron__bindings.cc +++ b/devel/electron30/files/patch-electron_shell_common_api_electron__bindings.cc @@ -1,11 +1,11 @@ ---- electron/shell/common/api/electron_bindings.cc.orig 2024-04-16 14:29:17 UTC +--- electron/shell/common/api/electron_bindings.cc.orig 2024-08-13 16:47:53 UTC +++ electron/shell/common/api/electron_bindings.cc -@@ -255,7 +255,7 @@ void ElectronBindings::DidReceiveMemoryDump( +@@ -256,7 +256,7 @@ void ElectronBindings::DidReceiveMemoryDump( if (target_pid == dump.pid()) { auto dict = gin_helper::Dictionary::CreateEmpty(isolate); const auto& osdump = dump.os_dump(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) dict.Set("residentSet", osdump.resident_set_kb); #endif dict.Set("private", osdump.private_footprint_kb); diff --git a/devel/electron30/files/patch-electron_spec_api-protocol-spec.ts b/devel/electron30/files/patch-electron_spec_api-protocol-spec.ts index 29238b03385b..6d63a51e64a5 100644 --- a/devel/electron30/files/patch-electron_spec_api-protocol-spec.ts +++ b/devel/electron30/files/patch-electron_spec_api-protocol-spec.ts @@ -1,11 +1,11 @@ ---- electron/spec/api-protocol-spec.ts.orig 2024-04-29 23:06:40 UTC +--- electron/spec/api-protocol-spec.ts.orig 2024-08-13 16:47:53 UTC +++ electron/spec/api-protocol-spec.ts -@@ -1710,7 +1710,7 @@ describe('protocol module', () => { +@@ -1734,7 +1734,7 @@ describe('protocol module', () => { }); // TODO(nornagon): this test doesn't pass on Linux currently, investigate. - ifit(process.platform !== 'linux')('is fast', async () => { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('is fast', async () => { // 128 MB of spaces. const chunk = new Uint8Array(128 * 1024 * 1024); chunk.fill(' '.charCodeAt(0));