| 1 |
commit: 8138f63798688fd1a8c3e00ba23a21397daf08bf |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 5 21:33:24 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 8 16:54:33 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8138f637 |
| 7 |
|
| 8 |
qt5-build.eclass: Introduce QT5_PV for intra-dev-qt deps |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/qt5-build.eclass | 10 ++++++++-- |
| 13 |
1 file changed, 8 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 16 |
index 988dceb495f..0cc45c596b3 100644 |
| 17 |
--- a/eclass/qt5-build.eclass |
| 18 |
+++ b/eclass/qt5-build.eclass |
| 19 |
@@ -37,6 +37,12 @@ readonly QT5_BUILD_TYPE |
| 20 |
# SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass. |
| 21 |
: ${QT5_MODULE:=${PN}} |
| 22 |
|
| 23 |
+# @ECLASS-VARIABLE: QT5_PV |
| 24 |
+# @DESCRIPTION: |
| 25 |
+# 3-component version for use in dependency declarations on other dev-qt/ pkgs. |
| 26 |
+QT5_PV=$(ver_cut 1-3) |
| 27 |
+readonly QT5_PV |
| 28 |
+ |
| 29 |
# @ECLASS-VARIABLE: _QT5_P |
| 30 |
# @INTERNAL |
| 31 |
# @DESCRIPTION: |
| 32 |
@@ -109,7 +115,7 @@ BDEPEND=" |
| 33 |
virtual/pkgconfig |
| 34 |
" |
| 35 |
if [[ ${PN} != qttest ]]; then |
| 36 |
- DEPEND+=" test? ( ~dev-qt/qttest-$(ver_cut 1-3) )" |
| 37 |
+ DEPEND+=" test? ( =dev-qt/qttest-${QT5_PV}* )" |
| 38 |
fi |
| 39 |
|
| 40 |
###### Phase functions ###### |
| 41 |
@@ -127,7 +133,7 @@ qt5-build_src_prepare() { |
| 42 |
# 5.15.3 release is closed and this will never be more than a Qt 5.15.2 |
| 43 |
# with patches on top. |
| 44 |
einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}" |
| 45 |
- sed -e "/^MODULE_VERSION/s/5\.15\.3/5\.15\.2/" -i .qmake.conf || die |
| 46 |
+ sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die |
| 47 |
mkdir -p .git || die # need to fake a git repository for configure |
| 48 |
fi |
Archives