summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJimi Huotari <chiitoo@gentoo.org>2018-08-15 14:18:45 +0300
committerAndreas Sturmlechner <asturm@gentoo.org>2018-12-08 21:07:00 +0100
commit1c681d0511f7300434a5c8bddba14a43627c3a4b (patch)
treed62c626258fe97341a377f1d21f59180faa1a716 /eclass
parentvirtual/cargo: Version bump to 1.31.0 (diff)
downloadgentoo-1c681d0511f7300434a5c8bddba14a43627c3a4b.tar.gz
gentoo-1c681d0511f7300434a5c8bddba14a43627c3a4b.tar.bz2
gentoo-1c681d0511f7300434a5c8bddba14a43627c3a4b.zip
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@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/qt5-build.eclass4
1 files changed, 3 insertions, 1 deletions
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