diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-07-16 10:22:32 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-07-16 10:23:34 +0000 |
commit | c8b3085aa4b0030d6ef07b4703763692c2c58ec0 (patch) | |
tree | e3c7e217cd1282a1dba372966efad1c30a013a37 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |
parent | c7f882712269735ba9ad307e5d7f5e51f8f84368 (diff) | |
download | meta-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/0001-Force-host-toolchain-configuration.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | 8 |
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 d15af51e..610b703f 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 @@ | |||
1 | From eb0b90b8809a8d8bd76999056d74d433a6c23184 Mon Sep 17 00:00:00 2001 | 1 | From 468ed461a955cc1ab3d890178546b79b9d001de9 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] Force host toolchain configuration | 4 | Subject: [PATCH] Force host toolchain configuration |
@@ -58,7 +58,7 @@ index dd0d3e32..6312c867 100644 | |||
58 | " nm = \"$$which(nm)\" " \ | 58 | " nm = \"$$which(nm)\" " \ |
59 | " toolchain_args = { " \ | 59 | " toolchain_args = { " \ |
60 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro | 60 | diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro |
61 | index b6bf9cf..ae419b1 100644 | 61 | index b6bf9cfc..ae419b1a 100644 |
62 | --- a/src/buildtools/gn.pro | 62 | --- a/src/buildtools/gn.pro |
63 | +++ b/src/buildtools/gn.pro | 63 | +++ b/src/buildtools/gn.pro |
64 | @@ -19,8 +19,8 @@ build_pass|!debug_and_release { | 64 | @@ -19,8 +19,8 @@ build_pass|!debug_and_release { |
@@ -73,10 +73,10 @@ index b6bf9cf..ae419b1 100644 | |||
73 | msvc:!clang_cl: gn_gen_args += --use-lto | 73 | msvc:!clang_cl: gn_gen_args += --use-lto |
74 | 74 | ||
75 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | 75 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri |
76 | index 95b7a4b..db0658e 100644 | 76 | index fcce4c31..e3384e58 100644 |
77 | --- a/src/core/config/linux.pri | 77 | --- a/src/core/config/linux.pri |
78 | +++ b/src/core/config/linux.pri | 78 | +++ b/src/core/config/linux.pri |
79 | @@ -116,7 +116,7 @@ contains(QT_ARCH, "mips") { | 79 | @@ -117,7 +117,7 @@ contains(QT_ARCH, "mips") { |
80 | 80 | ||
81 | host_build { | 81 | host_build { |
82 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" | 82 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" |