commit: 70dc2b7dc6859ab2ce177f259ccaccf145d886b5 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Dec 3 11:32:27 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Dec 3 17:14:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70dc2b7d
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 <AT> gentoo.org> dev-qt/qtwebengine/Manifest | 2 +- .../qtwebengine-6.8.1-gcc-ICE-workaround.patch | 36 ---------------------- dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild | 3 +- dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 3 +- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 3 +- 5 files changed, 4 insertions(+), 43 deletions(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 2bf24cbd50ee..48a9b0b389ac 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -4,7 +4,7 @@ DIST qtwebengine-5.15.16_p20241115.tar.xz 301382752 BLAKE2B 08adfae6228a91f1f4b2 DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f DIST qtwebengine-6.7-patchset-13.tar.xz 8312 BLAKE2B 8483dff26fdc1479d72bf77d176bf747415be989889946bca96f9ddd1612ab2307afbea40fa908f5644893401bf62e4e334b48a3afe86c2028b13246905eae36 SHA512 546883aa8903bf34bc97d5a8d4d8fe39b55d059acab91fd2979b028c268ef30872a8e078ee5d9bca85f393d689010e937a3cdad421098629a8278e113f84fadd DIST qtwebengine-6.8-patchset-4.tar.xz 7612 BLAKE2B 400bc156b54bf00956ce4ab9b2ef070fcb31636184ecaee6b763f5dec4355274bde049bd6d3bb67923c8fdc202eeb26eee1664f7cca7c9cdcf7f24123a1cc760 SHA512 6f99a24ff4c7b61e9f855ab9eb8d31b73030291a5609b03fa92d3c44a200d5db9c7a75c7c70393fca1f542bc548ff588b3ab0c62a80feeacd4b42096ec3b889f -DIST qtwebengine-6.8-patchset-6.tar.xz 8228 BLAKE2B a9822b074c0b9ea31d15a7d3ca0aa6497865f38f62c197ad70cf8c1d66bff411009ceef12ae82a0afc508ef1afe9b2e91a4b050e28756113e48f3640a2c50466 SHA512 a946900d14887236599b187043b0f7c49dbd06121e3b239a542f387dd1cbda0b1c64fa25f92cf8f5c95865851b99a3865978027643f04bad4fd1dedb8cd4ae52 +DIST qtwebengine-6.8-patchset-7.tar.xz 9096 BLAKE2B 58a95b198a6c8180a71a4365e7c2e3bee2d3798ecff18b01fe23e228a4ceafe2aae43088f503a98fa2d5097271ec442985d993fb24e1b2d2c09014b3309bef4d SHA512 489caa5f7cc3d3091e5896c2eb4d489a40fc220738c2240ec406928c7c948ab8962817024c2fbe3c393294e70ef6ce8c02e47964952a3656ff6ebf7908069fc3 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7 DIST qtwebengine-everywhere-src-6.7.3.tar.xz 550988288 BLAKE2B e506e8bd950be478a9d0ecf69c66f7c56dab3c7a1503c5534f0ed5a770ed4d009935ca6905a1255701750cc8d5b790b895eb4f1d6f994ea8231d57c461c22da9 SHA512 f20769ac9b3f4a9fda9865c86d9dd2c779e404823d85aaf12cbbc425880352c19352ed39eb804a80a06a99e13582d22d45dbf2a8d7bbefea3592ff965b863cbe DIST qtwebengine-everywhere-src-6.8.0.tar.xz 566569136 BLAKE2B af2ccc4900ff96d36900bfd4bcb370017231776e211af512e73944dc47b62e6517e85658c436e91f904efae013c4a9035122f78694b4a3fc696f0790725862e0 SHA512 80137c6e1d9aaddddb5d81716acb2ddee620a1416e6318104ace377f0259906d3f79b0fbf9d57e13f581554bc14d7f13abc13396022406d3530f5d9014a7eed4 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 <[email protected]> -Thanks-to: Sam James <[email protected]> - -[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>; - }; - diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild index 28e8e60340b5..fb3569f4ffa9 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-6.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-7.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -109,7 +109,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.8.1-QTBUG-131156.patch - "${FILESDIR}"/${PN}-6.8.1-gcc-ICE-workaround.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index 35016731b7dd..fe2e1400e79f 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-6.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-7.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -108,7 +108,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.8.1-gcc-ICE-workaround.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 35016731b7dd..fe2e1400e79f 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-6.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-7.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -108,7 +108,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.8.1-gcc-ICE-workaround.patch ) python_check_deps() {
