qt5-build.eclass: xkbcommon-{evdev,x11} was dropped in >=5.12.1
authorAndreas Sturmlechner <asturm@gentoo.org>
Mon, 3 Dec 2018 17:58:25 +0000 (18:58 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sat, 8 Dec 2018 20:07:00 +0000 (21:07 +0100)
Bug: https://bugs.gentoo.org/672340
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
eclass/qt5-build.eclass

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