aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-05-30 14:01:01 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2024-05-30 14:55:18 +0200
commit69f33d85f987602bbee30b559cfe92ffeb5b7b73 (patch)
treeb38f8cbe36c4c8bfde47bd2eb8a3d717d12b46f3
parentdev-qt/qtlocation: keyword 5.15.13 for ~loong (diff)
downloadqt-69f33d85f987602bbee30b559cfe92ffeb5b7b73.tar.gz
qt-69f33d85f987602bbee30b559cfe92ffeb5b7b73.tar.bz2
qt-69f33d85f987602bbee30b559cfe92ffeb5b7b73.zip
dev-qt/qtwebengine: Add python3.12, add missing BDEPEND for catapult
Bug: https://bugs.gentoo.org/925718 Bug: https://bugs.gentoo.org/931970 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-qt/qtwebengine/Manifest2
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild7
2 files changed, 4 insertions, 5 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 2aff89a0..1a4170bd 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1 +1 @@
-DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9 SHA512 cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166
+DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
index 009eada0..19bc378b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-PATCHSET="${PN}-5.15.13_p20240322-patchset"
-PYTHON_COMPAT=( python3_{10..11} )
+PATCHSET="${PN}-5.15.14_p20240510-patchset"
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
@@ -91,6 +91,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="${PYTHON_DEPS}
app-alternatives/ninja
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
dev-util/gperf
dev-util/re2c
net-libs/nodejs[ssl]
@@ -152,8 +153,6 @@ src_unpack() {
}
src_prepare() {
- rm "${WORKDIR}/${PATCHSET}"/010-build-without-python-2.patch || die
-
if [[ ${PV} == ${QT5_PV}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die