[qt5-qtwebengine-freeworld/f30] pull in qtwebengine-SIOCGSTAMP.patch from fedora

commit 898c00200b5892649a10ded09e8dad7126e1aafb Author: Rex Dieter <rdieter(a)gmail.com&gt; Date: Wed Jul 3 09:10:42 2019 -0500 pull in qtwebengine-SIOCGSTAMP.patch from fedora qt5-qtwebengine-freeworld.spec | 3 +++ qtwebengine-SIOCGSTAMP.patch | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) --- diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec index 9b1bb0b..12acca0 100644 --- a/qt5-qtwebengine-freeworld.spec +++ b/qt5-qtwebengine-freeworld.spec @@ -68,6 +68,8 @@ Patch2: qtwebengine-opensource-src-5.12.4-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 @@ -322,6 +324,7 @@ popd %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..0b9df9b --- /dev/null +++ b/qtwebengine-SIOCGSTAMP.patch @@ -0,0 +1,16 @@ +diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc +index ca7849917..31c5f7697 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc ++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc +@@ -69,6 +69,11 @@ typedef void* SockOptArg; + + #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) + ++// Seems that kernel 5.2.0 renames this define to SIOCGSTAMP_OLD ++#ifndef SIOCGSTAMP ++#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ ++#endif ++ + int64_t GetSocketRecvTimestamp(int socket) { + struct timeval tv_ioctl; + int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl);