diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-28 11:58:10 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-28 12:18:28 +0200 |
commit | ec860bdcdb8c4b64f9b4d73b0e1723bd18bd1112 (patch) | |
tree | 5eba8a83dc76c6011e0b956e989d01fc45a522ae /recipes-qt/qt5/qtwebengine/chromium | |
parent | b16599a516e0f5e73673ba101ae0a852d8a14cf0 (diff) | |
parent | 0be6a24a4623f52b8b92fa77f0f1c3faf4169d27 (diff) | |
download | meta-qt5-ec860bdcdb8c4b64f9b4d73b0e1723bd18bd1112.tar.gz |
Merge remote-tracking branch 'qtyocto/5.13' into 5.14
* qtyocto/5.13:
0be6a24 qt5: update submodules
bf92306 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.13
6442c54 qt3d-runtime: update to ogl-runtime v2.4
7bb213b qtvirtualkeyboard: update supported layouts
eb63611 qt5-creator: Fix clangformat with clang 9.x
12ea469 qttools: Add CONFIG+=config_clang_done when not building with clang
dc502d5 qtwebengine: Fix compile failure with 5.2+ kernel headers
8799d3b qtserialbus: Fix build with 5.2+ kernel headers
e8aa2dd qtwebengine: Add pulseaudio support
4d8f350 qtwebengine: Rename jasoncpp to jsoncpp
725c87d qtwayland: do not reference private modules in cmake Qt5WaylandClient
a41cd9e qtwayland: remove workaround for missing private headers (QTBUG-71340)
Change-Id: Iac0ec8c35f65aa27a1bf0c6b5928d26f13bc0733
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch | 29 |
1 files changed, 29 insertions, 0 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 new file mode 100644 index 00000000..bdab820a --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From: Jiri Slaby <jslaby@suse.cz> | ||
2 | Date: Thu, 11 Jul 2019 09:35:13 +0200 | ||
3 | Subject: fix build after y2038 changes in glibc | ||
4 | Patch-mainline: submitted on 2019/07/11 | ||
5 | References: QTBUG-76963 | ||
6 | |||
7 | SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that | ||
8 | file wherever needed. | ||
9 | |||
10 | Signed-off-by: Jiri Slaby <jslaby@suse.cz> | ||
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 | --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | ||
18 | +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | ||
19 | @@ -67,6 +67,7 @@ typedef void* SockOptArg; | ||
20 | #endif // WEBRTC_POSIX | ||
21 | |||
22 | #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) | ||
23 | +#include <linux/sockios.h> | ||
24 | |||
25 | int64_t GetSocketRecvTimestamp(int socket) { | ||
26 | struct timeval tv_ioctl; | ||
27 | -- | ||
28 | 2.21.0 | ||
29 | |||