commit: 54b686ce5f1dd579f41eb628c56720898dde0e56
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 20:51:01 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 20:51:01 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=54b686ce
qt5-build.eclass: Drop obsolete <Qt-5.12 conditionals
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/qt5-build.eclass | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 877ceae7..434cb63c 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
