diff --git a/srcpkgs/qt5/patches/gcc7-avoid_wchar_t.patch b/srcpkgs/qt5/patches/gcc7-avoid_wchar_t.patch new file mode 100644 index 00000000000..f7793db6e37 --- /dev/null +++ b/srcpkgs/qt5/patches/gcc7-avoid_wchar_t.patch @@ -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 ++template + struct CHash { + static const unsigned value = N; + }; diff --git a/srcpkgs/qt5/patches/gcc7-linked_hash_set.patch b/srcpkgs/qt5/patches/gcc7-linked_hash_set.patch new file mode 100644 index 00000000000..d9c73d2f670 --- /dev/null +++ b/srcpkgs/qt5/patches/gcc7-linked_hash_set.patch @@ -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 + 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); diff --git a/srcpkgs/qt5/patches/gcc7-template-type.patch b/srcpkgs/qt5/patches/gcc7-template-type.patch new file mode 100644 index 00000000000..bc7895b5b17 --- /dev/null +++ b/srcpkgs/qt5/patches/gcc7-template-type.patch @@ -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 + static inline void IterateBody(HeapObject* obj, int object_size) { +- IterateBody(obj); ++ IterateBody(obj); + } + }; +