diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2021-01-27 09:21:29 +0200 |
---|---|---|
committer | Jani Suonpera <jani.suonpera@qt.io> | 2021-02-05 14:56:55 +0200 |
commit | a73de388e628a67490cdd7734779d405740b7fa3 (patch) | |
tree | c6410cd0062df9dde1fd02b56232027b7f865815 /recipes-qt/qt5/qtwebengine/chromium/0006-chromium-fix-build-after-y2038-changes-in-glibc.patch | |
parent | 7dfe6ec495c3e56e4fbfb1dba23291589c28f7a7 (diff) | |
download | meta-qt5-a73de388e628a67490cdd7734779d405740b7fa3.tar.gz |
qt5: update submodules for LTS 5.15
- Webengine-chromium branch changed from 83-based to 87-based.
- PACKAGECONFIGs protobuf and jsoncpp are removed because these configurations
has been removed from src/buildtools/configure.json
- DEPENDS nodejs-native added. This mandatory for chromium build.
Task-number: QTBUG-90623
Change-Id: Ic933c88399422941114915afe5baa202850928f4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0006-chromium-fix-build-after-y2038-changes-in-glibc.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0006-chromium-fix-build-after-y2038-changes-in-glibc.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-fix-build-after-y2038-changes-in-glibc.patch new file mode 100644 index 00000000..ed7e2774 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-fix-build-after-y2038-changes-in-glibc.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 5af48e4ca5d2515606a07c9896e927d65e77ca72 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jiri Slaby <jslaby@suse.cz> | ||
3 | Date: Thu, 11 Jul 2019 09:35:13 +0200 | ||
4 | Subject: [PATCH] chromium: fix build after y2038 changes in glibc | ||
5 | |||
6 | SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that | ||
7 | file wherever needed. | ||
8 | |||
9 | Signed-off-by: Jiri Slaby <jslaby@suse.cz> | ||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | --- | ||
14 | chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | ||
18 | index cf6e7927951..e5df6f9d92c 100644 | ||
19 | --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | ||
20 | +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | ||
21 | @@ -70,6 +70,7 @@ typedef void* SockOptArg; | ||
22 | #endif // WEBRTC_POSIX | ||
23 | |||
24 | #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) | ||
25 | +#include <linux/sockios.h> | ||
26 | |||
27 | int64_t GetSocketRecvTimestamp(int socket) { | ||
28 | struct timeval tv_ioctl; | ||