summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-08-19 17:02:29 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-22 17:33:38 +0200
commit9c7507ef155d9c248b6d9b12349c52fa1410e482 (patch)
treeaf4e914fe7582afcdf38fcf9223ea4e429fd1513 /recipes-qt/qt5/qtwebengine_git.bb
parent2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (diff)
downloadmeta-qt5-9c7507ef155d9c248b6d9b12349c52fa1410e482.tar.gz
qt: upgrade to latest revision in 5.9 branch
* 3 patches were included upstream Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb11
1 files changed, 5 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 98797493..2815cb9b 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
16 ninja-native \ 16 ninja-native \
17 yasm-native \ 17 yasm-native \
18 qtwebchannel \ 18 qtwebchannel \
19 qtbase qtdeclarative qtxmlpatterns qtquickcontrols \ 19 qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \
20 qtlocation \ 20 qtlocation \
21 libdrm fontconfig pixman openssl pango cairo icu pciutils \ 21 libdrm fontconfig pixman openssl pango cairo icu pciutils \
22 libcap \ 22 libcap \
@@ -130,18 +130,17 @@ RDEPENDS_${PN}-examples += " \
130QT_MODULE_BRANCH_CHROMIUM = "56-based" 130QT_MODULE_BRANCH_CHROMIUM = "56-based"
131 131
132# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 132# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
133# 5.9.meta-qt5.1 133# 5.9.meta-qt5.2
134SRC_URI += " \ 134SRC_URI += " \
135 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 135 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
136 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ 136 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
137 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ 137 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
138 file://0003-Include-dependency-to-QCoreApplication-translate.patch \ 138 file://0003-Include-dependency-to-QCoreApplication-translate.patch \
139 file://0004-Force-host-toolchain-configuration.patch \ 139 file://0004-Force-host-toolchain-configuration.patch \
140 file://0005-Always-compile-QWebEnginePage-print.patch \
141" 140"
142 141
143# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 142# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based
144# 56-based.meta-qt5.1 143# 56-based.meta-qt5.2
145SRC_URI += " \ 144SRC_URI += " \
146 file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ 145 file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
147 file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ 146 file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
@@ -163,8 +162,8 @@ SRC_URI_append_libc-musl = "\
163 file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 162 file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
164" 163"
165 164
166SRCREV_qtwebengine = "73f7be5b2a95eab3dce11caede538eeb7beb71f2" 165SRCREV_qtwebengine = "99f84ffd2c0c78014a24534a863aa1c755abd51c"
167SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" 166SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9"
168SRCREV = "${SRCREV_qtwebengine}" 167SRCREV = "${SRCREV_qtwebengine}"
169 168
170SRCREV_FORMAT = "qtwebengine_chromium" 169SRCREV_FORMAT = "qtwebengine_chromium"