diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index db98ee37..11ee347e 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -124,7 +124,7 @@ RDEPENDS_${PN}-examples += " \ | |||
124 | QT_MODULE_BRANCH_CHROMIUM = "65-based" | 124 | QT_MODULE_BRANCH_CHROMIUM = "65-based" |
125 | 125 | ||
126 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11 | 126 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11 |
127 | # 5.11.meta-qt5.5 | 127 | # 5.11.meta-qt5.6 |
128 | SRC_URI += " \ | 128 | SRC_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 \ |
@@ -138,31 +138,30 @@ SRC_URI_append_libc-musl = "\ | |||
138 | " | 138 | " |
139 | 139 | ||
140 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/65-based | 140 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/65-based |
141 | # 65-based.meta-qt5.5 | 141 | # 65-based.meta-qt5.6 |
142 | SRC_URI += " \ | 142 | SRC_URI += " \ |
143 | file://chromium/0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ | 143 | file://chromium/0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ |
144 | file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ | 144 | file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ |
145 | file://chromium/0003-chromium-Fix-build-with-gcc8.patch;patchdir=src/3rdparty \ | 145 | file://chromium/0003-chromium-Fix-build-with-gcc8.patch;patchdir=src/3rdparty \ |
146 | file://chromium/0004-chromium-Fix-build-with-GCC-8.1.0.patch;patchdir=src/3rdparty \ | ||
147 | " | 146 | " |
148 | 147 | ||
149 | SRC_URI_append_libc-musl = "\ | 148 | SRC_URI_append_libc-musl = "\ |
150 | file://chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ | 149 | file://chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ |
151 | file://chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ | 150 | file://chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ |
152 | file://chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ | 151 | file://chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ |
153 | file://chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ | 152 | file://chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ |
154 | file://chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ | 153 | file://chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ |
155 | file://chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ | 154 | file://chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ |
156 | file://chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ | 155 | file://chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ |
157 | file://chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ | 156 | file://chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ |
158 | file://chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ | 157 | file://chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ |
159 | file://chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ | 158 | file://chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ |
160 | file://chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ | 159 | file://chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ |
161 | file://chromium/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | 160 | file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
162 | " | 161 | " |
163 | 162 | ||
164 | SRCREV_qtwebengine = "28e0320235d33f00c6c141a549dc0553ee0043a5" | 163 | SRCREV_qtwebengine = "fe73e5405716531e85440772f69ad74943024eee" |
165 | SRCREV_chromium = "1785e2c1eb5a3b9a9a97ef3125c8f444d9b62afb" | 164 | SRCREV_chromium = "bad02200c68d7e0c758dc4f1805e58d0e03fdea9" |
166 | SRCREV = "${SRCREV_qtwebengine}" | 165 | SRCREV = "${SRCREV_qtwebengine}" |
167 | 166 | ||
168 | SRCREV_FORMAT = "qtwebengine_chromium" | 167 | SRCREV_FORMAT = "qtwebengine_chromium" |