diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index b861f9c4..e033b89f 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -131,7 +131,7 @@ RDEPENDS_${PN}-examples += " \ | |||
| 131 | QT_MODULE_BRANCH_CHROMIUM = "56-based" | 131 | QT_MODULE_BRANCH_CHROMIUM = "56-based" |
| 132 | 132 | ||
| 133 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 | 133 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 |
| 134 | # 5.9.meta-qt5.7 | 134 | # 5.9.meta-qt5.8 |
| 135 | SRC_URI += " \ | 135 | SRC_URI += " \ |
| 136 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 136 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
| 137 | file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ | 137 | file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ |
| @@ -141,7 +141,7 @@ SRC_URI += " \ | |||
| 141 | " | 141 | " |
| 142 | 142 | ||
| 143 | # 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.7 | 144 | # 56-based.meta-qt5.8 |
| 145 | SRC_URI += " \ | 145 | SRC_URI += " \ |
| 146 | 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 \ |
| 147 | file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ | 147 | file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ |
| @@ -164,8 +164,11 @@ SRC_URI_append_libc-musl = "\ | |||
| 164 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 164 | file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
| 165 | " | 165 | " |
| 166 | 166 | ||
| 167 | SRCREV_qtwebengine = "ff3de56218e1012e3b0dd056356253b105eb6f2e" | 167 | # Use 75283c0240c76b49dade0e2a6c9ad9339b5e2704 |
| 168 | SRCREV_chromium = "13704549b84a86e894d707a97cfe2ad15a86f30c" | 168 | # instead of 86f8a0dfa47fea0ba41c386a9753db94d8de3b54 because |
| 169 | # v5.9.8 tag wasn't merged to 5.9 branch yet | ||
| 170 | SRCREV_qtwebengine = "75283c0240c76b49dade0e2a6c9ad9339b5e2704" | ||
| 171 | SRCREV_chromium = "45ed09101724148401a193e20e3545c8f3de4df2" | ||
| 169 | SRCREV = "${SRCREV_qtwebengine}" | 172 | SRCREV = "${SRCREV_qtwebengine}" |
| 170 | 173 | ||
| 171 | SRCREV_FORMAT = "qtwebengine_chromium" | 174 | SRCREV_FORMAT = "qtwebengine_chromium" |
