From fda6ae7258b79eab4c14154dd7137985326f5349 Mon Sep 17 00:00:00 2001 From: Alfred Persson Forsberg Date: Fri, 22 Jul 2022 18:20:07 +0200 Subject: dev-qt/qtwebengine: add musl-hacks-ii good name Signed-off-by: Alfred Persson Forsberg Signed-off-by: Anthony G. Basile --- ...twebengine-5.15.5_p20220618-musl-hacks-ii.patch | 39 ++++++++++++++++++++++ .../qtwebengine-5.15.5_p20220618.ebuild | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-hacks-ii.patch (limited to 'dev-qt') diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-hacks-ii.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-hacks-ii.patch new file mode 100644 index 00000000..b59d6c42 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-musl-hacks-ii.patch @@ -0,0 +1,39 @@ +From 48104199ceb938ad21b4573958c16c224dfeff60 Mon Sep 17 00:00:00 2001 +From: Your Name +Date: Fri, 22 Jul 2022 18:13:11 +0200 +Subject: [PATCH] musl hacks ii + +--- + .../chromium/net/socket/udp_socket_posix.cc | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc +index 71265568b..7d82331f9 100644 +--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc ++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc +@@ -1151,8 +1151,20 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( + for (auto& buffer : buffers) + msg_iov->push_back({const_cast(buffer->data()), buffer->length()}); + msgvec->reserve(buffers.size()); +- for (size_t j = 0; j < buffers.size(); j++) +- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0}); ++ for (size_t j = 0; j < buffers.size(); j++) { ++ auto hdr = new msghdr; ++ hdr->msg_name = nullptr; ++ hdr->msg_namelen = 0; ++ hdr->msg_iov = &msg_iov[j]; ++ hdr->msg_iovlen = 1; ++ hdr->__pad1 = 0; ++ hdr->msg_control = 0; ++ hdr->msg_controllen = 0; ++ hdr->__pad2 = 0; ++ hdr->msg_flags = 0; ++ msgvec->push_back({hdr, 0}); ++ // msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0}); ++ } + int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0)); + SendResult send_result(0, 0, std::move(buffers)); + if (result < 0) { +-- +2.35.1 + diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild index dc41ceaf..ebdc15b3 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild @@ -121,11 +121,11 @@ PATCHES=( "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mallinfo.patch "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-mojo-strncpy.patch "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-resolv-compat.patch - "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-hacks.patch "${FILESDIR}"/${PN}-5.15.5_p20220618-backtrace-execinfo.patch "${FILESDIR}"/${PN}-5.15.5_p20220618-pvalloc-patch.patch "${FILESDIR}"/${PN}-5.15.5_p20220618-linux-stack_util-stackstart.patch "${FILESDIR}"/${PN}-5.15.5_p20220618-remove-decls-usage.patch + "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-hacks-ii.patch ## runtime "${FILESDIR}"/${PN}-5.15.5_p20220618-musl-sandbox.patch ) -- cgit v1.2.3-65-gdbad