summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-09-02 13:32:54 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2019-09-05 13:13:40 +0000
commitb4f9f22effea18f6ada4ea15299021c6f52caff2 (patch)
tree45e32a2c821974d3d1f8d07322d03aaca63e8032
parent2a5f9415e48a38f6f4eb0cf375737a2d8438e2fe (diff)
downloadmeta-qt5-b4f9f22effea18f6ada4ea15299021c6f52caff2.tar.gz
qtwebengine: Fix compile failure with 5.2+ kernel headers
Fixes error: 'SIOCGSTAMP' was not declared in this scope Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch31
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb1
2 files changed, 32 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..1e5d4e26
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
@@ -0,0 +1,31 @@
1From c5ae85ce82fec2333d6b8af3d1f17343fd0eb0ba Mon Sep 17 00:00:00 2001
2From: Jiri Slaby <jslaby@suse.cz>
3Date: Thu, 11 Jul 2019 09:35:13 +0200
4Subject: [PATCH] chromium: fix build after y2038 changes in glibc
5
6SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that
7file wherever needed.
8
9Signed-off-by: Jiri Slaby <jslaby@suse.cz>
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11
12Upstream-Status: Submitted
13Patch-mainline: submitted on 2019/07/11
14References: QTBUG-76963
15
16---
17 chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc b/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
21index ca78499179a..d91d17f8f00 100644
22--- a/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
23+++ b/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
24@@ -68,6 +68,7 @@ typedef void* SockOptArg;
25 #endif // WEBRTC_POSIX
26
27 #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
28+#include <linux/sockios.h>
29
30 int64_t GetSocketRecvTimestamp(int socket) {
31 struct timeval tv_ioctl;
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 84fcfbfb..e4e19a4b 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -156,6 +156,7 @@ SRC_URI += " \
156 file://chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch;patchdir=src/3rdparty \ 156 file://chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch;patchdir=src/3rdparty \
157 file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ 157 file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
158 file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ 158 file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
159 file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \
159" 160"
160 161
161SRC_URI_append_libc-musl = "\ 162SRC_URI_append_libc-musl = "\