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-03 09:41:28 +0000
commitdc502d57586634744b640465796ba7dc4d262a00 (patch)
treec7c38087f0afbfbf7f02e71bdfcc47d864b22ce8
parent8799d3b71cc9463316a0377913ae707540568e69 (diff)
downloadmeta-qt5-dc502d57586634744b640465796ba7dc4d262a00.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>
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch29
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb1
2 files changed, 30 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 @@
1From: Jiri Slaby <jslaby@suse.cz>
2Date: Thu, 11 Jul 2019 09:35:13 +0200
3Subject: fix build after y2038 changes in glibc
4Patch-mainline: submitted on 2019/07/11
5References: QTBUG-76963
6
7SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that
8file wherever needed.
9
10Signed-off-by: Jiri Slaby <jslaby@suse.cz>
11---
12Upstream-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--
282.21.0
29
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index d36b972f..009d2529 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -157,6 +157,7 @@ SRC_URI += " \
157 file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ 157 file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
158 file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ 158 file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
159 file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \ 159 file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \
160 file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \
160" 161"
161 162
162SRC_URI_append_libc-musl = "\ 163SRC_URI_append_libc-musl = "\