diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index c685b4d..e6a6388 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -30,7 +30,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.7.0 -Release: 5%{?dist} +Release: 6%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -81,6 +81,11 @@ Patch7: qtwebengine-opensource-src-5.7.0-webrtc-neon.patch # don't require the time zone detection API backported from ICU 55 (thanks spot) Patch8: qtwebengine-opensource-src-5.6.0-beta-system-icu54.patch +## UPSTREAM PATCHES: +# do not use MADV_FREE when building against glibc 2.24, it is not allowed by +# the sandbox (#1364781) (patch from qtwebengine-chromium 49-based branch) +Patch100: qtwebengine-opensource-src-5.7.0-glibc224.patch + # the architectures theoretically supported by the version of V8 used (#1298011) # You may need some minor patching to build on one of the secondary # architectures, e.g., to add to the Qt -> Chromium -> V8 arch translations. @@ -309,6 +314,7 @@ BuildArch: noarch %patch6 -p1 -b .no-sse2 %patch7 -p1 -b .webrtc-neon %patch8 -p1 -b .system-icu54 +%patch100 -p1 -b .glibc224 # fix // in #include in content/renderer/gpu to avoid debugedit failure sed -i -e 's!gpu//!gpu/!g' \ src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc @@ -454,6 +460,9 @@ popd %changelog +* Sat Aug 13 2016 Kevin Kofler - 5.7.0-6 +- Fix crash when building against glibc 2.24 (#1364781) (upstream patch) + * Sun Jul 31 2016 Rex Dieter - 5.7.0-5 - BR: cmake (for cmake autoprovides support mostly) diff --git a/qtwebengine-opensource-src-5.7.0-glibc224.patch b/qtwebengine-opensource-src-5.7.0-glibc224.patch new file mode 100644 index 0000000..773781a --- /dev/null +++ b/qtwebengine-opensource-src-5.7.0-glibc224.patch @@ -0,0 +1,33 @@ +From b12ffcd411d4776f7120ccecb3be34344d930d2b Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Tue, 9 Aug 2016 16:21:29 +0200 +Subject: Do not depend on Linux 4.5 + +Avoid using MADV_FREE that was only recently added to Linux. It will fail when +run on older Linux kernels. + +Change-Id: I9b0369fb31402f088b2327c12f70dd39f5e4c8c0 +Reviewed-by: Peter Varga +--- + chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp +index 121b687..be7c3b9 100644 +--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp ++++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp +@@ -39,6 +39,11 @@ + + #include + ++#if OS(LINUX) && defined(MADV_FREE) ++// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime ++#undef MADV_FREE ++#endif ++ + #ifndef MADV_FREE + #define MADV_FREE MADV_DONTNEED + #endif +-- +cgit v1.0-4-g1e03 +