Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Fri, 01 Mar 2019 09:25:10
Message-Id: 1551432277.6e678cb2cc5166d7a988c172bcdc84848cfce938.asturm@gentoo
1 commit: 6e678cb2cc5166d7a988c172bcdc84848cfce938
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 5 20:35:35 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 1 09:24:37 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e678cb2
7
8 qt5-build.eclass: Drop obsolete Qt 5.12.0 quirk
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 eclass/qt5-build.eclass | 3 +--
13 1 file changed, 1 insertion(+), 2 deletions(-)
14
15 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
16 index d0a73287222..2f1e6e684ec 100644
17 --- a/eclass/qt5-build.eclass
18 +++ b/eclass/qt5-build.eclass
19 @@ -574,8 +574,7 @@ qt5_base_configure() {
20 -no-openssl -no-libproxy
21 -no-xcb-xlib
22 $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev)
23 - $([[ ${PV} = 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon-x11 -no-xkbcommon-evdev) # bug 672340
24 - $([[ ${QT5_MINOR_VERSION} -ge 12 && ${PV} != 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340
25 + $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340
26
27 # cannot use -no-gif because there is no way to override it later
28 #-no-gif