summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-02-22 14:15:12 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-02-26 16:53:07 +0000
commit1d9fbb1576846318e6f842006bf8c27758f094fb (patch)
tree772f2b404ce6bb3c7c06bd381ccc72aa3efa741e /recipes-qt/qt5/qtwebengine_git.bb
parenta5aadb7a92558ea33833a189cc6b6fd1019c2a5b (diff)
downloadmeta-qt5-1d9fbb1576846318e6f842006bf8c27758f094fb.tar.gz
qt5: refresh patches from meta-qt5/qt* repos
* apply: 0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch also for nativesdk-qtbase as the comment says * drop unused: 0001-Add-missing-include-for-struct-timeval.patch which wasn't removed in 5.10.1 upgrade 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.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index bd06a0b1..db089c14 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -124,7 +124,7 @@ RDEPENDS_${PN}-examples += " \
124QT_MODULE_BRANCH_CHROMIUM = "61-based" 124QT_MODULE_BRANCH_CHROMIUM = "61-based"
125 125
126# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.10 126# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.10
127# 5.10.meta-qt5.1 127# 5.10.meta-qt5.2
128SRC_URI += " \ 128SRC_URI += " \
129 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 129 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
130 file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ 130 file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
@@ -137,7 +137,7 @@ SRC_URI_append_libc-musl = "\
137" 137"
138 138
139# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/61-based 139# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/61-based
140# 61-based.meta-qt5.1 140# 61-based.meta-qt5.2
141SRC_URI += " \ 141SRC_URI += " \
142 file://0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ 142 file://0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
143 file://0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ 143 file://0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \