diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-21 13:37:43 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-23 08:51:04 +0000 |
commit | e015edf046a88ca13dd603265f71a6e05662db72 (patch) | |
tree | f583c5c28c49a5a20c8be2d55e8a7c126ed8f1d4 /recipes-qt/qt5/qtwebengine_git.bb | |
parent | af9c256fc4e99ec4692b4b95bffa85018bd8c767 (diff) | |
download | meta-qt5-e015edf046a88ca13dd603265f71a6e05662db72.tar.gz |
qtwebengine: update to 61-based chromium
Change-Id: I6f7f023a6517a5813c5243417207f9c872f07ecf
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index f6318e15..f3c7c142 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -120,14 +120,12 @@ RDEPENDS_${PN}-examples += " \ | |||
120 | qtdeclarative-qmlplugins \ | 120 | qtdeclarative-qmlplugins \ |
121 | " | 121 | " |
122 | 122 | ||
123 | QT_MODULE_BRANCH_CHROMIUM = "58-based" | 123 | QT_MODULE_BRANCH_CHROMIUM = "61-based" |
124 | 124 | ||
125 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 | 125 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 |
126 | # 5.9.meta-qt5.3 | 126 | # 5.9.meta-qt5.3 |
127 | SRC_URI += " \ | 127 | SRC_URI += " \ |
128 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 128 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
129 | file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ | ||
130 | file://0001-Build-accessibility-tests-only-when-Qt-is-configured.patch \ | ||
131 | file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ | 129 | file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ |
132 | file://0003-Include-dependency-to-QCoreApplication-translate.patch \ | 130 | file://0003-Include-dependency-to-QCoreApplication-translate.patch \ |
133 | file://0004-Force-host-toolchain-configuration.patch \ | 131 | file://0004-Force-host-toolchain-configuration.patch \ |
@@ -136,7 +134,6 @@ SRC_URI += " \ | |||
136 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based | 134 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based |
137 | # 56-based.meta-qt5.2 | 135 | # 56-based.meta-qt5.2 |
138 | SRC_URI += " \ | 136 | SRC_URI += " \ |
139 | file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ | ||
140 | file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ | 137 | file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ |
141 | file://0003-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ | 138 | file://0003-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ |
142 | " | 139 | " |
@@ -157,8 +154,8 @@ SRC_URI_append_libc-musl = "\ | |||
157 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 154 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
158 | " | 155 | " |
159 | 156 | ||
160 | SRCREV_qtwebengine = "f32b3514a5186bc4f5452f004324bdb7782d30a3" | 157 | SRCREV_qtwebengine = "5617373d9b5ded9d4c724b15132d6989ed9e05f9" |
161 | SRCREV_chromium = "582c5493439ba9ac57c6c14c706f530741f5bfc8" | 158 | SRCREV_chromium = "2366767e6c6f333ef090667aa6838d6781725a78" |
162 | SRCREV = "${SRCREV_qtwebengine}" | 159 | SRCREV = "${SRCREV_qtwebengine}" |
163 | 160 | ||
164 | SRCREV_FORMAT = "qtwebengine_chromium" | 161 | SRCREV_FORMAT = "qtwebengine_chromium" |