aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2019-04-17 23:32:56 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-04-18 23:04:41 +0000
commite2707a016c3475c167a421c9c73d88f81cc61bd1 (patch)
treee4bae2a878e4c97496dcd536af717f093c9579f2 /recipes-qt/qt5/qtwebengine_git.bb
parent07784245c1822766d54405d835ac2dc08652df1a (diff)
qt5: upgrade to 5.12.3
* be aware that in 3 qt* project the v5.12.3 tag wasn't created yet: qtknx_git.bb:# v5.12.3 tag wasn't created yet qtmqtt_git.bb:# v5.12.3 tag wasn't created yet qtopcua_git.bb:# v5.12.3 tag wasn't created yet * and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch 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.bb12
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index d6730cf9..b65ceea5 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -135,18 +135,18 @@ RDEPENDS_${PN}-examples += " \
QT_MODULE_BRANCH_CHROMIUM = "69-based"
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12
-# 5.12.meta-qt5.2
+# 5.12.meta-qt5.3
SRC_URI += " \
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
file://0001-Force-host-toolchain-configuration.patch \
"
SRC_URI_append_libc-musl = "\
- file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
- file://0004-musl-link-against-libexecinfo.patch \
+ file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
+ file://0003-musl-link-against-libexecinfo.patch \
"
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/69-based
-# 69-based.meta-qt5.3
+# 69-based.meta-qt5.4
SRC_URI += " \
file://chromium/0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
@@ -174,8 +174,8 @@ SRC_URI_append_libc-musl = "\
file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
"
-SRCREV_qtwebengine = "92b078a534390dba64a0dcebcffdab4ce24581b6"
-SRCREV_chromium = "43316b156e65f867a76ed2afd96bf30696c5f4f6"
+SRCREV_qtwebengine = "c7b8d6d87809253241913c595902a11ea506b2b7"
+SRCREV_chromium = "4c7ecce30045daf172dceaeeb86351f60cc91990"
SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine_chromium"