Fix Eulermaker compile failure
This commit is contained in:
parent
dcf9397ac5
commit
38c3282840
@ -38,7 +38,7 @@
|
|||||||
Summary: Qt6 - QtWebEngine components
|
Summary: Qt6 - QtWebEngine components
|
||||||
Name: qt6-qtwebengine
|
Name: qt6-qtwebengine
|
||||||
Version: 6.5.0
|
Version: 6.5.0
|
||||||
Release: 5
|
Release: 6
|
||||||
|
|
||||||
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
||||||
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
|
# 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
|
# cleaned tarball with patent-encumbered codecs removed from the bundled FFmpeg
|
||||||
# ./qtwebengine-release.sh
|
# ./qtwebengine-release.sh
|
||||||
# ./clean_qtwebengine.sh 6.4.1
|
# ./clean_qtwebengine.sh 6.4.1
|
||||||
|
# remove Source0 file for fix Eulermaker failure
|
||||||
Source0: qtwebengine-everywhere-src-%{version}-clean.tar.xz
|
Source0: qtwebengine-everywhere-src-%{version}-clean.tar.xz
|
||||||
Source100: qtwebengine-everywhere-src-%{version}-clean.tar.xz.0
|
Source100: qtwebengine-everywhere-src-%{version}-clean.tar.xz.0
|
||||||
Source101: qtwebengine-everywhere-src-%{version}-clean.tar.xz.1
|
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)
|
# 32-bit arches not supported (https://bugreports.qt.io/browse/QTBUG-102143)
|
||||||
ExclusiveArch: aarch64 x86_64
|
ExclusiveArch: aarch64 x86_64
|
||||||
|
|
||||||
|
Patch120: qtwebengine-icu-74.patch
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: qt6-srpm-macros
|
BuildRequires: qt6-srpm-macros
|
||||||
@ -343,6 +346,8 @@ popd
|
|||||||
%patch110 -p1 -b .blink-dlopen-h264
|
%patch110 -p1 -b .blink-dlopen-h264
|
||||||
%patch111 -p1
|
%patch111 -p1
|
||||||
|
|
||||||
|
%patch120 -p1
|
||||||
|
|
||||||
# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
|
# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
|
||||||
# never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
|
# never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
|
||||||
sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
|
sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
|
||||||
@ -596,6 +601,9 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Tue Jan 30 2024 peijiankang <peijiankang@kylinos.cn> - 6.5.0-5
|
||||||
- CVE-2023-6112.patch
|
- CVE-2023-6112.patch
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
27
qtwebengine-icu-74.patch
Normal file
27
qtwebengine-icu-74.patch
Normal file
@ -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
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user