diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 11:40:30 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 15:26:55 +0000 |
commit | 81156172a83da2210e9af290f95f45fd194c84a2 (patch) | |
tree | 1026e1a48d6ac51358cec65c1a8552eb1d5c77a7 /recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch | |
parent | 267e64612558cd562a63925e07e3e87e976a8a44 (diff) | |
download | meta-qt5-81156172a83da2210e9af290f95f45fd194c84a2.tar.gz |
qt5: Upgrade to Qt 5.13.2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch index bdab820a..6d9f73e4 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch | |||
@@ -1,22 +1,24 @@ | |||
1 | From 5408581e2ac5225ba2c6d6b0d88636751930577d Mon Sep 17 00:00:00 2001 | ||
1 | From: Jiri Slaby <jslaby@suse.cz> | 2 | From: Jiri Slaby <jslaby@suse.cz> |
2 | Date: Thu, 11 Jul 2019 09:35:13 +0200 | 3 | Date: Thu, 11 Jul 2019 09:35:13 +0200 |
3 | Subject: fix build after y2038 changes in glibc | 4 | Subject: [PATCH] chromium: fix build after y2038 changes in glibc |
4 | Patch-mainline: submitted on 2019/07/11 | ||
5 | References: QTBUG-76963 | ||
6 | 5 | ||
7 | SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that | 6 | SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that |
8 | file wherever needed. | 7 | file wherever needed. |
9 | 8 | ||
10 | Signed-off-by: Jiri Slaby <jslaby@suse.cz> | 9 | Signed-off-by: Jiri Slaby <jslaby@suse.cz> |
11 | --- | 10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
12 | Upstream-Status: Pending | ||
13 | 11 | ||
12 | Upstream-Status: Pending | ||
13 | --- | ||
14 | chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 + | 14 | chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 + |
15 | 1 file changed, 1 insertion(+) | 15 | 1 file changed, 1 insertion(+) |
16 | 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 c38d7fdfac9..575e0001ca1 100644 | ||
17 | --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 19 | --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc |
18 | +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 20 | +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc |
19 | @@ -67,6 +67,7 @@ typedef void* SockOptArg; | 21 | @@ -71,6 +71,7 @@ typedef void* SockOptArg; |
20 | #endif // WEBRTC_POSIX | 22 | #endif // WEBRTC_POSIX |
21 | 23 | ||
22 | #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) | 24 | #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) |
@@ -24,6 +26,3 @@ Upstream-Status: Pending | |||
24 | 26 | ||
25 | int64_t GetSocketRecvTimestamp(int socket) { | 27 | int64_t GetSocketRecvTimestamp(int socket) { |
26 | struct timeval tv_ioctl; | 28 | struct timeval tv_ioctl; |
27 | -- | ||
28 | 2.21.0 | ||
29 | |||