aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-02-22 14:51:05 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-04-20 10:06:37 +0000
commitf33be06035faaa59cee17e5a97e82d079b4ab444 (patch)
tree79d1a995808932b7e9fae144e2b13ddb0b4908a2 /recipes-qt/qt5/qtwebengine_git.bb
parentc7549747b6e83e9630ae37c7e2595e41e4f1ebac (diff)
qt5: upgrade to 5.11 Alpha
* use qtwebkit and qtwebkit-examples from dev branch, because there is no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in qt5-git.inc nobody noticed). * qtbase: drop qml-debug options removed from qtbase in: commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1 Author: Ulf Hermann <ulf.hermann@qt.io> Date: Fri Oct 6 16:27:09 2017 +0200 Subject: Remove qml-debug configure flag and feature * qtgraphicaleffects, qtquickcontrols2, qtquickcontrols, qtvirtualkeyboard: add qtdeclarative-native dependency needed for qmlcachegen binary * qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs referenced files disappered in: commit 6882a04fb36642862b11efe514251d32070c3d65 Author: Konstantin Tokarev <annulen@yandex.ru> Date: Thu Aug 25 19:20:41 2016 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) 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.bb25
1 files changed, 12 insertions, 13 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index db089c14..1d1763d0 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -121,10 +121,10 @@ RDEPENDS_${PN}-examples += " \
qtdeclarative-qmlplugins \
"
-QT_MODULE_BRANCH_CHROMIUM = "61-based"
+QT_MODULE_BRANCH_CHROMIUM = "63-based"
-# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.10
-# 5.10.meta-qt5.2
+# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11
+# 5.11.meta-qt5.1
SRC_URI += " \
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
@@ -136,8 +136,8 @@ SRC_URI_append_libc-musl = "\
file://0005-musl-link-against-libexecinfo.patch \
"
-# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/61-based
-# 61-based.meta-qt5.2
+# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/63-based
+# 63-based.meta-qt5.1
SRC_URI += " \
file://0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
file://0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
@@ -151,16 +151,15 @@ SRC_URI_append_libc-musl = "\
file://0007-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
file://0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
file://0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
- file://0010-chromium-musl-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty \
- file://0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
- file://0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
- file://0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
- file://0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \
- file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
+ file://0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
+ file://0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
+ file://0012-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
+ file://0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \
+ file://0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
"
-SRCREV_qtwebengine = "9dc8dff7a8f4d58f71d816375d49f8829f06aae5"
-SRCREV_chromium = "c858cc76099db0af82a264b3c6f921a287cfcb42"
+SRCREV_qtwebengine = "732d09331c1e4efa51501aae9bcd6924eecdd5c3"
+SRCREV_chromium = "3fa04d22883e42bd987e4f83d394a1040b410024"
SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine_chromium"