1 |
commit: 0b676d8201b607caa6465c3020fb10b50d27df89 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 1 23:04:38 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 1 23:07:24 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b676d82 |
7 |
|
8 |
dev-qt/qtwebengine: Fix build with >=linux-headers-5.2 |
9 |
|
10 |
Tested-by: Aaron Bauman <bman <AT> gentoo.org> |
11 |
Closes: https://bugs.gentoo.org/692352 |
12 |
Package-Manager: Portage-2.3.74, Repoman-2.3.17 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
...webrtc-missing-header-w-linux-headers-5.2.patch | 26 ++++++++++++++++++++++ |
16 |
dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild | 2 ++ |
17 |
2 files changed, 28 insertions(+) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 00000000000..8acd0b0d06c |
22 |
--- /dev/null |
23 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch |
24 |
@@ -0,0 +1,26 @@ |
25 |
+From: Jiri Slaby <jslaby@××××.cz> |
26 |
+Date: Thu, 11 Jul 2019 09:35:13 +0200 |
27 |
+Subject: fix build after y2038 changes in glibc |
28 |
+Patch-mainline: submitted on 2019/07/11 |
29 |
+References: QTBUG-76963 |
30 |
+ |
31 |
+SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that |
32 |
+file wherever needed. |
33 |
+ |
34 |
+Signed-off-by: Jiri Slaby <jslaby@××××.cz> |
35 |
+--- |
36 |
+ chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 + |
37 |
+ 1 file changed, 1 insertion(+) |
38 |
+ |
39 |
+--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc |
40 |
++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc |
41 |
+@@ -67,6 +67,7 @@ typedef void* SockOptArg; |
42 |
+ #endif // WEBRTC_POSIX |
43 |
+ |
44 |
+ #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) |
45 |
++#include <linux/sockios.h> |
46 |
+ |
47 |
+ int64_t GetSocketRecvTimestamp(int socket) { |
48 |
+ struct timeval tv_ioctl; |
49 |
+-- |
50 |
+2.21.0 |
51 |
|
52 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild |
53 |
index 204d8659fa8..2390a80c8e8 100644 |
54 |
--- a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild |
55 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild |
56 |
@@ -83,6 +83,8 @@ PATCHES+=( |
57 |
"${FILESDIR}/${P}-fix-should_override_user_agent_in_new_tabs.patch" |
58 |
"${FILESDIR}/${P}-bump-V8-patchlevel.patch" # QTBUG-72532 |
59 |
"${FILESDIR}/${P}-fix-arm-32bit-segfaults.patch" # QTBUG-75097 |
60 |
+ # QTBUG-76963, not yet upstream: |
61 |
+ "${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch" |
62 |
) |
63 |
|
64 |
src_prepare() { |