commit: 16c6810ab658ec0606551f0835ec8687c580fe48 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Apr 23 12:27:25 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Apr 23 15:07:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c6810a
dev-qt/qtwebengine: update 6.7 patchset in live 6.7-6 -> 6.7-7 changes: Added: * clang18.patch (seems upstreaming will take some time still) * ninja1.12.patch (partially imported from files/, half-upstreamed) Updated: * glx-headers.patch (drop upstreamed bit, merge files/'s displaykey) Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtwebengine/Manifest | 1 + dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 5 +---- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 55c0e432a96a..e4df2266f64c 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,4 +1,5 @@ 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-6.7-patchset-6.tar.xz 8140 BLAKE2B 773ee76ecf118ce45eb5dbebf4a574c3cff90f50cd87a469511688ed77db7a96012bec0dd03312bf2d366d709d95a2ac3432e9e0bd5a517b69a5bbd250a94420 SHA512 4db6abbd2a598f8194b9ba7035abad7228f6056fc5e5572329a9a0474f36135428b401edf5fa96e1ac866328d078b015fffd90949ef84f1cea9a1b39e5b9d5ff +DIST qtwebengine-6.7-patchset-7.tar.xz 9288 BLAKE2B 28eeee2481e78f3fbc7351dba0e70025e33c9ba78dcd67200a9762ee7c884d279253b1a4cb50652fcd41bbf64e11e6486b17759c0335636531a81022e5cf8aab SHA512 0d8583d50679d4609833540293eeab84507aa448c62c0fda62d99c03c7f60afa655f621938fc798a1443ad0a355442f5114714d692bb83aecac99021919a1baa DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64 diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index f9dd54161654..6dc080fed1e4 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-6.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-7.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -107,9 +107,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-ninja1.12.patch - "${FILESDIR}"/${PN}-6.7.0-displaykey-header.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 501485c774f4..6dc080fed1e4 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-6.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-7.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then
