From 38c3282840b000bc22ae10e8b91164751770d7da Mon Sep 17 00:00:00 2001
From: desert-sailor <dongxing.wang_a@thundersoft.com>
Date: Mon, 5 Feb 2024 17:04:25 +0800
Subject: [PATCH] Fix Eulermaker compile failure

---
 qt6-qtwebengine.spec                          |  10 ++++++-
 qtwebengine-everywhere-src-6.5.0-clean.tar.xz | Bin 10240 -> 0 bytes
 qtwebengine-icu-74.patch                      |  27 ++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)
 delete mode 100644 qtwebengine-everywhere-src-6.5.0-clean.tar.xz
 create mode 100644 qtwebengine-icu-74.patch

diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec
index 68cddb7..7f2a6c6 100644
--- a/qt6-qtwebengine.spec
+++ b/qt6-qtwebengine.spec
@@ -38,7 +38,7 @@
 Summary: Qt6 - QtWebEngine components
 Name:    qt6-qtwebengine
 Version: 6.5.0
-Release: 5
+Release: 6
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -48,6 +48,7 @@ URL:     http://www.qt.io
 # cleaned tarball with patent-encumbered codecs removed from the bundled FFmpeg
 # ./qtwebengine-release.sh
 # ./clean_qtwebengine.sh 6.4.1
+# remove Source0 file for fix Eulermaker failure
 Source0:   qtwebengine-everywhere-src-%{version}-clean.tar.xz
 Source100: qtwebengine-everywhere-src-%{version}-clean.tar.xz.0
 Source101: qtwebengine-everywhere-src-%{version}-clean.tar.xz.1
@@ -86,6 +87,8 @@ Patch111: CVE-2023-6112.patch
 # 32-bit arches not supported (https://bugreports.qt.io/browse/QTBUG-102143)
 ExclusiveArch: aarch64 x86_64
 
+Patch120: qtwebengine-icu-74.patch
+
 BuildRequires: cmake
 BuildRequires: make
 BuildRequires: qt6-srpm-macros
@@ -343,6 +346,8 @@ popd
 %patch110 -p1 -b .blink-dlopen-h264
 %patch111 -p1
 
+%patch120 -p1
+
 # delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
 # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
 sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
@@ -596,6 +601,9 @@ done
 
 
 %changelog
+* Mon Feb 5 2024 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 6.5.0-6
+- remove Source0 file for fix Eulermaker failure
+
 * Tue Jan 30 2024 peijiankang <peijiankang@kylinos.cn> - 6.5.0-5
 - CVE-2023-6112.patch
 
diff --git a/qtwebengine-everywhere-src-6.5.0-clean.tar.xz b/qtwebengine-everywhere-src-6.5.0-clean.tar.xz
deleted file mode 100644
index efcb81650051270bcee1a9949a2de758d0aaebc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10240
zcmeIuK?=e!5QX6!B^O9dB{QC<mO%wcF^v{)Z|l-U73%VTn}IwYf$vr)J6b+nvITos
zc}{057RJ&CZKR2zzgm}fZcE~vgNR%1oX`7yYg5v_#w0TLt%|DivgOlXxA(Dj#d}wV
zp{{Md^=n%?1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
J0R;Xm@B(849nSy&

diff --git a/qtwebengine-icu-74.patch b/qtwebengine-icu-74.patch
new file mode 100644
index 0000000..f9e3870
--- /dev/null
+++ b/qtwebengine-icu-74.patch
@@ -0,0 +1,27 @@
+From 45c6d06ced023d2be72a845ec85d0e7207c007a3 Mon Sep 17 00:00:00 2001
+From: desert-sailor <dongxing.wang_a@thundersoft.com>
+Date: Tue, 20 Feb 2024 18:25:13 +0800
+Subject: [PATCH] fix compile error caused by icu upgrade
+
+---
+ .../blink/renderer/platform/text/text_break_iterator.cc       | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
+index d305427d0..3c797c71e 100644
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
+@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar
+ };
+ // clang-format on
+ 
+-#if U_ICU_VERSION_MAJOR_NUM >= 58
++#if U_ICU_VERSION_MAJOR_NUM >= 74
++#define BA_LB_COUNT (U_LB_COUNT - 8)
++#elif U_ICU_VERSION_MAJOR_NUM >= 58
+ #define BA_LB_COUNT (U_LB_COUNT - 3)
+ #else
+ #define BA_LB_COUNT U_LB_COUNT
+-- 
+2.43.0
+
-- 
Gitee