| 1 |
commit: 54b686ce5f1dd579f41eb628c56720898dde0e56 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 6 20:51:01 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 6 20:51:01 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=54b686ce |
| 7 |
|
| 8 |
qt5-build.eclass: Drop obsolete <Qt-5.12 conditionals |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/qt5-build.eclass | 19 ++----------------- |
| 13 |
1 file changed, 2 insertions(+), 17 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 16 |
index 877ceae7..434cb63c 100644 |
| 17 |
--- a/eclass/qt5-build.eclass |
| 18 |
+++ b/eclass/qt5-build.eclass |
| 19 |
@@ -178,12 +178,6 @@ qt5-build_src_prepare() { |
| 20 |
sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ |
| 21 |
configure || die "sed failed (QMAKE_CONF_COMPILER)" |
| 22 |
|
| 23 |
- if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then |
| 24 |
- # Don't add -O3 to CXXFLAGS (bug 549140) |
| 25 |
- sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ |
| 26 |
- src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)" |
| 27 |
- fi |
| 28 |
- |
| 29 |
# Respect build variables in configure tests (bug #639494) |
| 30 |
sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die |
| 31 |
fi |
| 32 |
@@ -256,10 +250,6 @@ qt5-build_src_install() { |
| 33 |
|
| 34 |
popd >/dev/null || die |
| 35 |
|
| 36 |
- if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then |
| 37 |
- docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global |
| 38 |
- fi |
| 39 |
- |
| 40 |
# install an empty Gentoo/gentoo-qconfig.h in ${D} |
| 41 |
# so that it's placed under package manager control |
| 42 |
> "${T}"/gentoo-qconfig.h |
| 43 |
@@ -416,11 +406,7 @@ qt5_prepare_env() { |
| 44 |
QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports |
| 45 |
QT5_QMLDIR=${QT5_ARCHDATADIR}/qml |
| 46 |
QT5_DATADIR=${QT5_PREFIX}/share/qt5 |
| 47 |
- if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then |
| 48 |
- QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} |
| 49 |
- else |
| 50 |
- QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc |
| 51 |
- fi |
| 52 |
+ QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc |
| 53 |
QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations |
| 54 |
QT5_EXAMPLESDIR=${QT5_DATADIR}/examples |
| 55 |
QT5_TESTSDIR=${QT5_DATADIR}/tests |
| 56 |
@@ -579,8 +565,7 @@ qt5_base_configure() { |
| 57 |
-no-freetype -no-harfbuzz |
| 58 |
-no-openssl -no-libproxy |
| 59 |
-no-xcb-xlib |
| 60 |
- $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev) |
| 61 |
- $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340 |
| 62 |
+ -no-xcb-xinput -no-xkbcommon # bug 672340 |
| 63 |
|
| 64 |
# cannot use -no-gif because there is no way to override it later |
| 65 |
#-no-gif |
Archives