Skip to content

Commit

Permalink
kde5-functions.eclass: Assume slot 5 for add_qt_dep unless defined
Browse files Browse the repository at this point in the history
So far we relied on ${SLOT} (4|5) to depend on the correct Qt slot, but
this is not always the case. If an ebuild inherits kde5-functions and
uses add_qt_dep then it is safe to assume it will depend on Qt5.
  • Loading branch information
a17r committed Feb 5, 2017
1 parent f7109aa commit da7379a
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions eclass/kde5-functions.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,19 @@ add_qt_dep() {
fi

local version
local slot=${4}

if [[ -n ${3} ]]; then
version=${3}
elif [[ -z "${version}" ]] ; then
elif [[ -z "${version}" ]]; then
version=${QT_MINIMAL}
fi

_add_category_dep dev-qt "${1}" "${2}" "${version}" "${4}"
if [[ -z ${slot} ]]; then
slot="5"
fi

_add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}"
}

# @FUNCTION: get_kde_version
Expand Down

0 comments on commit da7379a

Please sign in to comment.