From c4945b28532728c8aafd2804256e09c3002c883b Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 3 Dec 2018 18:58:25 +0100 Subject: [PATCH] qt5-build.eclass: xkbcommon-{evdev,x11} was dropped in >=5.12.1 Bug: https://bugs.gentoo.org/672340 Signed-off-by: Andreas Sturmlechner --- eclass/qt5-build.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index d709e3cd58bc..ee4875deaad0 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 -- 2.26.2