summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-04-14 10:42:58 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-04-15 08:19:56 +0300
commit7de0cbd5dc9f80972ce559c9e340afbff0b9403d (patch)
treea7011b9b55ba590406919a1873d01c20aea5d0ea /recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
parent374abadf749bbf8f3d84e2e895c2139722447a01 (diff)
parent02930760c8be7c9d850919cda89469e9c0120d6c (diff)
downloadmeta-qt5-7de0cbd5dc9f80972ce559c9e340afbff0b9403d.tar.gz
Merge remote-tracking branch 'qt/upstream/master' into 5.15
* Diff in SRCREVs are due checkout from commit vs. checkout from corresponding tag in modules. The content is the same. * metatypes inclusion was a bit different in upstream, synced with upstream * update module_config.yaml * upstream/master: 02930760 qtmultimedia: create /usr/lib/plugins/videoeglvideonode referenced by Qt5MultimediaConfig.cmake b8bcf8cb qt5: upgrade to 5.15 beta3 eac416fe qtdeclarative: bump SRCREV 6558d2b5 nativesdk-qtbase: fix unpackaged files 6b2323f3 qtwebengine: update patches for beta2 20ae10f0 qt5: upgrade to 5.15 beta2 a01de873 qtwebengine: fix QT_MODULE_BRANCH_CHROMIUM b88c292a qtquick3d: Fix branch for fetching assimp submodule df67d5a7 qt3d: update patch to apply a38953a6 qt5: upgrade to latest revisions in 5.15 branch 9a645b02 qtwebengine: update patches for latest 5.15 revision 6cce9817 qtwebengine: update patches for 5.15 50e35581 qtbase: update patches for latest 5.15 revision 9f024a55 qtdeclarative: add dependency on qtdeclarative-native 76125ba8 qt5.inc: package metatypes files f3379951 qtbase: drop xkb, xcb-xinput PACKAGECONFIGs 44405373 qt5: upgrade to latest revisions in 5.15 branch 5e189731 layer: Mark dunfell as the only compatible release 3e759d82 qtwebengine: Fix build with ninja >= 1.10.0 f712bf9f python-pyqt5: remove PyQt_qreal_double from DISABLED_FEATURES 79b0f3a6 python-pyqtchart: remove PyQt_qreal_double from DISABLED_FEATURES 34ae49f8 qtmultimedia: Enable gstreamer support 108b5664 gstreamer1.0-plugins-good: Turn on qt5 packageconfig 4b6ce100 qt5-creator: Inherit mime-xdg 89de99e7 python-{pyqt5,pyqtchart}: fold .inc file into .bb 5d790449 python-pyqt5: drop python 2 recipe b2a958a4 python-pyqt5: disable whole PyQt_OpenGL and QtWidgets, QtQuickWidgets, QtQuick modules without opengl in DISTRO_FEATURES Conflicts: conf/layer.conf recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick3d_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebview_git.bb Change-Id: I61a651fd16d475ac0d8bbe119a3e3a8038692726
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
index 55f61d03..0171a5dd 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
@@ -1,4 +1,4 @@
1From e44d59aff5c23049ed765d872b167c27f9d2be23 Mon Sep 17 00:00:00 2001 1From e590e511b89a08867a801cb20e4e98787cb36e78 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Feb 2019 19:28:59 -0800 3Date: Sat, 2 Feb 2019 19:28:59 -0800
4Subject: [PATCH] chromium: fix build with clang 4Subject: [PATCH] chromium: fix build with clang
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 2 insertions(+), 25 deletions(-) 10 1 file changed, 2 insertions(+), 25 deletions(-)
11 11
12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
13index be485fd89b9..7179df05451 100644 13index ab47e2b98f8..f5ac335af90 100644
14--- a/chromium/build/config/compiler/BUILD.gn 14--- a/chromium/build/config/compiler/BUILD.gn
15+++ b/chromium/build/config/compiler/BUILD.gn 15+++ b/chromium/build/config/compiler/BUILD.gn
16@@ -773,8 +773,6 @@ config("compiler_cpu_abi") { 16@@ -774,8 +774,6 @@ config("compiler_cpu_abi") {
17 } 17 }
18 } else if (current_cpu == "arm") { 18 } else if (current_cpu == "arm") {
19 if (is_clang && !is_android && !is_nacl) { 19 if (is_clang && !is_android && !is_nacl) {
@@ -22,7 +22,7 @@ index be485fd89b9..7179df05451 100644
22 } 22 }
23 if (!is_nacl) { 23 if (!is_nacl) {
24 cflags += [ 24 cflags += [
25@@ -787,8 +785,6 @@ config("compiler_cpu_abi") { 25@@ -788,8 +786,6 @@ config("compiler_cpu_abi") {
26 } 26 }
27 } else if (current_cpu == "arm64") { 27 } else if (current_cpu == "arm64") {
28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) { 28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -31,7 +31,7 @@ index be485fd89b9..7179df05451 100644
31 } 31 }
32 } else if (current_cpu == "mipsel" && !is_nacl) { 32 } else if (current_cpu == "mipsel" && !is_nacl) {
33 ldflags += [ "-Wl,--hash-style=sysv" ] 33 ldflags += [ "-Wl,--hash-style=sysv" ]
34@@ -797,9 +793,6 @@ config("compiler_cpu_abi") { 34@@ -798,9 +794,6 @@ config("compiler_cpu_abi") {
35 if (is_android) { 35 if (is_android) {
36 cflags += [ "--target=mipsel-linux-android" ] 36 cflags += [ "--target=mipsel-linux-android" ]
37 ldflags += [ "--target=mipsel-linux-android" ] 37 ldflags += [ "--target=mipsel-linux-android" ]
@@ -41,7 +41,7 @@ index be485fd89b9..7179df05451 100644
41 } 41 }
42 } else { 42 } else {
43 cflags += [ "-EL" ] 43 cflags += [ "-EL" ]
44@@ -878,10 +871,7 @@ config("compiler_cpu_abi") { 44@@ -879,10 +872,7 @@ config("compiler_cpu_abi") {
45 } else if (current_cpu == "mips" && !is_nacl) { 45 } else if (current_cpu == "mips" && !is_nacl) {
46 ldflags += [ "-Wl,--hash-style=sysv" ] 46 ldflags += [ "-Wl,--hash-style=sysv" ]
47 if (custom_toolchain == "") { 47 if (custom_toolchain == "") {
@@ -53,7 +53,7 @@ index be485fd89b9..7179df05451 100644
53 cflags += [ "-EB" ] 53 cflags += [ "-EB" ]
54 ldflags += [ "-EB" ] 54 ldflags += [ "-EB" ]
55 } 55 }
56@@ -928,9 +918,6 @@ config("compiler_cpu_abi") { 56@@ -929,9 +919,6 @@ config("compiler_cpu_abi") {
57 if (is_android) { 57 if (is_android) {
58 cflags += [ "--target=mips64el-linux-android" ] 58 cflags += [ "--target=mips64el-linux-android" ]
59 ldflags += [ "--target=mips64el-linux-android" ] 59 ldflags += [ "--target=mips64el-linux-android" ]
@@ -63,7 +63,7 @@ index be485fd89b9..7179df05451 100644
63 } 63 }
64 } else { 64 } else {
65 cflags += [ 65 cflags += [
66@@ -987,10 +974,7 @@ config("compiler_cpu_abi") { 66@@ -988,10 +975,7 @@ config("compiler_cpu_abi") {
67 } else if (current_cpu == "mips64") { 67 } else if (current_cpu == "mips64") {
68 ldflags += [ "-Wl,--hash-style=sysv" ] 68 ldflags += [ "-Wl,--hash-style=sysv" ]
69 if (custom_toolchain == "") { 69 if (custom_toolchain == "") {
@@ -75,7 +75,7 @@ index be485fd89b9..7179df05451 100644
75 cflags += [ 75 cflags += [
76 "-EB", 76 "-EB",
77 "-mabi=64", 77 "-mabi=64",
78@@ -1169,13 +1153,6 @@ config("compiler_deterministic") { 78@@ -1160,13 +1144,6 @@ config("compiler_deterministic") {
79 } 79 }
80 } 80 }
81 } 81 }