diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-05-27 13:16:32 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-05-27 13:18:14 +0300 |
commit | 8b4a01436c10cfd79db28f6462f0769dc7de0539 (patch) | |
tree | 023392a145b7690b580079ef92371e992b06a648 /recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch | |
parent | 710f5bcf4c4ffc4bb32dc0da523e7307909b8f6b (diff) | |
parent | cfcd40e3d01bd2db8ec9617c8117b91fe7c41c8d (diff) | |
download | meta-qt5-8b4a01436c10cfd79db28f6462f0769dc7de0539.tar.gz |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
* upstream/master:
cfcd40e3 qtbase: Restrict 'tests' build to distros with 'ptest' support
0d4af49f qt5-ptest: give rwx permission to user for all the test files
d2ff90b2 qtquicktimeline: upgrade to 5.15 rc1
790bc195 qtquicktimeline: add recipe
07a54bf2 qt5: upgrade to 5.15 rc1
288cdf60 qtwebengine: Fix build with musl
ac9951b2 qtquick3d: Add module prefix for enabling assimp
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
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/qtcharts_git.bb
recipes-qt/qt5/qtcoap_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquick3d_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtquicktimeline_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: I9ba9efdb2b62ecf23b919499d58d51b8a8c7c4a3
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch new file mode 100644 index 00000000..9cc1f604 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 80ee78bdb91db3625b62b9d5d5955cf9d2de4504 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 10 May 2020 08:16:01 -0700 | ||
4 | Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner | ||
5 | |||
6 | initialize msghdr in a compatible manner | ||
7 | |||
8 | msghdr stuct from socket.h is not same between musl and glibc | ||
9 | where musl claims to be more posix compliant where as glibc seems | ||
10 | to fill whats needed for linux sizewise and chooses long enough types | ||
11 | which maybe questionable, therefore constructing a structure with explicit | ||
12 | constructor is not going to work correctly for musl and glibc at same time | ||
13 | |||
14 | see | ||
15 | https://git.musl-libc.org/cgit/musl/commit/arch/x86_64/bits/socket.h?id=7168790763cdeb794df52be6e3b39fbb021c5a64 | ||
16 | |||
17 | This fix initialized the struct to 0 first and then sets the struct elements | ||
18 | by name, so we dont have to hard code the positions of elements when initializing | ||
19 | structure | ||
20 | |||
21 | Upstream-Status: Pending | ||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | --- | ||
24 | chromium/net/socket/udp_socket_posix.cc | 8 ++++++-- | ||
25 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc | ||
28 | index 572472a6993..504fdb5d5c6 100644 | ||
29 | --- a/chromium/net/socket/udp_socket_posix.cc | ||
30 | +++ b/chromium/net/socket/udp_socket_posix.cc | ||
31 | @@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( | ||
32 | for (auto& buffer : buffers) | ||
33 | msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); | ||
34 | msgvec->reserve(buffers.size()); | ||
35 | - for (size_t j = 0; j < buffers.size(); j++) | ||
36 | - msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0}); | ||
37 | + for (size_t j = 0; j < buffers.size(); j++) { | ||
38 | + struct msghdr m = {0}; | ||
39 | + m.msg_iov = &msg_iov[j]; | ||
40 | + m.msg_iovlen = 1; | ||
41 | + msgvec->push_back({m, 0}); | ||
42 | + } | ||
43 | int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0)); | ||
44 | SendResult send_result(0, 0, std::move(buffers)); | ||
45 | if (result < 0) { | ||