From e8ec89bf1724836b054e8629e5ad90eb4fd97868 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Jan 2018 18:34:53 +0000 Subject: qt: refresh remaining patches and add links to meta-qt5 repos * add comment with link to meta-qt5 repository where the meta-qt5 .patch files are maintained, include branch and tag name so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebengine_git.bb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine_git.bb') diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 48d0cb2a..c36e345d 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -107,6 +107,8 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "49-based" +# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.6 +# 5.6.meta-qt5.1 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ @@ -114,13 +116,16 @@ SRC_URI += " \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ file://0005-Include-dependency-to-QCoreApplication-translate.patch \ - file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ - file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ +" + +# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/49-based +# 49-based.meta-qt5.1 +SRC_URI += " \ + file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch;patchdir=src/3rdparty \ + file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patchh;patchdir=src/3rdparty \ " SRCREV_qtwebengine = "fad625e0ba39e855817bbf206ab9a846d07aeeec" -# This is in git submodule, but we're using latest in 45-based -# SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3" SRCREV_chromium = "cb094c05c5f06489fa64412e7f5d9e194a3f9495" SRCREV = "${SRCREV_qtwebengine}" -- cgit v1.2.3-54-g00ecf