summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit_git.bb
diff options
context:
space:
mode:
authorChenxi Mao <parheliamm@126.com>2020-04-10 08:46:18 +0800
committerChenxi Mao <parheliamm@126.com>2020-04-11 15:21:38 +0800
commitdd2fd47dc0acdf90f73a639149aa59269a72f9cb (patch)
tree84a26d65e6cb33040db0b77b79177f4801696f9d /recipes-qt/qt5/qtwebkit_git.bb
parent84278d09aef9f917dd695df8c424c5d61395bdf3 (diff)
downloadmeta-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_git.bb')
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb13
1 files changed, 6 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 4655d9fd..675eeb6f 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -12,11 +12,10 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-
12# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.13 12# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.13
13# 5.13.meta-qt5.1 13# 5.13.meta-qt5.1
14SRC_URI += "\ 14SRC_URI += "\
15 file://0001-Port-build-to-python3.patch \ 15 file://0001-Do-not-skip-build-for-cross-compile.patch \
16 file://0002-Do-not-skip-build-for-cross-compile.patch \ 16 file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \
17 file://0003-Fix-build-with-non-glibc-libc-on-musl.patch \ 17 file://0003-Fix-build-bug-for-armv32-BE.patch \
18 file://0004-Fix-build-bug-for-armv32-BE.patch \ 18 file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \
19 file://0005-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \
20" 19"
21 20
22inherit cmake_qt5 perlnative 21inherit cmake_qt5 perlnative
@@ -81,6 +80,6 @@ PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen"
81# remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe 80# remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe
82PACKAGES_remove = "${PN}-examples" 81PACKAGES_remove = "${PN}-examples"
83 82
84QT_MODULE_BRANCH = "dev" 83QT_MODULE_BRANCH = "5.212"
85 84
86SRCREV = "ab1bd15209abaf7effc51dbc2f272c5681af7223" 85SRCREV = "444bd2bda5fa46c2b4b99adaf6e9b2074b03a0d1"