Accepting request 433324 from KDE:Qt5
- Added Do-not-depend-on-Linux-4.5.patch (boo#1002873) OBS-URL: https://build.opensuse.org/request/show/433324 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=13
This commit is contained in:
parent
72b28041cf
commit
0b27c39189
32
Do-not-depend-on-Linux-4.5.patch
Normal file
32
Do-not-depend-on-Linux-4.5.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From b12ffcd411d4776f7120ccecb3be34344d930d2b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
||||||
|
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 <pvarga@inf.u-szeged.hu>
|
||||||
|
---
|
||||||
|
src/3rdparty/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 <sys/mman.h>
|
||||||
|
|
||||||
|
+#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
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Oct 5 09:54:47 UTC 2016 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
- Added Do-not-depend-on-Linux-4.5.patch (boo#1002873)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 28 07:32:47 UTC 2016 - schwab@suse.de
|
Wed Sep 28 07:32:47 UTC 2016 - schwab@suse.de
|
||||||
|
|
||||||
|
@ -39,6 +39,8 @@ Patch1: detect-gcc6-use-fno-delete-null-pointer-checks.diff
|
|||||||
Patch2: armv6-ffmpeg-no-thumb.patch
|
Patch2: armv6-ffmpeg-no-thumb.patch
|
||||||
# PATCH-FIX-UPSTREAM webrtc-build-with-neon.patch - Properly configure webrtc for neon support
|
# PATCH-FIX-UPSTREAM webrtc-build-with-neon.patch - Properly configure webrtc for neon support
|
||||||
Patch3: webrtc-build-with-neon.patch
|
Patch3: webrtc-build-with-neon.patch
|
||||||
|
# PATCH-FIX-UPSTREAM Do-not-depend-on-Linux-4.5.patch
|
||||||
|
Patch4: Do-not-depend-on-Linux-4.5.patch
|
||||||
# http://www.chromium.org/blink not ported to PowerPC
|
# http://www.chromium.org/blink not ported to PowerPC
|
||||||
ExcludeArch: ppc ppc64 ppc64le s390 s390x
|
ExcludeArch: ppc ppc64 ppc64le s390 s390x
|
||||||
# Try to fix i586 MemoryErrors with rpmlint
|
# Try to fix i586 MemoryErrors with rpmlint
|
||||||
@ -149,6 +151,7 @@ sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Qt Development Kit
|
Summary: Qt Development Kit
|
||||||
|
Loading…
x
Reference in New Issue
Block a user