[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtdeclarative/

[Ionen Wolkens]

commit:     0b1e7f560b31f153f6fa125831a1a41787a73589
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 23 19:40:39 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 20:24:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b1e7f56

dev-qt/qtdeclarative: ensure right qtbase revision for QTBUG-125053

Portage is allowed to schedule qtdeclarative before qtbase here,
but this result in a build failure as it needs an accompanying
change added in the latest qtbase revision.

Sparing revbump rebuilds given downgrading to a not-in-tree revision
after successfully building would be quite the edge case.

Thanks-to: Sam James <sam <AT> gentoo.org>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild | 1 +
 dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild
index 83e4113532cf..cc732b58ef89 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild
@@ -21,6 +21,7 @@ IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg 
vulkan +widgets"
 
 RDEPEND="
        
~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
+       >=dev-qt/qtbase-${PV}-r2
        qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
        svg? ( ~dev-qt/qtsvg-${PV}:6 )
 "

diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild
index 41fbd3c4f304..77bfae60bd88 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild
@@ -21,6 +21,7 @@ IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg 
vulkan +widgets"
 
 RDEPEND="
        
~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
+       >=dev-qt/qtbase-${PV}-r1
        qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
        svg? ( ~dev-qt/qtsvg-${PV}:6 )
 "