diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-04-03 14:27:39 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-04-03 14:27:39 +0200 |
commit | 6b2323f39b5ddf0580f3d0e2c31b5609327f509c (patch) | |
tree | 90203f3013ff0fabd9b3d54ef829a1369b35a9aa /recipes-qt/qt5/qtwebengine_git.bb | |
parent | 20ae10f00fbf580183742119b92cc872a4ecd75c (diff) | |
download | meta-qt5-6b2323f39b5ddf0580f3d0e2c31b5609327f509c.tar.gz |
qtwebengine: update patches for beta2
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 | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index f6fc3251..f229f7e7 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -145,20 +145,19 @@ RDEPENDS_${PN}-examples += " \ | |||
145 | QT_MODULE_BRANCH_CHROMIUM = "79-based" | 145 | QT_MODULE_BRANCH_CHROMIUM = "79-based" |
146 | 146 | ||
147 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 | 147 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 |
148 | # 5.15.meta-qt5.1 | 148 | # 5.15.meta-qt5.2 |
149 | SRC_URI += " \ | 149 | SRC_URI += " \ |
150 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 150 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
151 | file://0001-Force-host-toolchain-configuration.patch \ | 151 | file://0001-Force-host-toolchain-configuration.patch \ |
152 | file://0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch \ | ||
153 | " | 152 | " |
154 | SRC_URI_append_libc-musl = "\ | 153 | SRC_URI_append_libc-musl = "\ |
155 | file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ | 154 | file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ |
156 | file://0004-musl-link-against-libexecinfo.patch \ | 155 | file://0003-musl-link-against-libexecinfo.patch \ |
157 | file://0005-mkspecs-Allow-builds-with-libc-glibc.patch \ | 156 | file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \ |
158 | " | 157 | " |
159 | 158 | ||
160 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/79-based | 159 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/79-based |
161 | # 79-based.meta-qt5.1 | 160 | # 79-based.meta-qt5.2 |
162 | SRC_URI += " \ | 161 | SRC_URI += " \ |
163 | file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ | 162 | file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ |
164 | file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ | 163 | file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ |
@@ -175,19 +174,19 @@ SRC_URI += " \ | |||
175 | " | 174 | " |
176 | 175 | ||
177 | SRC_URI_append_libc-musl = "\ | 176 | SRC_URI_append_libc-musl = "\ |
178 | file://chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ | 177 | file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ |
179 | file://chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ | 178 | file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ |
180 | file://chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ | 179 | file://chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ |
181 | file://chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ | 180 | file://chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ |
182 | file://chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ | 181 | file://chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ |
183 | file://chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ | 182 | file://chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ |
184 | file://chromium/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ | 183 | file://chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ |
185 | file://chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ | 184 | file://chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ |
186 | file://chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ | 185 | file://chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ |
187 | file://chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ | 186 | file://chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ |
188 | file://chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \ | 187 | file://chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \ |
189 | file://chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ | 188 | file://chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ |
190 | file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 189 | file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
191 | " | 190 | " |
192 | 191 | ||
193 | SRCREV_qtwebengine = "3394cde4e89463ba49af379b89863c7731c4b4ac" | 192 | SRCREV_qtwebengine = "3394cde4e89463ba49af379b89863c7731c4b4ac" |