[qtwebengine] Improve node failure diagnostics (#52685)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Billy O'Neal 2026-07-02 12:37:01 -07:00 committed by GitHub
parent 1600ce2ba1
commit 7739291eef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,24 @@
diff --git a/src/3rdparty/chromium/third_party/node/node.py b/src/3rdparty/chromium/third_party/node/node.py
index 3af0f1d9ee..20516742f5 100644
--- a/src/3rdparty/chromium/third_party/node/node.py
+++ b/src/3rdparty/chromium/third_party/node/node.py
@@ -32,9 +32,15 @@ def RunNode(cmd_parts, stdout=None):
stdout, stderr = process.communicate()
if process.returncode != 0:
- # Handle cases where stderr is empty, even though the command failed, for
- # example https://github.com/microsoft/TypeScript/issues/615
- err = stderr if len(stderr) > 0 else stdout
- raise RuntimeError('Command \'%s\' failed\n%s' % (' '.join(cmd), err))
+ details = [
+ 'Command \'%s\' failed with exit code %d' %
+ (' '.join(cmd), process.returncode),
+ 'Working directory: %s' % os.getcwd(),
+ 'stdout:',
+ stdout,
+ 'stderr:',
+ stderr,
+ ]
+ raise RuntimeError('\n'.join(details))
return stdout

View File

@ -13,6 +13,7 @@ set(${PORT}_PATCHES
#"pkg-config.diff"
"rpath.diff"
"include-dir-order.diff"
"node-wrapper-diagnostics.diff"
)
set(qtwebengine_target "${VCPKG_TARGET_TRIPLET}-${VCPKG_CMAKE_SYSTEM_NAME}")

View File

@ -2,6 +2,7 @@
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
"name": "qtwebengine",
"version": "6.11.1",
"port-version": 1,
"description": "Qt modules for rendering web and PDF content.",
"homepage": "https://www.qt.io/",
"license": null,

View File

@ -8570,7 +8570,7 @@
},
"qtwebengine": {
"baseline": "6.11.1",
"port-version": 0
"port-version": 1
},
"qtwebsockets": {
"baseline": "6.11.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aa9371eee2255a22028bb2706483742f33d95149",
"version": "6.11.1",
"port-version": 1
},
{
"git-tree": "dd7f00da04426952df330785997501ae4ede11b3",
"version": "6.11.1",