diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-06-06 22:51:01 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-07-06 12:22:48 +0200 |
| commit | 682f4330065bc8a04d79c81cf0af6af34478ad81 (patch) | |
| tree | 8b336baf243adf6c4bf322a8f221d2a814809d5f /eclass/qt5-build.eclass | |
| parent | qt5-build.eclass: mirclient disappears in Qt 5.14 (diff) | |
| download | gentoo-682f4330065bc8a04d79c81cf0af6af34478ad81.tar.gz gentoo-682f4330065bc8a04d79c81cf0af6af34478ad81.tar.bz2 gentoo-682f4330065bc8a04d79c81cf0af6af34478ad81.zip | |
qt5-build.eclass: Drop obsolete <Qt-5.12 conditionals
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass/qt5-build.eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 290a0c403811..0e16983478ab 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -178,12 +178,6 @@ qt5-build_src_prepare() { sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ configure || die "sed failed (QMAKE_CONF_COMPILER)" - if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then - # 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)" - fi - # Respect build variables in configure tests (bug #639494) sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die fi @@ -256,10 +250,6 @@ qt5-build_src_install() { popd >/dev/null || die - if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then - docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global - fi - # install an empty Gentoo/gentoo-qconfig.h in ${D} # so that it's placed under package manager control > "${T}"/gentoo-qconfig.h @@ -416,11 +406,7 @@ qt5_prepare_env() { QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports QT5_QMLDIR=${QT5_ARCHDATADIR}/qml QT5_DATADIR=${QT5_PREFIX}/share/qt5 - if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then - QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} - else - QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc - fi + QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations QT5_EXAMPLESDIR=${QT5_DATADIR}/examples QT5_TESTSDIR=${QT5_DATADIR}/tests @@ -579,8 +565,7 @@ qt5_base_configure() { -no-freetype -no-harfbuzz -no-openssl -no-libproxy -no-xcb-xlib - $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev) - $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340 + -no-xcb-xinput -no-xkbcommon # bug 672340 # cannot use -no-gif because there is no way to override it later #-no-gif |