summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-01-11 14:55:56 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2020-01-11 14:59:12 +0100
commitb814111ed28cab46d9d896919b2b5fe308614e1d (patch)
tree09b7b2ee7a67ed0e732cc8d789499dde4b90bc8f /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
parent1fde17e1a570aa5495ecbe8a8daae95b628db260 (diff)
downloadmeta-qt5-b814111ed28cab46d9d896919b2b5fe308614e1d.tar.gz
qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
* fixes 0004-mkspecs-Allow-builds-with-libc-glibc.patch which didn't apply at all, because the modified mkspecs/features/configure.prf was dropped completely in: commit 047d61f188aae3fe3ebc689900b8a5c9fb6e901d Author: Michal Klocek michal.klocek@qt.io Date: Fri Aug 9 17:40:29 2019 +0200 Add webengine-core feature The same chunk can be found in src/buildtools/config/support.pri, so I've updated the .patch accordingly, but haven't tried the build with musl yet. * fixes 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch to apply ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_patch: Command Error: 'quilt --quiltrc /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch patching file chromium/cc/base/list_container_helper.cc Hunk #1 FAILED at 13. 1 out of 1 hunk FAILED -- rejects in file chromium/cc/base/list_container_helper.cc patching file chromium/cc/base/list_container_helper.h Hunk #1 FAILED at 8. Hunk #2 succeeded at 174 with fuzz 1. 1 out of 2 hunks FAILED -- rejects in file chromium/cc/base/list_container_helper.h Patch 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch does not apply (enforce with -f) ERROR: Logfile of failure stored in: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/temp/log.do_patch.21067 NOTE: recipe qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0: task do_patch: Failed ERROR: Task (/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb:do_patch) failed with exit code '1' * build is still going (it will be a while on my slow builder) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index 7bda76a2..6b3f6ba6 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From f3f2b6b42d546280a17169ea340d8bef82496516 Mon Sep 17 00:00:00 2001 1From cdadaf40267c81ff730e90798cf486b35bb20758 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
19 3 files changed, 10 insertions(+), 10 deletions(-) 19 3 files changed, 10 insertions(+), 10 deletions(-)
20 20
21diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri 21diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
22index 998aedc..b04db36 100644 22index ee08f81b..297a6862 100644
23--- a/src/buildtools/config/linux.pri 23--- a/src/buildtools/config/linux.pri
24+++ b/src/buildtools/config/linux.pri 24+++ b/src/buildtools/config/linux.pri
25@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") { 25@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") {
@@ -32,7 +32,7 @@ index 998aedc..b04db36 100644
32 # Don't bother trying to use system libraries in this case 32 # Don't bother trying to use system libraries in this case
33 gn_args += use_glib=false 33 gn_args += use_glib=false
34diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 34diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
35index dd0d3e3..6312c86 100644 35index dd0d3e32..6312c867 100644
36--- a/src/buildtools/configure_host.pro 36--- a/src/buildtools/configure_host.pro
37+++ b/src/buildtools/configure_host.pro 37+++ b/src/buildtools/configure_host.pro
38@@ -4,7 +4,7 @@ TEMPLATE = aux 38@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -71,7 +71,7 @@ index dd0d3e3..6312c86 100644
71 " nm = \"$$which(nm)\" " \ 71 " nm = \"$$which(nm)\" " \
72 " toolchain_args = { " \ 72 " toolchain_args = { " \
73diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro 73diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
74index 033202e..a8ca656 100644 74index 033202e6..a8ca6567 100644
75--- a/src/buildtools/gn.pro 75--- a/src/buildtools/gn.pro
76+++ b/src/buildtools/gn.pro 76+++ b/src/buildtools/gn.pro
77@@ -19,8 +19,8 @@ build_pass|!debug_and_release { 77@@ -19,8 +19,8 @@ build_pass|!debug_and_release {