diff options
| author | Ionen Wolkens <ionen@gentoo.org> | 2024-12-03 06:32:27 -0500 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-12-03 12:14:39 -0500 |
| commit | 70dc2b7dc6859ab2ce177f259ccaccf145d886b5 (patch) | |
| tree | d4a292c310ea023e0d0ec273dfe07b40e4424540 /dev-qt/qtwebengine/files | |
| parent | ba4c95f556299df00bf42bd0cb5d5243e9ae19ef (diff) | |
| download | gentoo-70dc2b7dc6859ab2ce177f259ccaccf145d886b5.tar.gz gentoo-70dc2b7dc6859ab2ce177f259ccaccf145d886b5.tar.bz2 gentoo-70dc2b7dc6859ab2ce177f259ccaccf145d886b5.zip | |
dev-qt/qtwebengine: update patchset for >=6.8.1 again
6.8-6 -> 6.8-7 changes:
Added:
* gcc-ICE-workaround.patch (imported from files/)
* missing-prefinalizer.patch (bug #945808)
Hopefully no more patches for a while (at least none of
these needed revbumps).
Closes: https://bugs.gentoo.org/945808
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtwebengine/files')
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.8.1-gcc-ICE-workaround.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.1-gcc-ICE-workaround.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.1-gcc-ICE-workaround.patch deleted file mode 100644 index 8d35bb8caade..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.8.1-gcc-ICE-workaround.patch +++ /dev/null @@ -1,36 +0,0 @@ -Patch status: temporary (see below) - -Workaround[1] proposed by GCC's upstream for a ICE that can newly occur -when compiling chromium-122 in Qt 6.8.x (possibly only for gcc15+arm64, -but could in theory trigger with other arches or gcc14 as well). - -May be some time before GCC is fixed and furthermore for it to be -propagated on users' systems (we're not going to depend on a fixed -version to enforce the upgrade), so it is simpler to workaround here -for a while. - -Not yet merged as of writing of this, but Qt may include the same -fix in a future version[2]. - -Thanks-to: Andrew Pinski <pinskia@gmail.com> -Thanks-to: Sam James <sam@gentoo.org> - -[1] https://gcc.gnu.org/PR117887#c11 -[2] https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/608812 ---- a/src/3rdparty/chromium/base/containers/flat_tree.h -+++ b/src/3rdparty/chromium/base/containers/flat_tree.h -@@ -491,8 +491,11 @@ - - // If the compare is not transparent we want to construct key_type once. -- template <typename K> -- using KeyTypeOrK = std::conditional_t<requires { -+ static constexpr bool key_compare_is_transparent = requires { - typename key_compare::is_transparent; -- }, K, key_type>; -+ }; -+ -+ // If the compare is not transparent we want to construct key_type once. -+ template <typename K> -+ using KeyTypeOrK = std::conditional_t<key_compare_is_transparent, K, key_type>; - }; - |
