aboutsummaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-12-03 18:58:25 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-12-05 23:16:55 +0100
commitfcd6267dca97e35e1e8fa4a0dae7b573c9ae3ab4 (patch)
tree7fe069ec507cb49d1586eb5403694c9e67a4b0f3 /eclass
parentdev-qt/qtwayland: Fix build with USE -libinput (diff)
downloadqt-fcd6267dca97e35e1e8fa4a0dae7b573c9ae3ab4.tar.gz
qt-fcd6267dca97e35e1e8fa4a0dae7b573c9ae3ab4.tar.bz2
qt-fcd6267dca97e35e1e8fa4a0dae7b573c9ae3ab4.zip
qt5-build.eclass: xkbcommon-{evdev,x11} was dropped in >=5.12.1
Bug: https://bugs.gentoo.org/672340 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/qt5-build.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d709e3cd..ee4875de 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -612,10 +612,10 @@ qt5_base_configure() {
-no-libpng -no-libjpeg
-no-freetype -no-harfbuzz
-no-openssl -no-libproxy
- -no-xkbcommon-x11 -no-xkbcommon-evdev
-no-xcb-xlib
- $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2)
- $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput)
+ $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev)
+ $([[ ${PV} = 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon-x11 -no-xkbcommon-evdev) # bug 672340
+ $([[ ${QT5_MINOR_VERSION} -ge 12 && ${PV} != 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340
# cannot use -no-gif because there is no way to override it later
#-no-gif