fix build error
This commit is contained in:
parent
4b8aab82ef
commit
1d601b9f89
@ -6,7 +6,7 @@
|
||||
|
||||
Name: qt5-qtwebengine
|
||||
Version: 5.11.1
|
||||
Release: 9
|
||||
Release: 10
|
||||
Summary: Qt5 - QtWebEngine components
|
||||
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
|
||||
URL: http://www.qt.io
|
||||
@ -42,6 +42,7 @@ Patch0006: qtwebengine-everywhere-src-5.10.0-gn-bootstrap-verbose.patch
|
||||
# to get the value we expect (and chromium checks for). Patch by spot.
|
||||
# From: https://gitlab.com/unity-mageia/qtwebengine5/-/blob/master/qtwebengine-everywhere-src-5.10.1-gcc8-alignof.patch
|
||||
Patch0009: qtwebengine-everywhere-src-5.10.1-gcc8-alignof.patch
|
||||
Patch0010: qtwebengine-everywhere-src-5.11.1-fix-U16_NEXT-calls.patch
|
||||
Patch6000: qtwebengine-fix-pluse-stubs.patch
|
||||
|
||||
BuildRequires: qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtdeclarative-devel qt5-qtxmlpatterns-devel
|
||||
@ -220,6 +221,9 @@ done
|
||||
%{_qt5_examplesdir}/
|
||||
|
||||
%changelog
|
||||
* Fri Jul 24 2020 maminjie <maminjie1@huawei.com> -5.11.1-10
|
||||
- Fix the build error for U16_NEXT calls
|
||||
|
||||
* Sun Jun 28 2020 huanghaitao <huanghaitao8@huawei.com> -5.11.1-9
|
||||
- Fix the build errors with conflicting declaration of C
|
||||
|
||||
|
||||
25
qtwebengine-everywhere-src-5.11.1-fix-U16_NEXT-calls.patch
Normal file
25
qtwebengine-everywhere-src-5.11.1-fix-U16_NEXT-calls.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 2b1230ac17f65fab59d2ad71e3b2b27a7071f125 Mon Sep 17 00:00:00 2001
|
||||
From: maminjie <maminjie1@huawei.com>
|
||||
Date: Thu, 23 Jul 2020 18:11:45 +0800
|
||||
Subject: [PATCH] fix U16_NEXT calls
|
||||
|
||||
---
|
||||
.../chromium/third_party/WebKit/Source/core/dom/Document.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/core/dom/Document.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/core/dom/Document.cpp
|
||||
index 7a4260bd3..004ccfd10 100644
|
||||
--- a/src/3rdparty/chromium/third_party/WebKit/Source/core/dom/Document.cpp
|
||||
+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/dom/Document.cpp
|
||||
@@ -5415,7 +5415,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
|
||||
|
||||
for (unsigned i = 0; i < length;) {
|
||||
UChar32 c;
|
||||
- U16_NEXT(characters, i, length, c)
|
||||
+ U16_NEXT(characters, i, length, c);
|
||||
if (c == ':') {
|
||||
if (saw_colon)
|
||||
return ParseQualifiedNameResult(kQNMultipleColons);
|
||||
--
|
||||
2.23.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user