qt5-build.eclass: fix configure for 5.12
authorJimi Huotari <chiitoo@gentoo.org>
Wed, 15 Aug 2018 11:18:45 +0000 (14:18 +0300)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sat, 8 Dec 2018 20:07:00 +0000 (21:07 +0100)
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@gentoo.org>
eclass/qt5-build.eclass

index defbcad2e6b7022bfffd485c0f9dc091126f06b9..d709e3cd58bc1c579e21d48e51ffe9362bf35db0 100644 (file)
@@ -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