diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-20 16:02:52 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-20 16:02:52 +0200 |
| commit | 3dbfa804e5ce912d16939b42a9957d8c3ad33bf6 (patch) | |
| tree | 533997f3fb1954ab40f3b9795f004a84cc44e7af | |
| parent | 48f1d7cd34e63de913fbed92de11b740939a9e73 (diff) | |
| download | kde-3dbfa804e5ce912d16939b42a9957d8c3ad33bf6.tar.gz kde-3dbfa804e5ce912d16939b42a9957d8c3ad33bf6.tar.bz2 kde-3dbfa804e5ce912d16939b42a9957d8c3ad33bf6.zip | |
kde5.eclass: Fix KDE_DESIGNERPLUGIN for >=kde-apps-17.12
| -rw-r--r-- | eclass/kde5.eclass | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index f26aac839b9..ac14a699f7c 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -209,10 +209,9 @@ case ${KDE_DESIGNERPLUGIN} in false) ;; *) IUSE+=" designer" - DEPEND+=" designer? ( - $(add_frameworks_dep kdesignerplugin) - $(add_qt_dep designer) - )" + DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" + [[ ${PV} = 9999 || ${PV} = 17.12* ]] || \ + DEPEND+=" designer? ( $(add_qt_dep designer) )" ;; esac @@ -614,7 +613,11 @@ kde5_src_configure() { fi if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then - cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON ) + if [[ ${PV} = 9999 || ${PV} = 17.12* ]]; then + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON ) + else + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON ) + fi fi if [[ ${KDE_QTHELP} != false ]]; then |