diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-19 15:44:17 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:06 +0200 |
commit | 2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (patch) | |
tree | bdf9c293b998f776a26d6ad2ec273f282333f929 /recipes-qt/qt5/qtwebengine_git.bb | |
parent | a0b2220b5e08a7914d55afec0ff6e2316cb47404 (diff) | |
download | meta-qt5-2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed.tar.gz |
qt: refresh remaining patches and add links to meta-qt5 repos
* remove
qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch
qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
which is already applied and fuzzy patch just apply the same section
twice
* restore
qttools/0001-add-noqtwebkit-configuration.patch
which was removed from SRC_URI in 5.9 upgrade
* 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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 830e6402..98797493 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -130,6 +130,7 @@ RDEPENDS_${PN}-examples += " \ | |||
130 | QT_MODULE_BRANCH_CHROMIUM = "56-based" | 130 | QT_MODULE_BRANCH_CHROMIUM = "56-based" |
131 | 131 | ||
132 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 | 132 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 |
133 | # 5.9.meta-qt5.1 | ||
133 | SRC_URI += " \ | 134 | SRC_URI += " \ |
134 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 135 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
135 | file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ | 136 | file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ |
@@ -140,6 +141,7 @@ SRC_URI += " \ | |||
140 | " | 141 | " |
141 | 142 | ||
142 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based | 143 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based |
144 | # 56-based.meta-qt5.1 | ||
143 | SRC_URI += " \ | 145 | SRC_URI += " \ |
144 | file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ | 146 | file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ |
145 | file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ | 147 | file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ |