From 82e255907ef90601e6b2b5835869eaeadcc0b263 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 27 Nov 2025 17:17:09 +0800
Subject: [PATCH] sw_64 update node.py to fix build error

---
 qt6-qtwebengine.spec                          | 11 ++++---
 ...t6-qtwebengine-update-node-buildinfo.patch | 33 +++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 sw_64-qt6-qtwebengine-update-node-buildinfo.patch

diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec
index c07bb3e..ecd213f 100644
--- a/qt6-qtwebengine.spec
+++ b/qt6-qtwebengine.spec
@@ -44,7 +44,7 @@
 Summary: Qt6 - QtWebEngine components
 Name:    qt6-qtwebengine
 Version: 6.5.2
-Release: 6
+Release: 7
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -109,6 +109,7 @@ Patch1005: 0001-add-aupport-for-loongarch64.patch
 ## Add sw_64 patches
 Patch2000: sw_64-qt6-qtwebengine.patch
 Patch2001: sw_64-qt6-qtwebengine-use-system-ffmpeg.patch
+Patch2002: sw_64-qt6-qtwebengine-update-node-buildinfo.patch
 
 BuildRequires: cmake
 BuildRequires: make
@@ -405,6 +406,7 @@ popd
 %ifarch sw_64
 %patch2000 -p2 -b .sw_64-qt6-qtwebengine
 %patch2001 -p1
+%patch2002 -p1
 %endif
 
 ##add loongarch64 patch
@@ -474,11 +476,7 @@ export CXXFLAGS="%{optflags} -mcmodel=medium"
   -DFEATURE_webengine_webrtc_pipewire:BOOL=ON \
   -DQT_BUILD_EXAMPLES:BOOL=ON
 
-%ifarch sw_64
-cmake --build . -j4 --verbose
-%else
 cmake --build . %{?_smp_mflags} --verbose
-%endif
 
 %install
 DESTDIR="%{buildroot}" cmake --install .
@@ -698,6 +696,9 @@ done
 
 
 %changelog
+* Mon Dec 01 2025 peijiankang <peijiankang@kylinos.cn> - 6.5.2-7
+- sw_64 update node.py buildinfo to fix build error
+
 * Wed Nov 12 2025 peijiankang <peijiankang@kylinos.cn> - 6.5.2-6
 - sw_64 use system ffmpeg to fix compile error
 
diff --git a/sw_64-qt6-qtwebengine-update-node-buildinfo.patch b/sw_64-qt6-qtwebengine-update-node-buildinfo.patch
new file mode 100644
index 0000000..b8df56a
--- /dev/null
+++ b/sw_64-qt6-qtwebengine-update-node-buildinfo.patch
@@ -0,0 +1,33 @@
+--- qtwebengine-everywhere-src-6.5.2_sw_back/src/3rdparty/chromium/third_party/node/node.py	2025-12-01 18:16:50.975069001 +0800
++++ qtwebengine-everywhere-src-6.5.2_sw/src/3rdparty/chromium/third_party/node/node.py	2025-12-01 22:11:51.900516570 +0800
+@@ -46,11 +46,26 @@
+       universal_newlines=True)
+   stdout, stderr = process.communicate()
+ 
++  if process.returncode == 0:
++     return stdout
++
++  print(f"=== First attempt failed(code: {process.returncode}) ===")
+   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))
++#    # 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))
++    for retry_count in range(2,10):
++      print(f"Retry {retry_count}/10")
++      import time
++      time.sleep(10)
++      process = subprocess.Popen(
++          cmd, cwd=os.getcwd(), stdout=subprocess.PIPE, stderr=subprocess.PIPE,
++          universal_newlines=True)
++      stdout, stderr = process.communicate()
++      if process.returncode == 0:
++        print(f"Success on retry {retry_count}")
++        return stdout
+ 
+   return stdout
+
-- 
Gitee