summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-12-03 18:58:25 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-12-08 21:07:00 +0100
commitc4945b28532728c8aafd2804256e09c3002c883b (patch)
treeb9618f66f5f5424cb6df40d964ab4e4bb64dc4d5 /eclass/qt5-build.eclass
parentqt5-build.eclass: fix configure for 5.12 (diff)
downloadgentoo-c4945b28532728c8aafd2804256e09c3002c883b.tar.gz
gentoo-c4945b28532728c8aafd2804256e09c3002c883b.tar.bz2
gentoo-c4945b28532728c8aafd2804256e09c3002c883b.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/qt5-build.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 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