commit: 03a99428d35fcd93b2073cae67228807a23829c3 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Apr 3 03:47:53 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Apr 3 03:56:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03a99428
dev-qt/qtwebengine: update patchset for 6.6 and 6.7 branches 6.6-9 -> 6.6-10 changes: Added: * clang18.patch (imported from files/) Updated: * cstdint.patch (for bug #928466) 6.7-4 -> 6.7-5 changes: Added: * x11-header.patch (imported from files/) ...not adding clang18 given expect it to be fixed upstream soon Updated: * cstdint.patch (for bug #928466) ...gcc+musl still untested for 6.7.0, but updating what's known Closes: https://bugs.gentoo.org/928466 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtwebengine/Manifest | 3 ++- .../files/qtwebengine-6.7.0-x11-header.patch | 22 ---------------------- dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild | 3 +-- dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 3 +-- dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 3 +-- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 1013b1f6ab01..0d2fb09def52 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -4,8 +4,9 @@ DIST qtwebengine-5.15.12_p20240122.tar.xz 299226288 BLAKE2B a16a2f428c4a3e7c681e DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9 SHA512 cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166 DIST qtwebengine-5.15.13_p20240322.tar.xz 301394204 BLAKE2B f9bb5bb79edbe0bc862a718feb3b11a56d8c6d2eee1dd711c9b4460f64308fdfbaa4c3551eebad3af5844564a49703574a7fb9d74e15abd0a6aeb8c707a14059 SHA512 b1f459fbb3d21118043a53ce6e292c6a45f8512830f4dbf6982713970f980ccfb8c1ea1c1d7ce373991632de8c44b5053fa1ccb883e19cd8f35a961e67472f5a DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e +DIST qtwebengine-6.6-patchset-10.tar.xz 8880 BLAKE2B 7583dbfbb60100dc669c780d611aa56034ba2172700168c716e06b37cfb8bb083a29b3ab36968ad0f34443224f7ce03956e6fad2734ac7ff62b2aaeba9e79fc4 SHA512 3cf5e597d7300b89297f15f10ffd7e24517f8762ecdc7b3be19f3c48bc16949ec47ebccf050d4416033e1915453c12b0e69ebb2defa50471cdb72794f8e05708 DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B 11c76fd36227cfcfc3c83618fad25c66963e63697f857b99efc76188529bea42094b279bd9f37e79584cb6e9f1d2dd2f666a96c46ddf2276033cdc97782b72c4 SHA512 33cc1ad0843eeaf1103033c2e9b9a734cd218d92c40985fd6c109acefa2f68b99b1f3cf5e06d6f837fc974c39b220ae93b40d135b5414f822cf28e075805c9c1 -DIST qtwebengine-6.7-patchset-4.tar.xz 7792 BLAKE2B 99250f9c807870aeff0eafccd4a27c224785e34b21ba8dc9e663741cf123ebda6501b8f3d7b1e274cb4e543fe1f9d3fbb1ea54de85fcde4d11d2388f97674a60 SHA512 28dfb2c6c74a971f407e793f43b1224af5b2dac1c1b053badfee23e54d8fe6c390498a88d4da9d8f0de66f579234b1ccca527fc44997dd185ab1f570fbf63203 +DIST qtwebengine-6.7-patchset-5.tar.xz 8108 BLAKE2B 60c77597992dcdbc758406fe6638f41cc0a542601812cf882c1e0a49ece15f1635c326dbc071966fc70ad3cf94c7fe91e34812a5e905205b41e8350c9fae2926 SHA512 a858f76e523a70bbf790b5438d3f0cdc4105e95305086ec11473f22582ea2eaddd20b3787599a3ced65cc3c8df01b5574937bf394a0f702584fff02bf35c2d1e DIST qtwebengine-everywhere-src-6.6.2.tar.xz 421147952 BLAKE2B a0317faf9ff2d81cd2418652c297821bd8451e0564b8b9af8cb005b0c96a4ec74305ff814c3ab355d84bbacaaccd9ebf6bf591e01b485e243cc485aedf3e6e5b SHA512 8024890c1a7f6d5b9866d768f5ee5cb24b2eb9bb2162886fe02cf8f6fbb23e99eadb142c2636fd3d856b0b1975e69859989553f70c6d8610a69d991d4c2f190d DIST qtwebengine-everywhere-src-6.6.3.tar.xz 421076320 BLAKE2B b718b968549a6aad0945cc23ccd2f297475a71db26c6ca6cbeab9d0fee3b709180d5b765a67ef90741eadd48b1fe72c95f302f44c856e4056e0d49589d655879 SHA512 cb026f2dd389d83fbeff3eedc3fa77fc22ff5cf6d444ec163b0dc4649abdf2d16683e9d31f46324f7b3546bb1ec80e40d35854537aa3c09959457fa3c79fa96d DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64 diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-x11-header.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-x11-header.patch deleted file mode 100644 index 0951f2903dbb..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-x11-header.patch +++ /dev/null @@ -1,22 +0,0 @@ -May possibly be working for upstream due to transitive headers, -needs more looking into. - -Without this: - - gl_display.cc:945:10: error: 'x11' has not been declared - 945 | return x11::Connection::Get()->GetXlibDisplay(); - -Likely a regression from [1]. - -[1] https://github.com/qt/qtwebengine-chromium/commit/f2b407a61bea122d18a012f0049ba193725f0461 ---- a/src/3rdparty/chromium/ui/gl/gl_display.cc -+++ b/src/3rdparty/chromium/ui/gl/gl_display.cc -@@ -29,4 +29,8 @@ - #include "ui/gl/gl_surface.h" - -+#if defined(USE_GLX) -+#include "ui/gfx/x/connection.h" -+#endif -+ - #if BUILDFLAG(IS_OZONE) - #include "ui/ozone/buildflags.h" diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild index ccef89994519..bce0eadcd0b9 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.3.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.6-patchset-9.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-10.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -110,7 +110,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.6.2-clang18.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild index e8636461bcc4..0d3fe2a590fb 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.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.7-patchset-4.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-5.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -113,7 +113,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.7.0-clang18.patch - "${FILESDIR}"/${PN}-6.7.0-x11-header.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 e8636461bcc4..0d3fe2a590fb 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.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.7-patchset-4.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-5.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -113,7 +113,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.7.0-clang18.patch - "${FILESDIR}"/${PN}-6.7.0-x11-header.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index a7523d65072f..9090db697cdc 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.7-patchset-4.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-5.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then
