qt6-webengine: removed unused patches
This commit is contained in:
parent
40479e00d3
commit
4cac8ce797
GPG Key ID:
42F8B4E30B673606
|
|
@ -1,6 +1,6 @@
|
|||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/Vd4tUbTwBXsgLFBbtltZIZWIWf6e/fUFREaDi3pL2WcXanmJAPOocs3r+VCv8oQ2KyuxsDienwG3s5fEsGniAA=
|
||||
SHA256 (Pkgfile) = 263ac55b1ad8b2a72c7a445d246dab5baa7344c75e0d62e11955cafe3d550998
|
||||
RWSE3ohX2g5d/WhEmZtbStW0P4EZkD4BGQRN0o2syZdSIyQNR8NSmjA41k0b/sDzlx8+/4NdilVQ6dbav4H8pxf0PQVSU6MVHAE=
|
||||
SHA256 (Pkgfile) = 3d5b6a127bf61b5971b770478d02c7fbe9b06ca2fa4e74d35277427e851459a4
|
||||
SHA256 (.footprint) = ab1bd1c780bf7f6f7c1b7ea5e3703e30e96d3871f6365a31b85eb1e27b8f8662
|
||||
SHA256 (qtwebengine-everywhere-src-6.6.1.tar.xz) = 7a6ea228214bd66029ca90549b29021f30f7544abff997b7f831ceac2ce73691
|
||||
SHA256 (qtwebengine-6.5.3-libxml2-2.12.patch) = ebd59e3406385871c0ae69e3fdd67b8c5f7c1abc4057f7c7cb85a99ffc4fd2ea
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Description: Provides support for web applications using the Chromium browser project
|
||||
# URL: https://www.qt.io/
|
||||
# Maintainer: Tim Biermann, tbier at posteo dot de
|
||||
# Depends on: cups ffmpeg icu libevent libva libvpx libwebp minizip nodejs nss pciutils python3-html5lib python3-six qt6-positioning qt6-tools qt6-webchannel re2 snappy xorg-libxcomposite xorg-libxcursor
|
||||
# Depends on: cups ffmpeg icu libevent libva libvpx libwebp minizip nodejs nss pciutils python3-html5lib qt6-positioning qt6-tools qt6-webchannel re2 snappy xorg-libxcomposite xorg-libxcursor
|
||||
# Optional: dav1d fdk-aac gnutls graphite2 keyutils krb5 lame lcms2 libpcre2 libvdpau numactl pipewire x264 x265
|
||||
|
||||
name=qt6-webengine
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
Patch status: likely be handled when chromium bumps bundled ICU
|
||||
|
||||
Quick fix for a static_assert failure with icu74. Still waiting
|
||||
for a proper upstream fix that handles these additions properly,
|
||||
but this is an extension of [1] (is now 48 rather than 43).
|
||||
|
||||
https://bugs.gentoo.org/917633
|
||||
|
||||
[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192
|
||||
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
|
||||
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
|
||||
@@ -163,3 +163,5 @@
|
||||
|
||||
-#if U_ICU_VERSION_MAJOR_NUM >= 58
|
||||
+#if U_ICU_VERSION_MAJOR_NUM >= 74
|
||||
+#define BA_LB_COUNT (U_LB_COUNT - 8)
|
||||
+#elif U_ICU_VERSION_MAJOR_NUM >= 58
|
||||
#define BA_LB_COUNT (U_LB_COUNT - 3)
|
||||
|
|
@ -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_
|
||||
Loading…
Reference in New Issue
Block a user