jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

qt5: fix gcc7 build

Browse source
This commit is contained in:
Jürgen Buchmüller 2017-05-20 03:55:19 +02:00
parent 7ecae6bc60
commit 0eb32413aa
3 changed files with 84 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/qt5/patches/gcc7-avoid_wchar_t.patch Normal file
View file

@ -0,0 +1,11 @@
--- qtwebengine/src/3rdparty/chromium/third_party/pdfium/fpdfsdk/javascript/global.cpp 2017-05-20 02:18:35.281893421 +0200
+++ qtwebengine/src/3rdparty/chromium/third_party/pdfium/fpdfsdk/javascript/global.cpp 2017-05-20 02:23:36.260127027 +0200
@@ -24,7 +24,7 @@
struct CHash;
// Only needed to hash single-character strings.
-template <wchar_t N>
+template <unsigned N>
struct CHash<N> {
static const unsigned value = N;
};

62
srcpkgs/qt5/patches/gcc7-linked_hash_set.patch Normal file
View file

@ -0,0 +1,62 @@
--- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h 2017-01-03 10:28:53.000000000 +0100
+++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h 2017-05-20 02:43:53.182512520 +0200
@@ -129,6 +129,29 @@
LinkedHashSetNodeBase& operator=(const LinkedHashSetNodeBase& other);
};
+inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b)
+{
+ ASSERT(a.m_prev && a.m_next && b.m_prev && b.m_next);
+ swap(a.m_prev, b.m_prev);
+ swap(a.m_next, b.m_next);
+ if (b.m_next == &a) {
+ ASSERT(b.m_prev == &a);
+ b.m_next = &b;
+ b.m_prev = &b;
+ } else {
+ b.m_next->m_prev = &b;
+ b.m_prev->m_next = &b;
+ }
+ if (a.m_next == &b) {
+ ASSERT(a.m_prev == &b);
+ a.m_next = &a;
+ a.m_prev = &a;
+ } else {
+ a.m_next->m_prev = &a;
+ a.m_prev->m_next = &a;
+ }
+}
+
template<typename ValueArg, typename Allocator>
class LinkedHashSetNode : public LinkedHashSetNodeBase {
DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
@@ -720,29 +743,6 @@
remove(find(value));
}
-inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b)
-{
- ASSERT(a.m_prev && a.m_next && b.m_prev && b.m_next);
- swap(a.m_prev, b.m_prev);
- swap(a.m_next, b.m_next);
- if (b.m_next == &a) {
- ASSERT(b.m_prev == &a);
- b.m_next = &b;
- b.m_prev = &b;
- } else {
- b.m_next->m_prev = &b;
- b.m_prev->m_next = &b;
- }
- if (a.m_next == &b) {
- ASSERT(a.m_prev == &b);
- a.m_next = &a;
- a.m_prev = &a;
- } else {
- a.m_next->m_prev = &a;
- a.m_prev->m_next = &a;
- }
-}
-
inline void swap(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b)
{
ASSERT(a.m_next != &a && b.m_next != &b);

11
srcpkgs/qt5/patches/gcc7-template-type.patch Normal file
View file

@ -0,0 +1,11 @@
--- qtwebengine/src/3rdparty/chromium/v8/src/objects-body-descriptors.h 2017-01-03 10:28:53.000000000 +0100
+++ qtwebengine/src/3rdparty/chromium/v8/src/objects-body-descriptors.h 2017-05-20 02:00:14.447917361 +0200
@@ -99,7 +99,7 @@
template <typename StaticVisitor>
static inline void IterateBody(HeapObject* obj, int object_size) {
- IterateBody(obj);
+ IterateBody<StaticVisitor>(obj);
}
};