diff options
author | Ionen Wolkens <ionen@gentoo.org> | 2023-12-19 14:40:48 -0500 |
---|---|---|
committer | Ionen Wolkens <ionen@gentoo.org> | 2023-12-19 15:31:20 -0500 |
commit | 3baa4dfa3ad0fcc3ddabccb5af583672d19a005a (patch) | |
tree | 177d8baaada3b4f559a8f1e162dca13c75d7fa1f /dev-qt/qtwebengine/files | |
parent | dev-qt/qtwebchannel: drop 6.5.3 (diff) | |
download | gentoo-3baa4dfa3ad0fcc3ddabccb5af583672d19a005a.tar.gz gentoo-3baa4dfa3ad0fcc3ddabccb5af583672d19a005a.tar.bz2 gentoo-3baa4dfa3ad0fcc3ddabccb5af583672d19a005a.zip |
dev-qt/qtwebengine: drop 6.5.3
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtwebengine/files')
3 files changed, 0 insertions, 152 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch deleted file mode 100644 index 7de101830553..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch +++ /dev/null @@ -1,30 +0,0 @@ -Patch status: limbo, partially needs upstreaming - -Only manifests as an issue with gcc-13+musl which does not transitively -include cstdint / stdint.h for the int32/64_t usage. - -Partially fixed by [1] (>=chromium-110.0.5434.0) given it removes the -int64_t usage altogether in seed_response.h. - -See also [2] which fixed this for the 87 branch in Qt5. - -[1] https://crrev.com/01e21a077a0354d85e8359195613c2781f67a3a2 -[2] https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/489133 ---- a/src/3rdparty/chromium/components/variations/seed_response.h -+++ b/src/3rdparty/chromium/components/variations/seed_response.h -@@ -7,2 +7,3 @@ - -+#include <cstdint> - #include <string> ---- a/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h -+++ b/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h -@@ -7,2 +7,3 @@ - -+#include <cstdint> - #include <vector> ---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h -+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h -@@ -16,2 +16,3 @@ - -+#include <cstdint> - #include <string> diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-libcxx17.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-libcxx17.patch deleted file mode 100644 index 8acbbf4463ce..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-libcxx17.patch +++ /dev/null @@ -1,83 +0,0 @@ -Patch status: fixed in >=chromium-116.0.5809.0 - -Backport of [2][3] in order to fix building with libcxx-17 -(and hopefully runtime if upgrade from 16->17 without rebuilding). - -In order to apply cleanly, also needed [4] which seems fine to have. - -[1] https://crbug.com/1449299 -[2] https://crrev.com/9bfbbffdba73668fdb483e5a850911d2b64c35d7 -[3] https://crrev.com/4878976cd7391fbc02f87af4b7fb539b5c1f3817 -[4] https://crrev.com/5b5551edd3961481e617e510276b9f015a35b861 ---- a/src/3rdparty/chromium/base/containers/checked_iterators.h -+++ b/src/3rdparty/chromium/base/containers/checked_iterators.h -@@ -24,4 +24,7 @@ - using reference = T&; - using iterator_category = std::random_access_iterator_tag; -+#if defined(__cpp_lib_ranges) -+ using iterator_concept = std::contiguous_iterator_tag; -+#endif - - // Required for converting constructor below. -@@ -31,8 +34,6 @@ - // Required for certain libc++ algorithm optimizations that are not available - // for NaCl. --#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL) - template <typename Ptr> - friend struct std::pointer_traits; --#endif - - constexpr CheckedContiguousIterator() = default; -@@ -147,4 +148,10 @@ - } - -+ constexpr friend CheckedContiguousIterator operator+( -+ difference_type lhs, -+ const CheckedContiguousIterator& rhs) { -+ return rhs + lhs; -+ } -+ - constexpr CheckedContiguousIterator& operator-=(difference_type rhs) { - if (rhs < 0) { -@@ -218,5 +225,4 @@ - } // namespace base - --#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL) - // Specialize both std::__is_cpp17_contiguous_iterator and std::pointer_traits - // for CCI in case we compile with libc++ outside of NaCl. The former is -@@ -236,11 +242,28 @@ - // [2] https://wg21.link/std.iterator.tags - // [3] https://wg21.link/pointer.traits.optmem --namespace std { -+ -+#if defined(_LIBCPP_VERSION) -+ -+_LIBCPP_BEGIN_NAMESPACE_STD - - template <typename T> -+struct __is_cpp17_contiguous_iterator; -+template <typename T> - struct __is_cpp17_contiguous_iterator<::base::CheckedContiguousIterator<T>> - : true_type {}; - - template <typename T> -+struct __libcpp_is_contiguous_iterator; -+template <typename T> -+struct __libcpp_is_contiguous_iterator<::base::CheckedContiguousIterator<T>> -+ : true_type {}; -+ -+_LIBCPP_END_NAMESPACE_STD -+ -+#endif -+ -+namespace std { -+ -+template <typename T> - struct pointer_traits<::base::CheckedContiguousIterator<T>> { - using pointer = ::base::CheckedContiguousIterator<T>; -@@ -261,5 +284,4 @@ - - } // namespace std --#endif - - #endif // BASE_CONTAINERS_CHECKED_ITERATORS_H_ diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch deleted file mode 100644 index d725f3209106..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch +++ /dev/null @@ -1,39 +0,0 @@ -Patch status: fixed in >=chromium-121.0.6104.0 with caveat - -Fix build failure[1] with libxml2-2.12 due xmlError changes. - -For convenience, use LIBXML_VERSION like webkit did[2] rather than -chromium's upstream fix[3] which relies on bundled libxml2 always -being 2.12.x (spares having to use has_version). - -When fix lands in qtwebengine, will need to depend on >=libxml2-2.12 -unless Qt decides to do something different considering that cmake -uses system libxml2 by default and it may be too early to enforce it. - -[1] https://bugs.gentoo.org/917601 -[2] https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b -[3] https://crrev.com/871f8ae9b65ce2679b0bc0be36902d65edf0c1e4 ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h -@@ -78,5 +78,9 @@ - void reset(); - -+#if LIBXML_VERSION >= 21200 -+ static void ParseErrorFunc(void* user_data, const xmlError*); -+#else - static void ParseErrorFunc(void* user_data, xmlError*); -+#endif - static void GenericErrorFunc(void* user_data, const char* msg, ...); - ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -@@ -67,5 +67,9 @@ - } - -+#if LIBXML_VERSION >= 21200 -+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { -+#else - void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { -+#endif - FrameConsole* console = static_cast<FrameConsole*>(user_data); - if (!console) |