diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2023-05-18 22:28:51 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-11-26 00:33:15 +0100 |
| commit | a11feb4b6d5e640375c2f15ecab79b61f1077419 (patch) | |
| tree | 8f58fa7cb7db09929bf0197f0083ad8efc07baa5 /eclass | |
| parent | ecm.eclass: Initial support for Qt6-based consumers (diff) | |
| download | gentoo-a11feb4b6d5e640375c2f15ecab79b61f1077419.tar.gz gentoo-a11feb4b6d5e640375c2f15ecab79b61f1077419.tar.bz2 gentoo-a11feb4b6d5e640375c2f15ecab79b61f1077419.zip | |
ecm.eclass: Add SLOT=6 dependencies if KFMIN is >=5.240
- Excluding KDE Frameworks 5.9999 from KFMIN>=5.240 check
- Enforce QT_MAJOR_VERSION=6 for packages w/ KFMIN >= 5.240
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ecm.eclass | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 1bf11a946363..46cc53afd5cb 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -148,7 +148,8 @@ fi # @DESCRIPTION: # Minimum version of Frameworks to require. Default value for kde-frameworks # is ${PV} and 5.106.0 baseline for everything else. -# Version will also be used to differentiate between KF5/Qt5 and KF6/Qt6. +# If set to >=5.240, KF6/Qt6 is assumed thus SLOT=6 dependencies added and +# -DQT_MAJOR_VERSION=6 added to cmake args. if [[ ${CATEGORY} = kde-frameworks ]]; then : "${KFMIN:=$(ver_cut 1-2)}" fi @@ -158,8 +159,16 @@ fi # @INTERNAL # @DESCRIPTION: # KDE Frameworks and Qt slot dependency, implied by KFMIN version. -: ${_KFSLOT:=5} -[[ ${KFMIN/.*} == 6 ]] && _KFSLOT=6 +: "${_KFSLOT:=5}" +if [[ ${CATEGORY} == kde-frameworks ]]; then + if [[ ${PV} != 5.9999 ]] && $(ver_test ${KFMIN} -ge 5.240); then + _KFSLOT=6 + fi +else + if [[ ${KFMIN/.*} == 6 ]] || $(ver_test ${KFMIN} -ge 5.240); then + _KFSLOT=6 + fi +fi case ${ECM_NONGUI} in true) ;; @@ -534,6 +543,10 @@ ecm_src_configure() { local cmakeargs + if [[ ${_KFSLOT} == 6 ]]; then + cmakeargs+=( -DQT_MAJOR_VERSION=6 ) + fi + if in_iuse test && ! use test ; then cmakeargs+=( -DBUILD_TESTING=OFF ) |