!28 LLVM平行宇宙:支持使用clang构建qt5-qtwebengine
From: @ren-yi43 Reviewed-by: @peijiankang Signed-off-by: @peijiankang
This commit is contained in:
commit
22de4075ff
@ -52,7 +52,7 @@
|
|||||||
Summary: Qt5 - QtWebEngine components
|
Summary: Qt5 - QtWebEngine components
|
||||||
Name: qt5-qtwebengine
|
Name: qt5-qtwebengine
|
||||||
Version: 5.15.10
|
Version: 5.15.10
|
||||||
Release: 1
|
Release: 2
|
||||||
|
|
||||||
# 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
|
||||||
@ -108,6 +108,7 @@ Patch32: qtwebengine-skia-missing-includes.patch
|
|||||||
## Cf. https://bugzilla.redhat.com/show_bug.cgi?id=2144200
|
## Cf. https://bugzilla.redhat.com/show_bug.cgi?id=2144200
|
||||||
## From: https://chromium-review.googlesource.com/c/chromium/src/+/3545665
|
## From: https://chromium-review.googlesource.com/c/chromium/src/+/3545665
|
||||||
Patch33: qtwebengine-5.15-Backport-of-16k-page-support-on-aarch64.patch
|
Patch33: qtwebengine-5.15-Backport-of-16k-page-support-on-aarch64.patch
|
||||||
|
Patch34: qtwebengine-support-clang-compile.patch
|
||||||
|
|
||||||
## Upstream patches:
|
## Upstream patches:
|
||||||
# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
|
# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
|
||||||
@ -415,6 +416,7 @@ popd
|
|||||||
%patch31 -p1 -b .TRUE
|
%patch31 -p1 -b .TRUE
|
||||||
%patch32 -p1 -b .skia-missing-includes
|
%patch32 -p1 -b .skia-missing-includes
|
||||||
%patch33 -p1 -b .aarch64-16kb-support
|
%patch33 -p1 -b .aarch64-16kb-support
|
||||||
|
%patch34 -p1 -b .support-clang-compile
|
||||||
|
|
||||||
# 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
|
||||||
@ -632,6 +634,9 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 20 2023 renyi <977713017@qq.com> - 5.15.10-2
|
||||||
|
- Support building this package with clang
|
||||||
|
|
||||||
* Fri Dec 16 2022 peijiankang <peijiankang@kylinos.cn> -5.15.10-1
|
* Fri Dec 16 2022 peijiankang <peijiankang@kylinos.cn> -5.15.10-1
|
||||||
- update upstream version to 5.15.10
|
- update upstream version to 5.15.10
|
||||||
|
|
||||||
|
|||||||
34
qtwebengine-support-clang-compile.patch
Normal file
34
qtwebengine-support-clang-compile.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From a9c6557bc3188478e1fe72049b6786d187aaabb2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: 15859157387 <977713017@qq.com>
|
||||||
|
Date: Wed, 20 Sep 2023 17:12:23 +0800
|
||||||
|
Subject: [PATCH] support clang compile
|
||||||
|
|
||||||
|
---
|
||||||
|
.../third_party/skia/src/opts/SkRasterPipeline_opts.h | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||||
|
index 4abad712d..c80ba130e 100644
|
||||||
|
--- a/src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||||
|
+++ b/src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||||
|
@@ -980,7 +980,7 @@ SI F approx_powf(F x, F y) {
|
||||||
|
SI F from_half(U16 h) {
|
||||||
|
#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
|
||||||
|
&& !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
||||||
|
-#if defined(SK_BUILD_FOR_MAC)
|
||||||
|
+#if defined(__ARM_FP16_FORMAT_IEEE)
|
||||||
|
return vcvt_f32_f16(h);
|
||||||
|
#else
|
||||||
|
__fp16 fp16;
|
||||||
|
@@ -1006,7 +1006,7 @@ SI F from_half(U16 h) {
|
||||||
|
SI U16 to_half(F f) {
|
||||||
|
#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
|
||||||
|
&& !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
||||||
|
-#if defined(SK_BUILD_FOR_MAC)
|
||||||
|
+#if defined(__ARM_FP16_FORMAT_IEEE)
|
||||||
|
return vcvt_f16_f32(f);
|
||||||
|
#else
|
||||||
|
__fp16 fp16 = __fp16(f);
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user