summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2019-07-16 10:22:32 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-07-16 10:23:34 +0000
commitc8b3085aa4b0030d6ef07b4703763692c2c58ec0 (patch)
treee3c7e217cd1282a1dba372966efad1c30a013a37 /recipes-qt/qt5/qtwebengine_git.bb
parentc7f882712269735ba9ad307e5d7f5e51f8f84368 (diff)
downloadmeta-qt5-c8b3085aa4b0030d6ef07b4703763692c2c58ec0.tar.gz
qtwebengine: refresh the patches to apply
* 4 musl patches didn't apply at all * 0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch is dropped, because whole chromium/device/serial/serial_io_handler_posix.cc was removed in upgrade to 73: commit 38a9a29f4f9436cace7f0e7abf9c586057df8a4e Author: Allan Sandfeld Jensen <allan.jensen@qt.io> Date: Wed Feb 13 16:23:34 2019 +0100 Subject: BASELINE: Update Chromium to 73.0.3683.37 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.bb39
1 files changed, 19 insertions, 20 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index a281cba2..a0179059 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -134,8 +134,8 @@ RDEPENDS_${PN}-examples += " \
134 134
135QT_MODULE_BRANCH_CHROMIUM = "73-based" 135QT_MODULE_BRANCH_CHROMIUM = "73-based"
136 136
137# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12 137# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13
138# 5.12.meta-qt5.4 138# 5.13.meta-qt5.1
139SRC_URI += " \ 139SRC_URI += " \
140 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 140 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
141 file://0001-Force-host-toolchain-configuration.patch \ 141 file://0001-Force-host-toolchain-configuration.patch \
@@ -145,28 +145,27 @@ SRC_URI_append_libc-musl = "\
145 file://0003-musl-link-against-libexecinfo.patch \ 145 file://0003-musl-link-against-libexecinfo.patch \
146" 146"
147 147
148# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/69-based 148# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/73-based
149# 69-based.meta-qt5.4 149# 73-based.meta-qt5.1
150SRC_URI += " \ 150SRC_URI += " \
151 file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ 151 file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
152 file://chromium/0004-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ 152 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
153 file://chromium/0019-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ 153 file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
154 file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ 154 file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
155 file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ 155 file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
156" 156"
157 157
158SRC_URI_append_libc-musl = "\ 158SRC_URI_append_libc-musl = "\
159 file://chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ 159 file://chromium/0006-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
160 file://chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ 160 file://chromium/0007-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
161 file://chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ 161 file://chromium/0008-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
162 file://chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ 162 file://chromium/0009-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
163 file://chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ 163 file://chromium/0010-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
164 file://chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ 164 file://chromium/0011-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
165 file://chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ 165 file://chromium/0012-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
166 file://chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ 166 file://chromium/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
167 file://chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ 167 file://chromium/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
168 file://chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ 168 file://chromium/0015-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
169 file://chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \
170 file://chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \ 169 file://chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
171 file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ 170 file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
172 file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 171 file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \