commit: 86410e0304769439a662f4da5c335dfd56b65369 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Jan 3 14:46:26 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Jan 3 19:09:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86410e03
dev-qt/qtwebengine: update patchset for 6.6 and 6.7 branches 6.6-5 -> 6.6-6 changes (only used by 6.6.1): Added: * gcc14.patch (imported from gentoo tree, not needed in 6.7) Updated: * cstdint.patch (>=qtwebengine-6.6.1 needs an extra for gcc+musl) 6.6-6 -> 6.6-7 changes (due for 6.6.2 if nothing else comes up): Removed: * libcxx17.patch (backported from 6.7) * libxml2-2.12.patch (upstreamed) 6.7-1 -> 6.7-2 changes (tentative, release is still far away): Updated: * cstdint.patch (>=qtwebengine-6.6.1 needs an extra for gcc+musl) Removed: * libxml2-2.12.patch (upstreamed) Safe changes, and no need for revbumps. For libxml2, Qt did the same changes that we did rather than do like upstream chromium. Meaning we do not need to depend on the newer libxml2 and it works for the old as well. Hopefully more gcc+musl issues don't keep showing up given been using clang+musl for testing musl and would rather not do both on top of gcc+glibc (idea was to pickup most toolchain issues with only two builds). Only know about this because a user mentioned it on IRC. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtwebengine/Manifest | 5 +++-- dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch | 18 ------------------ dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 5 ++--- dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 5 ++--- dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 4 ++-- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 4 ++-- 6 files changed, 11 insertions(+), 30 deletions(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index ae07cf94dfaf..ce844f8c9264 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -3,6 +3,7 @@ DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922 DIST qtwebengine-5.15.11_p20231120.tar.xz 299212012 BLAKE2B 4f9fc9e3f380377f1eeaa8b04c6622c9e25d8b11151cccf7a04ef7dea88e4870db704dda3b303196e40bc8c1c6e76f495f911de5a74769b633952e35718a85de SHA512 2d64edf0ec5322e25a6decfd92a1b1170135c852a8d154d30a336b894bfc4c24f08cb5c88028c68a4f74e6bd6767aaf827a5fa08a82a70fd49e1fa064ee56f27 DIST qtwebengine-5.15.12_p20231219.tar.xz 299224728 BLAKE2B 2446840556e08af57b5f90a4be06a301f2359f516a2c0e088efd8769d15046fbd961863952608ad88072f3b6211fe7226dd70cb2bc66133a4289da1a2ecba06e SHA512 cf6e2f6bc5bc8421185249b6bdde6ae1a97b54f4e84a9b12e82d6d4f59d5cf122762780634d337bc9a943fef61c9a4b64e754b26c7dd8df4bb36b49fd0f62f07 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e -DIST qtwebengine-6.6-patchset-5.tar.xz 9520 BLAKE2B 28d620841613b2cc677f7742c35c6b8ffc533e26cb3fd85edd455a5450344594a75f790402ac5bc8d19e8e8aa788d0a3244a3a81d127dbebd53e8224798382c1 SHA512 c0bc470fd25c5a835000618618aad7db17994863304140e73e8e261c620aad512453bdf6fbecf99dfb2e267590003a9730fa2c102db9dfdbd5e931ec850f9f05 -DIST qtwebengine-6.7-patchset-1.tar.xz 8704 BLAKE2B cc2aff71bedf6f1a5328dc9eb5e54308de806373348c38674e879a8f61a1c6a3eb7948e6fe03ef77160afa7c226f820be1d49d0e0e4c5ef40b118ff788595961 SHA512 5e65a445c8e443257a2a74d4804273a6dca0a951f152cd935f041f51a7fb18c8608511e643deb193194ce4c2d3ec3489fe39c9da5e2eeaa0a047bf246e3da09c +DIST qtwebengine-6.6-patchset-6.tar.xz 9828 BLAKE2B ae595c2f3a71abc183e256118b1c3d1e91284199a8f4aaa8bd9d2a67467353b6c145c3bd9d64c20d64321294c63d97a0a4dc3eeca570a1e25eb94dd8fb9aa501 SHA512 8def71c43125073ef6fc1867c36118f43b0af843cce4b47248359712b1f1bfb4d4eabc6b13ecbbb33e4ef10e1617abc488bb336dfbab043b4ef911d71ad386e2 +DIST qtwebengine-6.6-patchset-7.tar.xz 8480 BLAKE2B c4078d323c02a81e030c4b9b55a8e05f3f49722f937c2fa73fecbc75e8cfa843481857fd193fa92474329e60eb8deee4b287e637bbfff72bdf7d28f3525256f3 SHA512 e601b7a61863ea9f56c3bc12928eab99e87f9616e8d6d7db24a32045854f77976a27fee58bb1c7f57ca2ca12612dff3910294864e73ab8c9eb9c5347e7100590 +DIST qtwebengine-6.7-patchset-2.tar.xz 8252 BLAKE2B 00e0c6b6ea596dc314c5897012e8447f8f18db4992a2266568e75cb6bab57d76f0899ca2ad60a707477bab0b645a0142e02e7b7c5dab4b0ae27cc2243c245d6b SHA512 477639031d2254dd8427c6de8cf0b301942b34d6e3dd79b70ef1c46e0f12684c872a1d581bd46483949a79ba54cca45f795ac9b4a14d50137cd850cef747db1a DIST qtwebengine-everywhere-src-6.6.1.tar.xz 421042656 BLAKE2B 6982a1884d66162cc3c8518125c655d60ced9ec9e81670fb2e5b193aab655c4516bbc50d3c774764385fbe372863fdbf3e03a3c35f07dd9c3119880266b3131e SHA512 d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0 diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch b/dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch deleted file mode 100644 index 928e9b8f6e43..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch +++ /dev/null @@ -1,18 +0,0 @@ -Patch status: fixed in >=qtwebengine-6.7 - -https://bugs.gentoo.org/920257 -https://chromium-review.googlesource.com/c/v8/v8/+/4583222 -From: Sam James <s...@gentoo.org> -Date: Sun, 4 Jun 2023 04:15:16 +0100 -Subject: [PATCH] heap: Add missing <algorithm> include for std::remove - -GCC 14 changes some internal includes within libstdc++ so this transient -include gets lost. Include <algorithm> explicitly for std::remove. ---- a/src/3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h -+++ b/src/3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h -@@ -9,4 +9,5 @@ - #include <stdint.h> - -+#include <algorithm> - #include <atomic> - #include <vector> diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild index 7a8458a6951a..5f7f7a8993f2 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,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.6-patchset-5.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-6.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -111,7 +111,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.6.1-gcc14.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild index f6ae0e6143f9..e04df18b08db 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,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.6-patchset-5.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-7.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -111,7 +111,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.6.1-gcc14.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index 5e4b82001f05..0ed71ce41793 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,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.7-patchset-1.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-2.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 5e4b82001f05..0ed71ce41793 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,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.7-patchset-1.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-2.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then
