From 0a8735c2ce960975f7fdf914eb06db87cae89ab7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 4 Jun 2019 16:22:45 -0500 Subject: [PATCH] workaround FTBFS against kernel-headers-5.2.0+ --- qt5-qtwebengine.spec | 3 +++ qtwebengine-SIOCGSTAMP.patch | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 qtwebengine-SIOCGSTAMP.patch diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 19ad01b..5de3210 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -77,6 +77,8 @@ Patch2: qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch # disable NEON vector instructions on ARM where the NEON code FTBFS due to # GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495 Patch3: qtwebengine-opensource-src-5.9.0-no-neon.patch +# workaround FTBFS against kernel-headers-5.2.0+ +Patch4: qtwebengine-SIOCGSTAMP.patch # remove Android dependencies from openmax_dl ARM NEON detection (detect.c) Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch # Force verbose output from the GN bootstrap process @@ -343,6 +345,7 @@ BuildArch: noarch %if !0%{?arm_neon} %patch3 -p1 -b .no-neon %endif +%patch4 -p1 -b .SIOCGSTAMP ## upstream patches diff --git a/qtwebengine-SIOCGSTAMP.patch b/qtwebengine-SIOCGSTAMP.patch new file mode 100644 index 0000000..7bd0eb4 --- /dev/null +++ b/qtwebengine-SIOCGSTAMP.patch @@ -0,0 +1,11 @@ +diff -up qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc.socket qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc +--- qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc.socket 2019-04-04 10:55:59.000000000 -0500 ++++ qtwebengine-everywhere-src-5.12.3/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc 2019-06-04 16:21:09.120555044 -0500 +@@ -69,6 +69,7 @@ typedef void* SockOptArg; + + #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) + ++#include + int64_t GetSocketRecvTimestamp(int socket) { + struct timeval tv_ioctl; + int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl);