diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-10 18:39:35 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-10 18:40:11 +0200 |
commit | acd0ddbca7c809bd883e4c06ec1e0ca7ca3b8125 (patch) | |
tree | 3496e3809458d66e794b1e3727c69df431176257 /dev-qt/qtwebengine | |
parent | scons-utils.eclass: Revert EAPI 7 pending further changes (diff) | |
download | gentoo-acd0ddbca7c809bd883e4c06ec1e0ca7ca3b8125.tar.gz gentoo-acd0ddbca7c809bd883e4c06ec1e0ca7ca3b8125.tar.bz2 gentoo-acd0ddbca7c809bd883e4c06ec1e0ca7ca3b8125.zip |
dev-qt: Drop unused patches
Diffstat (limited to 'dev-qt/qtwebengine')
5 files changed, 0 insertions, 264 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch deleted file mode 100644 index 71881e0f77c2..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h 2016-11-23 13:01:20.929772871 -0800 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h 2016-11-23 13:02:18.879462854 -0800 -@@ -24,7 +24,9 @@ - // Disable deprecated features which result in spammy compile warnings. This - // list of defines must mirror those in the 'defines' section of BUILD.gn file & - // ffmpeg.gyp file or the headers below will generate different structures! -+#if !defined(USE_SYSTEM_FFMPEG) - #define FF_API_CONVERGENCE_DURATION 0 -+#endif - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch deleted file mode 100644 index ced5367c4826..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp ---- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:07:38.680665385 -0800 -+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:12:17.564001354 -0800 -@@ -26,6 +26,9 @@ - #include "wtf/StdLibExtras.h" - #include "wtf/text/CharacterNames.h" - -+#include <unicode/uchar.h> -+#include <unicode/uvernum.h> -+ - namespace blink { - - unsigned numGraphemeClusters(const String& string) -@@ -122,13 +125,18 @@ - { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL - }; - -+#if U_ICU_VERSION_MAJOR_NUM >= 58 -+#define BA_LB_COUNT (U_LB_COUNT - 3) -+#else -+#define BA_LB_COUNT U_LB_COUNT -+#endif - // Line breaking table for CSS word-break: break-all. This table differs from - // asciiLineBreakTable in: - // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking - // Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties - // - 1 indicates additional break opportunities. 0 indicates to fallback to - // normal line break, not "prohibit break." --static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = { -+static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = { - // XX AI AL B2 BA BB BK CB CL CM CR EX GL HY ID IN IS LF NS NU OP PO PR QU SA SG SP SY ZW NL WJ H2 H3 JL JT JV CP CJ HL RI - { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX - { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI -@@ -178,7 +186,7 @@ - #undef AL - - static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent"); --static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent"); -+static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent"); - - static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh) - { -@@ -209,7 +217,7 @@ - - static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak) - { -- if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) { -+ if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) { - const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak]; - return tableRow[lineBreak / 8] & (1 << (lineBreak % 8)); - } diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch deleted file mode 100644 index 193e71362065..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fa8cdb3a32c377b6290d0a92d2522186bcd48293 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> ---- - chromium/third_party/WebKit/Source/wtf/allocator/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 12c9a7b..1639013 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 - diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch deleted file mode 100644 index 597554e685cd..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch +++ /dev/null @@ -1,23 +0,0 @@ -# dev-qt/qtwebengine: Fix detecting audio backends. - -# The upstream change doesn't really work for us, so we'll make -# it work with us. -# Gentoo-Bug: https://bugs.gentoo.org/603498 - ---- /src/core/config/linux.pri 2016-12-23 00:05:41.057955774 +0200 -+++ /src/core/config/linux.pri 2016-12-23 00:09:39.000573909 +0200 -@@ -35,12 +35,12 @@ - contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 - contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 - contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 --contains(QT_CONFIG, pulseaudio) { -+use?(pulseaudio) { - GYP_CONFIG += use_pulseaudio=1 - } else { - GYP_CONFIG += use_pulseaudio=0 - } --contains(QT_CONFIG, alsa) { -+use?(alsa) { - GYP_CONFIG += use_alsa=1 - } else { - GYP_CONFIG += use_alsa=0 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch deleted file mode 100644 index a5c3072a4777..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 64fdd317d4127142ad9e967197a2df6ac81ef55f Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Wed, 29 Mar 2017 17:42:18 +0200 -Subject: [PATCH] Fix build with GCC 7.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Fixes some ambiguities and outright wrong code GCC 7 doesn't accept but -earlier compilers did. - -Task-number:QTBUG-59776 -Change-Id: I012f121842ac6cde49db0d571efc62aabe2115e3 -Reviewed-by: Michael Brüning <michael.bruning@qt.io> ---- - .../mojo/public/cpp/bindings/interface_ptr_info.h | 2 +- - .../third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ - chromium/v8/src/objects-body-descriptors.h | 2 +- - chromium/v8/src/objects-inl.h | 19 +++++++++++++++++++ - chromium/v8/src/objects.h | 16 ++-------------- - 5 files changed, 25 insertions(+), 16 deletions(-) - -diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h -index 5bd29d5..c94a5ac 100644 ---- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h -+++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h -@@ -34,7 +34,7 @@ class InterfacePtrInfo { - - InterfacePtrInfo& operator=(InterfacePtrInfo&& other) { - if (this != &other) { -- handle_ = other.handle_.Pass(); -+ handle_ = std::move(other.handle_); - version_ = other.version_; - other.version_ = 0u; - } --- -2.7.4 -From 493441248c82d9f39d0947e3bbf4571736e1cf85 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Wed, 29 Mar 2017 15:53:00 +0200 -Subject: [PATCH 1/1] Fix build with GCC 7.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Fixes a few problems with using undeclared functions and ambigious -code. - -Task-number: QTBUG-59776 -Change-Id: I59813919b4867d5dd3499a45baed004a1a1c1a3c -Reviewed-by: Michael Brüning <michael.bruning@qt.io> ---- - chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ - .../third_party/pdfium/fpdfsdk/javascript/global.cpp | 8 ++++---- - chromium/v8/src/objects-body-descriptors.h | 2 +- - chromium/v8/src/objects-inl.h | 18 ++++++++++++++++++ - chromium/v8/src/objects.h | 16 ++-------------- - 5 files changed, 27 insertions(+), 19 deletions(-) - -diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -index e85c72f..6f94cd6 100644 ---- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -+++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -@@ -542,6 +542,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(LinkedHas - return *this; - } - -+inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); -+ - template<typename T, typename U, typename V, typename W> - inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other) - { -diff --git a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h -index 91cb888..a1c3634 100644 ---- a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h -+++ b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h -@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase { - - template <typename StaticVisitor> - static inline void IterateBody(HeapObject* obj, int object_size) { -- IterateBody(obj); -+ IterateBody<StaticVisitor>(obj); - } - }; - -diff --git a/src/3rdparty/chromium/v8/src/objects-inl.h b/src/3rdparty/chromium/v8/src/objects-inl.h -index 58441d3..4c486ea 100644 ---- a/src/3rdparty/chromium/v8/src/objects-inl.h -+++ b/src/3rdparty/chromium/v8/src/objects-inl.h -@@ -7588,6 +7588,24 @@ bool GlobalDictionaryShape::IsDeleted(Dictionary* dict, int entry) { - } - - -+template <typename Derived, typename Shape, typename Key> -+inline uint32_t HashTable<Derived,Shape,Key>::Hash(Key key) { -+ if (Shape::UsesSeed) { -+ return Shape::SeededHash(key, GetHeap()->HashSeed()); -+ } else { -+ return Shape::Hash(key); -+ } -+} -+ -+template <typename Derived, typename Shape, typename Key> -+inline uint32_t HashTable<Derived,Shape,Key>::HashForObject(Key key, Object* object) { -+ if (Shape::UsesSeed) { -+ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); -+ } else { -+ return Shape::HashForObject(key, object); -+ } -+} -+ - bool ObjectHashTableShape::IsMatch(Handle<Object> key, Object* other) { - return key->SameValue(other); - } -diff --git a/src/3rdparty/chromium/v8/src/objects.h b/src/3rdparty/chromium/v8/src/objects.h -index 7d774be..42da5fa 100644 ---- a/src/3rdparty/chromium/v8/src/objects.h -+++ b/src/3rdparty/chromium/v8/src/objects.h -@@ -3194,21 +3194,9 @@ class HashTable : public HashTableBase { - typedef Shape ShapeT; - - // Wrapper methods -- inline uint32_t Hash(Key key) { -- if (Shape::UsesSeed) { -- return Shape::SeededHash(key, GetHeap()->HashSeed()); -- } else { -- return Shape::Hash(key); -- } -- } -+ inline uint32_t Hash(Key key); - -- inline uint32_t HashForObject(Key key, Object* object) { -- if (Shape::UsesSeed) { -- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); -- } else { -- return Shape::HashForObject(key, object); -- } -- } -+ inline uint32_t HashForObject(Key key, Object* object); - - // Returns a new HashTable object. - MUST_USE_RESULT static Handle<Derived> New( --- -2.7.4 |