diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch new file mode 100644 index 00000000..46e87611 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 2be0856e09f47e7f2c35e77d4e000d769c6beaf9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 11 Jul 2017 10:18:13 +0200 | ||
4 | Subject: [PATCH 4/4] chromium: WebKit fix build with gcc7 | ||
5 | |||
6 | Based on qtwebengine-opensource-src-5.8.0-wtf-gcc7.patch from | ||
7 | http://git.net/ml/scm-fedora-commits/2017-03/msg15697.html | ||
8 | |||
9 | * Fixes: | ||
10 | In file included from ../../git/src/third_party/WebKit/Source/platform/heap/ThreadingTraits.h:14:0, | ||
11 | from ../../git/src/third_party/WebKit/Source/platform/heap/ThreadState.h:37, | ||
12 | from ../../git/src/third_party/WebKit/Source/platform/heap/GarbageCollected.h:8, | ||
13 | from ../../git/src/third_party/WebKit/Source/platform/heap/Visitor.h:35, | ||
14 | from ../../git/src/third_party/WebKit/Source/platform/heap/GCInfo.h:8, | ||
15 | from ../../git/src/third_party/WebKit/Source/platform/heap/Heap.h:35, | ||
16 | from ../../git/src/third_party/WebKit/Source/platform/heap/Handle.h:34, | ||
17 | from ../../git/src/third_party/WebKit/public/platform/WebPrivatePtr.h:38, | ||
18 | from ../../git/src/third_party/WebKit/public/platform/WebString.h:35, | ||
19 | from ../../git/src/third_party/WebKit/Source/platform/exported/FilePathConversion.cpp:8: | ||
20 | ../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h: In member function 'void WTF::LinkedHashSet<Value, HashFunctions, HashTraits, Allocator>::swap(WTF::LinkedHashSet<Value, HashFunctions, HashTraits, Allocator>&)': | ||
21 | ../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h:549:5: error: there are no arguments to 'swapAnchor' that depend on a template parameter, so a declaration of 'swapAnchor' must be available [-fpermissive] | ||
22 | swapAnchor(m_anchor, other.m_anchor); | ||
23 | ^~~~~~~~~~ | ||
24 | ../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h:549:5: note: (if you use '-fpermissive', G++ will accept your code, but allowing the use of an undeclared name is deprecated) | ||
25 | --- | ||
26 | chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ | ||
27 | 1 file changed, 2 insertions(+) | ||
28 | |||
29 | diff --git a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | ||
30 | index e85c72fd65..6f94cd6734 100644 | ||
31 | --- a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | ||
32 | +++ b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | ||
33 | @@ -542,6 +542,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(LinkedHas | ||
34 | return *this; | ||
35 | } | ||
36 | |||
37 | +inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); | ||
38 | + | ||
39 | template<typename T, typename U, typename V, typename W> | ||
40 | inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other) | ||
41 | { | ||
42 | -- | ||
43 | 2.13.2 | ||
44 | |||