summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-09-02 01:04:38 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-09-02 01:07:24 +0200
commit0b676d8201b607caa6465c3020fb10b50d27df89 (patch)
tree681d9217e22187dcc3763f5cf7421b318b1734cf /dev-qt
parentdev-qt/qtserialbus: Fix build with >=linux-headers-5.2 (diff)
downloadgentoo-0b676d8201b607caa6465c3020fb10b50d27df89.tar.gz
gentoo-0b676d8201b607caa6465c3020fb10b50d27df89.tar.bz2
gentoo-0b676d8201b607caa6465c3020fb10b50d27df89.zip
dev-qt/qtwebengine: Fix build with >=linux-headers-5.2
Tested-by: Aaron Bauman <bman@gentoo.org> Closes: https://bugs.gentoo.org/692352 Package-Manager: Portage-2.3.74, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch26
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild2
2 files changed, 28 insertions, 0 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
new file mode 100644
index 00000000000..8acd0b0d06c
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
@@ -0,0 +1,26 @@
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Thu, 11 Jul 2019 09:35:13 +0200
+Subject: fix build after y2038 changes in glibc
+Patch-mainline: submitted on 2019/07/11
+References: QTBUG-76963
+
+SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that
+file wherever needed.
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
+@@ -67,6 +67,7 @@ typedef void* SockOptArg;
+ #endif // WEBRTC_POSIX
+
+ #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
++#include <linux/sockios.h>
+
+ int64_t GetSocketRecvTimestamp(int socket) {
+ struct timeval tv_ioctl;
+--
+2.21.0
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
index 204d8659fa8..2390a80c8e8 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
@@ -83,6 +83,8 @@ PATCHES+=(
"${FILESDIR}/${P}-fix-should_override_user_agent_in_new_tabs.patch"
"${FILESDIR}/${P}-bump-V8-patchlevel.patch" # QTBUG-72532
"${FILESDIR}/${P}-fix-arm-32bit-segfaults.patch" # QTBUG-75097
+ # QTBUG-76963, not yet upstream:
+ "${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch"
)
src_prepare() {