commit: c44376c0b7aab810ab1e9e1d27063f422f4bd5ab Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Sep 11 11:02:28 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Sep 11 21:05:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44376c0
qt6-build.eclass: include patch version in subslot for >=6.5.3 This matches Qt5 which had been doing the same. While working on qt-creator bump, noticed that it broke with qtquick3d-6.5.9999, which turned out because of changes in private APIs that will land in 6.5.3. In other words, it is going to need a rebuild when that lands but current SLOT=0/6.5 do not allow this. This could be a one-off issue but let's stay safer when private APIs are abused. This also keeps the 9999 in live subslot, so switching between live and releases will trigger rebuilds too. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> eclass/qt6-build.eclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index c96bc0c1c3c3..2990b41a9e95 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -66,7 +66,11 @@ readonly QT6_BUILD_TYPE HOMEPAGE="https://www.qt.io/" LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" -SLOT=6/${PV%.*} +if ver_test ${PV} -ge 6.5.3; then + SLOT=6/${PV%%_*} +else + SLOT=6/${PV%.*} # TODO: remove this after <6.5.3 is gone +fi if [[ ${PN} != qttranslations ]]; then IUSE="test"