diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 15 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 6 |
2 files changed, 16 insertions, 5 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 14b306fbfb7..5a345661cc3 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -301,7 +301,7 @@ if [[ ${NEED_KDE} != none ]]; then *) SLOT="4.1" ;; esac ;; - esac + esac fi fi @@ -442,7 +442,7 @@ kde4-base_pkg_setup() { # Search for best suitable kde installation for misc kde package. # Computation based on NEED_KDE and KDE_MINIMAL - [[ ${NEED_KDE} = latest || ${NEED_KDE} = none ]] && get_latest_kdedir + [[ ${KDEBASE} != kde-base ]] && [[ ${NEED_KDE} = latest || ${NEED_KDE} = none ]] && get_latest_kdedir # Set PREFIX if use kdeprefix; then @@ -551,9 +551,18 @@ kde4-base_src_configure() { QTEST_COLORED=1 QT_PLUGIN_PATH="${KDEDIR}/$(get_libdir)/kde4/plugins/" - # hardcode path to *.cmake KDE files + # Hardcode path to *.pc KDE files export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}${KDEDIR}/$(get_libdir)/pkgconfig" + # Set cmake prefixes to allow buildsystem to localize valid KDE installation when more are present + if use kdeprefix; then + mycmakeargs="${mycmakeargs} + -DCMAKE_SYSTEM_INCLUDE_PATH=${KDEDIR}/include + -DCMAKE_SYSTEM_LIBRARY_PATH=${KDEDIR}/$(get_libdir) + -DCMAKE_SYSTEM_PREFIX_PATH=${KDEDIR} + -DCMAKE_SYSTEM_PROGRAM_PATH=${KDEDIR}/bin" + fi + # additonal arguments for KOFFICE if [[ ${KMNAME} = koffice ]]; then case ${PN} in diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 632ef1681c8..02687f9b978 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -64,7 +64,7 @@ buildsycoca() { ebegin "Running kbuildsycoca4 to build global database" # This is needed because we support multiple kde versions installed together. - XDG_DATA_DIRS="/usr/share:${KDEDIRS//:/\/share:}/share:/usr/local/share" \ + XDG_DATA_DIRS="/usr/share:${KDEDIR}/share:/usr/local/share" \ DISPLAY="" DBUS_SESSION_BUS_ADDRESS="" \ ${KDEDIR}/bin/kbuildsycoca4 --global --noincremental &> /dev/null eend $? @@ -229,7 +229,7 @@ get_latest_kdedir() { case ${KDE_WANTED} in # note this will need to be updated as stable moves and so on live) - _versions="9999 4.2.61 4.2.0 4.10" + _versions="9999 4.2.61 4.2.0 4.1.0" ;; snapshot) _versions="4.2.61 4.2.0 4.1.0 9999" @@ -267,6 +267,8 @@ get_latest_kdedir() { esac fi done + + debug-print-function ${FUNCNAME} "$@" "KDE_WANTED=${KDE_WANTED} -> _kdedir=${_kdedir}" } # @FUNCTION: migrate_store_dir |