diff --git a/devel/electron39/Makefile.version b/devel/electron39/Makefile.version index 4a7a99339897..ab36dd3b4b49 100644 --- a/devel/electron39/Makefile.version +++ b/devel/electron39/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 39.5.1 +ELECTRON_VER= 39.6.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron39/distinfo b/devel/electron39/distinfo index 399a9a65b501..0d0d6e2ba2fb 100644 --- a/devel/electron39/distinfo +++ b/devel/electron39/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1770289165 +TIMESTAMP = 1771069837 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,10 +9,10 @@ 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.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/electron39-39.6.0-node-modules.tar.xz) = 0f539cfddfd0cbcf8df0e5a974a0c2a7cf812d7c1fd10ba2148a69265412ad5a +SIZE (electron/electron39-39.6.0-node-modules.tar.xz) = 59894046 +SHA256 (electron/electron-electron-v39.6.0_GH0.tar.gz) = 4733cfc0b6f3e441488abcf7490104eadc4e83eeee0df33925e2e60c308233e2 +SIZE (electron/electron-electron-v39.6.0_GH0.tar.gz) = 17141347 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 diff --git a/devel/electron39/files/packagejsons/package.json b/devel/electron39/files/packagejsons/package.json index 9d90d9ae63a6..7efcc28d3fc6 100644 --- a/devel/electron39/files/packagejsons/package.json +++ b/devel/electron39/files/packagejsons/package.json @@ -57,7 +57,8 @@ "url": "^0.11.4", "webpack": "^5.95.0", "webpack-cli": "^5.1.4", - "wrapper-webpack-plugin": "^2.2.0" + "wrapper-webpack-plugin": "^2.2.0", + "yaml": "^2.8.1" }, "private": true, "scripts": { @@ -131,6 +132,10 @@ "DEPS": [ "node script/gen-hunspell-filenames.js", "node script/gen-libc++-filenames.js" + ], + ".github/workflows/pipeline-segment-electron-build.yml": [ + "node script/copy-pipeline-segment-publish.js", + "git add .github/workflows/pipeline-segment-electron-publish.yml" ] }, "resolutions": { diff --git a/devel/electron39/files/packagejsons/yarn.lock b/devel/electron39/files/packagejsons/yarn.lock index 21ed88d51c22..a072128b85a0 100644 --- a/devel/electron39/files/packagejsons/yarn.lock +++ b/devel/electron39/files/packagejsons/yarn.lock @@ -490,6 +490,7 @@ __metadata: webpack: "npm:^5.95.0" webpack-cli: "npm:^5.1.4" wrapper-webpack-plugin: "npm:^2.2.0" + yaml: "npm:^2.8.1" dependenciesMeta: abstract-socket: built: true @@ -8704,7 +8705,7 @@ __metadata: languageName: node linkType: hard -"micromark-core-commonmark@npm:2.0.3": +"micromark-core-commonmark@npm:2.0.3, micromark-core-commonmark@npm:^2.0.0": version: 2.0.3 resolution: "micromark-core-commonmark@npm:2.0.3" dependencies: @@ -8728,30 +8729,6 @@ __metadata: languageName: node linkType: hard -"micromark-core-commonmark@npm:^2.0.0": - version: 2.0.1 - resolution: "micromark-core-commonmark@npm:2.0.1" - dependencies: - decode-named-character-reference: "npm:^1.0.0" - devlop: "npm:^1.0.0" - micromark-factory-destination: "npm:^2.0.0" - micromark-factory-label: "npm:^2.0.0" - micromark-factory-space: "npm:^2.0.0" - micromark-factory-title: "npm:^2.0.0" - micromark-factory-whitespace: "npm:^2.0.0" - micromark-util-character: "npm:^2.0.0" - micromark-util-chunked: "npm:^2.0.0" - micromark-util-classify-character: "npm:^2.0.0" - micromark-util-html-tag-name: "npm:^2.0.0" - micromark-util-normalize-identifier: "npm:^2.0.0" - micromark-util-resolve-all: "npm:^2.0.0" - micromark-util-subtokenize: "npm:^2.0.0" - micromark-util-symbol: "npm:^2.0.0" - micromark-util-types: "npm:^2.0.0" - checksum: 10c0/a0b280b1b6132f600518e72cb29a4dd1b2175b85f5ed5b25d2c5695e42b876b045971370daacbcfc6b4ce8cf7acbf78dd3a0284528fb422b450144f4b3bebe19 - languageName: node - linkType: hard - "micromark-extension-directive@npm:4.0.0": version: 4.0.0 resolution: "micromark-extension-directive@npm:4.0.0" @@ -14492,6 +14469,15 @@ __metadata: languageName: node linkType: hard +"yaml@npm:^2.8.1": + version: 2.8.2 + resolution: "yaml@npm:2.8.2" + bin: + yaml: bin.mjs + checksum: 10c0/703e4dc1e34b324aa66876d63618dcacb9ed49f7e7fe9b70f1e703645be8d640f68ab84f12b86df8ac960bac37acf5513e115de7c970940617ce0343c8c9cd96 + languageName: node + linkType: hard + "yamux-js@npm:0.1.2": version: 0.1.2 resolution: "yamux-js@npm:0.1.2" diff --git a/devel/electron39/files/patch-content_browser_service__host_utility__process__host.cc b/devel/electron39/files/patch-content_browser_service__host_utility__process__host.cc index 5debd774304f..31eeab38d61c 100644 --- a/devel/electron39/files/patch-content_browser_service__host_utility__process__host.cc +++ b/devel/electron39/files/patch-content_browser_service__host_utility__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/service_host/utility_process_host.cc.orig 2025-11-02 19:17:58 UTC +--- content/browser/service_host/utility_process_host.cc.orig 2026-02-14 12:04:37 UTC +++ content/browser/service_host/utility_process_host.cc @@ -68,7 +68,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -18,7 +18,7 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector network_context_parent_dirs) { base::Pickle pickle; -@@ -525,7 +525,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -534,7 +534,7 @@ bool UtilityProcessHost::StartProcess() { GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) @@ -27,7 +27,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (options_.sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -543,7 +543,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -552,7 +552,7 @@ bool UtilityProcessHost::StartProcess() { video_capture::mojom::VideoCaptureService::Name_) { bool pass_gpu_buffer_flag = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); diff --git a/devel/electron39/files/patch-electron_BUILD.gn b/devel/electron39/files/patch-electron_BUILD.gn index d7863e603230..5a1697e83357 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 2026-02-02 23:06:17 UTC +--- electron/BUILD.gn.orig 2026-02-13 02:35:12 UTC +++ electron/BUILD.gn -@@ -580,7 +580,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", -@@ -678,6 +678,12 @@ source_set("electron_lib") { +@@ -646,6 +646,12 @@ source_set("electron_lib") { cflags_objcc = [ "-fobjc-weak" ] } } @@ -22,7 +22,7 @@ if (is_linux) { libs = [ "xshmfence" ] deps += [ -@@ -1261,7 +1267,7 @@ if (is_mac) { +@@ -1229,7 +1235,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", -@@ -1288,7 +1294,7 @@ if (is_mac) { +@@ -1256,7 +1262,7 @@ if (is_mac) { public_deps = [ "//tools/v8_context_snapshot" ] } @@ -40,7 +40,7 @@ data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] } -@@ -1355,7 +1361,7 @@ if (is_mac) { +@@ -1323,7 +1329,7 @@ if (is_mac) { configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } @@ -49,7 +49,7 @@ deps += [ "//sandbox/linux:chrome_sandbox" ] } } -@@ -1476,7 +1482,9 @@ dist_zip("electron_dist_zip") { +@@ -1444,7 +1450,9 @@ dist_zip("electron_dist_zip") { ] }