diff options
author | Chenxi Mao <parheliamm@126.com> | 2020-04-10 08:46:18 +0800 |
---|---|---|
committer | Chenxi Mao <parheliamm@126.com> | 2020-04-11 15:21:38 +0800 |
commit | dd2fd47dc0acdf90f73a639149aa59269a72f9cb (patch) | |
tree | 84a26d65e6cb33040db0b77b79177f4801696f9d /recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch | |
parent | 84278d09aef9f917dd695df8c424c5d61395bdf3 (diff) | |
download | meta-qt5-dd2fd47dc0acdf90f73a639149aa59269a72f9cb.tar.gz |
QTWebKit: Fix build error on QT-5.15 branch
There are 2 changes to build QtWebkit on QT-5.15
1. Move SHA1 to QTwebkit tag QtWebKit 5.212.0 Alpha 4
SHA1: 444bd2bda5fa46c2b4b99adaf6e9b2074b03a0d1
2. Remove python3 patch.
Fixes: QTBUG-83426
Change-Id: I6a1f1d8a29c828e28e3c8192c1b863a85991080e
Reviewed-by: Chenxi Mao <chenxi.mao2013@gmail.com>
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch new file mode 100644 index 00000000..ffd8da0f --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From f6576377f8bf2c854d8079b7f309f570b3d2bde4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
3 | Date: Fri, 31 Aug 2018 15:42:48 +0900 | ||
4 | Subject: [PATCH] Fix build bug for armv32 BE. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
9 | --- | ||
10 | Source/WTF/wtf/dtoa/utils.h | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h | ||
14 | index 889642cee..05302e6e6 100644 | ||
15 | --- a/Source/WTF/wtf/dtoa/utils.h | ||
16 | +++ b/Source/WTF/wtf/dtoa/utils.h | ||
17 | @@ -49,7 +49,7 @@ | ||
18 | defined(__ARMEL__) || \ | ||
19 | defined(_MIPS_ARCH_MIPS32R2) | ||
20 | #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 | ||
21 | -#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) | ||
22 | +#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(ARM) | ||
23 | #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 | ||
24 | #elif defined(_M_IX86) || defined(__i386__) | ||
25 | #if defined(_WIN32) | ||