commit:     1c681d0511f7300434a5c8bddba14a43627c3a4b
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 11:18:45 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 20:07:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c681d05

qt5-build.eclass: fix configure for 5.12

The 'xinput2' configure option has been renamed to 'xcb-xinput' in:
http://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.12&id=a692d7cd

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index defbcad2e6b..d709e3cd58b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -613,7 +613,9 @@ qt5_base_configure() {
                -no-freetype -no-harfbuzz
                -no-openssl -no-libproxy
                -no-xkbcommon-x11 -no-xkbcommon-evdev
-               -no-xinput2 -no-xcb-xlib
+               -no-xcb-xlib
+               $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2)
+               $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput)
 
                # cannot use -no-gif because there is no way to override it 
later
                #-no-gif

Reply via email to