diff options
| author | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-10-30 09:48:28 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-10-30 09:48:28 +0000 |
| commit | 50a9d3e40f1cf101da688f93303b388629490d54 (patch) | |
| tree | 0a14e887879471adeb8eb4a006a9c86e1274405b | |
| parent | 641740961297c84dd1c6176f914c48bc68f2c150 (diff) | |
| parent | d43843594b9d8d67e349f7cc54a6911a9bd2067a (diff) | |
| download | kde-50a9d3e40f1cf101da688f93303b388629490d54.tar.gz kde-50a9d3e40f1cf101da688f93303b388629490d54.tar.bz2 kde-50a9d3e40f1cf101da688f93303b388629490d54.zip | |
Merge updates from master
| -rw-r--r-- | eclass/ecm.eclass | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 45ebb114c7f..298a06bdd2c 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -113,8 +113,7 @@ fi # @ECLASS_VARIABLE: ECM_PYTHON_BINDINGS # @DESCRIPTION: # Default value is "false", which means do nothing. -# If set to "off", pass -DBUILD_PYTHON_BINDINGS=OFF to mycmakeargs, and also -# disable cmake finding Python3, PySide6 and Shiboken6 to make it quiet. +# If set to "off", pass -DBUILD_PYTHON_BINDINGS=OFF to mycmakeargs. # No other value is implemented as python bindings are not supported in Gentoo. : "${ECM_PYTHON_BINDINGS:=false}" @@ -125,7 +124,9 @@ fi # If set to "true", add "doc" to IUSE, add the appropriate dependency, let # -DBUILD_QCH=ON generate and install Qt compressed help files when USE=doc. # If set to "false", do nothing. -if [[ ${CATEGORY} = kde-frameworks ]] && ver_test -lt 6.15; then +if [[ ${CATEGORY} = kde-frameworks && ${_KFSLOT} == 5 ]]; then +# TODO: Implement KF 6.15 changes how API documentation is built. See also: +# https://mail.kde.org/pipermail/distributions/2025-June/001595.html : "${ECM_QTHELP:=true}" fi : "${ECM_QTHELP:=false}" @@ -562,12 +563,12 @@ ecm_src_prepare() { # limit playing field of locale stripping to kde-*/ categories if [[ ${CATEGORY} = kde-* ]] ; then - # TODO: cleanup after KF5 removal and pre-KF-6.16 cleanup: + # TODO: cleanup after KF5 removal: # always install unconditionally for <kconfigwidgets-6.16 - if you use # language X as system language, and there is a combobox with language # names, the translated language name for language Y is taken from # /usr/share/locale/Y/kf${_KFSLOT}_entry.desktop - if ! { [[ ${PN} == kconfigwidgets ]] && ver_test -lt 6.16; } ; then + if ! [[ ${PN} == kconfigwidgets && ${_KFSLOT} == 5 ]]; then _ecm_strip_handbook_translations fi fi @@ -644,9 +645,6 @@ ecm_src_configure() { if [[ ${ECM_PYTHON_BINDINGS} == off ]]; then cmakeargs+=( -DBUILD_PYTHON_BINDINGS=OFF ) - if ver_test -lt 6.15; then - cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_{Python3,PySide6,Shiboken6}=ON ) - fi fi if [[ ${ECM_QTHELP} = true ]]; then |