From 1c681d0511f7300434a5c8bddba14a43627c3a4b Mon Sep 17 00:00:00 2001 From: Jimi Huotari Date: Wed, 15 Aug 2018 14:18:45 +0300 Subject: [PATCH] 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 --- 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 defbcad2e6b7..d709e3cd58bc 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 -- 2.26.2