Skip to content

Commit e1460c9

Browse files
committed
[vcpkg-tool-nodejs] Update to 24.22.1 [qtwebengine] Remove concurrency blocks
https://nodejs.org/en/blog/release/v24.22.1 We hope this fixes the intermittent qtwebengine crash. According to GPT 6.1 Sol + @ras0219-msft : > The strongest related upstream case is nodejs/node#65756: intermittent Windows x64 Node 24.19.0 child-process crashes with `0xC0000005`, with the affected test file varying between runs. It is a useful analogue, not the same workload. > > nodejs/node#65778 fixes a use-after-free in Node’s CppGC/Realm teardown. A wrapper can be collected before its Environment is freed but destroyed afterwards, leaving its destructor writing through a freed Realm. The documented trigger combines a Worker, `vm.Script`, memory-pressure GC, and worker exit. > > The v24 backport, nodejs/node#66168, reports reproducing the crash on 24.20.0 and passing its Windows stress reproduction with the fix. > > The backport landed October 7, 2026, as: > > `83b3431c25be9fdb739c1531313c4c12a227c00a` > > Node 24.21.0 was released September 8 and lacks that fix. Node 24.22.0, released October 14, includes it. 24.22.1, released October 21, is the current v24 release verified on October 22. Comparing tagged `src/cppgc_helpers-inl.h` independently confirms the old destructor and its replacement. This also means the reduced concurrency part of microsoft#53435 clearly did not work, so that is reverted here.
1 parent a073c28 commit e1460c9

7 files changed

Lines changed: 22 additions & 19 deletions

File tree

‎ports/qtwebengine/portfile.cmake‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,6 @@ if(buildtree_length GREATER 22 AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_
199199
file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}")
200200
endif()
201201

202-
set(qtwebengine_install_options ADD_BIN_TO_PATH)
203-
if(VCPKG_TARGET_IS_WINDOWS)
204-
# The outer CMake build invokes a parallel Chromium Ninja build.
205-
list(APPEND qtwebengine_install_options DISABLE_PARALLEL)
206-
endif()
207202
set(ENV{QTWEBENGINE_GN_THREADS} "${VCPKG_CONCURRENCY}")
208203
set(ENV{NINJAFLAGS} "-j${VCPKG_CONCURRENCY} $ENV{NINJAFLAGS}")
209204

@@ -257,7 +252,7 @@ if(NOT VCPKG_BUILD_TYPE)
257252
file(APPEND "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/core/Debug/${target_args_gn}" "\ngcc_target_rpath=\"\\\${ORIGIN}:${CURRENT_INSTALLED_DIR}/debug/lib\"\n")
258253
endif()
259254
vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" "${CURRENT_INSTALLED_DIR}/share/pkgconfig")
260-
vcpkg_cmake_install(${qtwebengine_install_options})
255+
vcpkg_cmake_install(ADD_BIN_TO_PATH)
261256
endblock()
262257
endif()
263258
vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH)
@@ -267,7 +262,7 @@ if(VCPKG_TARGET_IS_LINUX AND EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}
267262
file(APPEND "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/core/Release/${target_args_gn}" "\ngcc_target_rpath=\"\\\${ORIGIN}:${CURRENT_INSTALLED_DIR}/lib\"\n")
268263
endif()
269264
vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" "${CURRENT_INSTALLED_DIR}/share/pkgconfig")
270-
vcpkg_cmake_install(${qtwebengine_install_options})
265+
vcpkg_cmake_install(ADD_BIN_TO_PATH)
271266
endblock()
272267
vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH)
273268

‎ports/qtwebengine/vcpkg.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
33
"name": "qtwebengine",
44
"version": "6.11.2",
5+
"port-version": 1,
56
"description": "Qt modules for rendering web and PDF content.",
67
"homepage": "https://www.qt.io/",
78
"license": null,

‎ports/vcpkg-tool-nodejs/portfile.cmake‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
21
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
32

43
set(PROGNAME node)
@@ -17,27 +16,27 @@ set(ARCHIVE_EXT "")
1716
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
1817
set(ARCHIVE "node-v${VERSION}-win-arm64")
1918
set(ARCHIVE_EXT ".zip")
20-
set(HASH f4edd7cf979b56ccc3363142c5ca7ab4e1339f6155e23f8b4278c14cf5f36866a5155e52ec7c245bb12810f402779fd0de73ba0b65684f380fb891821d6ea55d)
19+
set(HASH 50f2d2f911758ba87155a5a70b94600e1ddf9defdf061da9ddcb48a3a5532d39edc1f3c423745ecc1a956075772a41882057f3bc4b28a79a51c2ebca75f3574f)
2120
elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
2221
set(ARCHIVE "node-v${VERSION}-win-x64")
2322
set(ARCHIVE_EXT ".zip")
24-
set(HASH b935659cfddf1229707e9c5d3611d33c3200ca94c1d322438a561fdd4d114e5c9ba1609288b85c8c222f9ac877f1c765416667b8cafe36437fc0b40865ea7890)
23+
set(HASH 49a8d0ff8a8507a19125cabc55c04274f3e46cf9c5cb87f55f67e1b7f6b5158f660a628f24c777d73d3e5b762b7ab195df4e490be8b31064ddc62663feb36118)
2524
elseif(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
2625
set(ARCHIVE "node-v${VERSION}-darwin-x64")
2726
set(ARCHIVE_EXT ".tar.gz")
28-
set(HASH 3982cb5d3f874fb66f845449e763eb9c3e8b48a143194b981de1e034fd7216526eefa8404f81a329af553db8b9987e6872c1ec94cd705a7bfc3b247a05e40e65)
27+
set(HASH 42d0158541ec9016f491e9b75790c0c9d7b5c65701627f8f9073d2ae7ec2c23ca82b33aa1b51e65555bfb0fd5516f546c9ca38012879dbf19319f2a9675100be)
2928
elseif(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
3029
set(ARCHIVE "node-v${VERSION}-darwin-arm64")
3130
set(ARCHIVE_EXT ".tar.gz")
32-
set(HASH 5d2c8c6a04f0503c0a614cfb5bd08ef1315039b0e3fcd368f392a647d98f2ab4b14dacaacc60fb20b9004a15a054d94998fe8b75ec479757b06c5707e2ad9d65)
31+
set(HASH effa05f3b5a8dae81790b2289d37112f87e329e583bdc3e71dc4256caa579541622aa58cacfea8fc5af2e43491ccda33cc48b96a2abe3b98f0afb7ff5e3f967f)
3332
elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
3433
set(ARCHIVE "node-v${VERSION}-linux-x64")
3534
set(ARCHIVE_EXT ".tar.xz")
36-
set(HASH 11dd3f7860436325843d55eec5685d8b1f3da20b19423b4238cac295530ec01e4e100c3463e2092a8bfc661a57d28e7368a02257bb70ad430f2245b3fc8e68db)
35+
set(HASH 2232a5b537320e6aee804cd2b6e26769bb34abad9f90002559b12dc14f723c4436ccb8400dd6df4bdd12202c5d5841be711ba044265701359f203a28b620eb1c)
3736
elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
3837
set(ARCHIVE "node-v${VERSION}-linux-arm64")
3938
set(ARCHIVE_EXT ".tar.xz")
40-
set(HASH c7e09dbdc9c307bb705c2ac625f93612a98ff71dcff21e9f2a19674e9c791ec450eb21b99ba97f9a8f0a4c5274cb22b22129857bb71efad944bfef5d693bfd14)
39+
set(HASH d80682eed574946f59b132fb91b4c3132ad5b7e4e6e1453501785febcd5df08f9b85178a399185145c1e80d81d6664ea51cd2868c634dc508cb0952b16c759ce)
4140
else()
4241
message(FATAL_ERROR "Target not yet supported by '${PORT}'")
4342
endif()
@@ -48,8 +47,6 @@ vcpkg_download_distfile(ARCHIVE_PATH
4847
URLS "${URL}"
4948
SHA512 "${HASH}"
5049
FILENAME "${ARCHIVE}${ARCHIVE_EXT}"
51-
#ALWAYS_REDOWNLOAD
52-
#SKIP_SHA512
5350
)
5451

5552
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")

‎ports/vcpkg-tool-nodejs/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"name": "vcpkg-tool-nodejs",
3-
"version-semver": "24.21.0",
3+
"version-semver": "24.22.1",
44
"supports": "native"
55
}

‎versions/baseline.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8698,7 +8698,7 @@
86988698
},
86998699
"qtwebengine": {
87008700
"baseline": "6.11.2",
8701-
"port-version": 0
8701+
"port-version": 1
87028702
},
87038703
"qtwebsockets": {
87048704
"baseline": "6.11.2",
@@ -10793,7 +10793,7 @@
1079310793
"port-version": 2
1079410794
},
1079510795
"vcpkg-tool-nodejs": {
10796-
"baseline": "24.21.0",
10796+
"baseline": "24.22.1",
1079710797
"port-version": 0
1079810798
},
1079910799
"vcpkg-tool-python2": {

‎versions/q-/qtwebengine.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "8b0cbc1173a543201bfe23f2107ec3ab0fe2aebd",
5+
"version": "6.11.2",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "0e859d472198c8c6a94d0c634de976cde3a91e55",
510
"version": "6.11.2",

‎versions/v-/vcpkg-tool-nodejs.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "aba99cf226517ca200b0d7bf3e483c7f4d2ebcb2",
5+
"version-semver": "24.22.1",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "2a5dc678ae2e9875f5c1980ac5eafcba06a75d20",
510
"version-semver": "24.21.0",

0 commit comments

Comments
 (0)