diff options
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/Manifest.gz | bin | 41362 -> 41361 bytes | |||
-rw-r--r-- | eclass/kde5-functions.eclass | 8 | ||||
-rw-r--r-- | eclass/kde5.eclass | 44 | ||||
-rw-r--r-- | eclass/qt5-build.eclass | 34 | ||||
-rw-r--r-- | eclass/toolchain-glibc.eclass | 1 |
5 files changed, 61 insertions, 26 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex e8ffc18752c2..8b1740739ddd 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index d60d9d55101e..3df54d517242 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: kde5-functions.eclass @@ -276,7 +276,11 @@ add_qt_dep() { local slot=${4} if [[ -z ${version} ]]; then - version=${QT_MINIMAL} + if [[ ${1} = qtwebkit && ${QT_MINIMAL} = 5.9* ]]; then + version=5.9.1 # no more upstream release, need bug #624404 + else + version=${QT_MINIMAL} + fi fi if [[ -z ${slot} ]]; then slot="5" diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 826e0abf10c9..346838570a46 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: kde5.eclass @@ -95,6 +95,11 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_ # Specifies the location of the KDE handbook if not the default. : ${KDE_DOC_DIR:=doc} +# @ECLASS-VARIABLE: KDE_PO_DIRS +# @DESCRIPTION: +# Specifies the possible locations of KDE l10n files if not the default. +: ${KDE_PO_DIRS:="po poqm"} + # @ECLASS-VARIABLE: KDE_QTHELP # @DESCRIPTION: # If set to "false", do nothing. @@ -199,21 +204,14 @@ case ${KDE_AUTODEPS} in RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )" fi - case ${CATEGORY} in - kde-frameworks | \ - kde-plasma) - RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1" - ;; - kde-apps) - [[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4" - [[ $(get_version_component_range 1) -ge 17 ]] && \ - RDEPEND+=" - !kde-apps/kde-l10n - !<kde-apps/kde4-l10n-16.12.0:4 - !kde-apps/kdepim-l10n:5 - " - ;; - esac + if [[ ${CATEGORY} = kde-apps ]]; then + [[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4" + RDEPEND+=" + !kde-apps/kde-l10n + !<kde-apps/kde4-l10n-16.12.0:4 + !kde-apps/kdepim-l10n:5 + " + fi ;; esac @@ -523,18 +521,18 @@ kde5_src_prepare() { # drop translations when nls is not wanted if in_iuse nls && ! use nls ; then - if [[ -d po ]] ; then - rm -r po || die - fi - if [[ -d poqm ]] ; then - rm -r poqm || die - fi + local po + for po in ${KDE_PO_DIRS}; do + if [[ -d ${po} ]] ; then + rm -r ${po} || die + fi + done fi # enable only the requested translations when required if [[ -v LINGUAS ]] ; then local po - for po in po poqm; do + for po in ${KDE_PO_DIRS}; do if [[ -d ${po} ]] ; then pushd ${po} > /dev/null || die local lang diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index fd29ed1e6c05..82855656e040 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -213,6 +213,11 @@ qt5-build_src_prepare() { # Don't add -O3 to CXXFLAGS (bug 549140) sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" + + # Respect build variables in configure tests (bug #639494) + if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then + sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die + fi fi default @@ -567,7 +572,7 @@ qt5_base_configure() { -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds # ensure the QML debugging support (qmltooling) is built in qtdeclarative - -qml-debug + $([[ ${QT5_MINOR_VERSION} -lt 11 ]] && echo -qml-debug) # MIPS DSP instruction set extensions $(is-flagq -mno-dsp && echo -no-mips_dsp) @@ -689,6 +694,33 @@ qt5_base_configure() { } +# @FUNCTION: qt5_qmake_args +# @INTERNAL +# @DESCRIPTION: +# Helper function to get the various toolchain-related variables. +qt5_qmake_args() { + echo \ + QMAKE_AR=\"$(tc-getAR)\" \ + QMAKE_CC=\"$(tc-getCC)\" \ + QMAKE_LINK_C=\"$(tc-getCC)\" \ + QMAKE_LINK_C_SHLIB=\"$(tc-getCC)\" \ + QMAKE_CXX=\"$(tc-getCXX)\" \ + QMAKE_LINK=\"$(tc-getCXX)\" \ + QMAKE_LINK_SHLIB=\"$(tc-getCXX)\" \ + QMAKE_OBJCOPY=\"$(tc-getOBJCOPY)\" \ + QMAKE_RANLIB= \ + QMAKE_STRIP=\"$(tc-getSTRIP)\" \ + QMAKE_CFLAGS=\"${CFLAGS}\" \ + QMAKE_CFLAGS_RELEASE= \ + QMAKE_CFLAGS_DEBUG= \ + QMAKE_CXXFLAGS=\"${CXXFLAGS}\" \ + QMAKE_CXXFLAGS_RELEASE= \ + QMAKE_CXXFLAGS_DEBUG= \ + QMAKE_LFLAGS=\"${LDFLAGS}\" \ + QMAKE_LFLAGS_RELEASE= \ + QMAKE_LFLAGS_DEBUG= +} + # @FUNCTION: qt5_qmake # @INTERNAL # @DESCRIPTION: diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass index bea0299d3de6..f58b44bcfff2 100644 --- a/eclass/toolchain-glibc.eclass +++ b/eclass/toolchain-glibc.eclass @@ -227,6 +227,7 @@ setup_flags() { strip-flags strip-unsupported-flags filter-flags -m32 -m64 -mabi=* + filter-ldflags -Wl,-rpath=* # Bug 492892. filter-flags -frecord-gcc-switches |