commit: dd3f364b5eac37e71f1645b19b816b4b9d72dc08 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Wed Sep 18 13:54:21 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Mar 19 14:27:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3f364b
qt5-build.eclass: adjust configure options for >=5.15 Upstream has removed the -qt-xcb, -system-xcb, -xkb, -xcb-xinput switches [1] in 5.15 and 6.0. 1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.15&id=60588e1a Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/qt5-build.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index e1b32e71ab4..3f6e76ec2fb 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -569,7 +569,11 @@ qt5_base_configure() { -no-freetype -no-harfbuzz -no-openssl -no-libproxy -no-xcb-xlib - -no-xcb-xinput -no-xkbcommon # bug 672340 + + # bug 672340 + -no-xkbcommon + $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xcb-xinput) + $([[ ${QT5_MINOR_VERSION} -ge 15 ]] && echo -no-bundled-xcb-xinput) # cannot use -no-gif because there is no way to override it later #-no-gif @@ -617,7 +621,7 @@ qt5_base_configure() { # disable undocumented X11-related flags, override in qtgui # (not shown in ./configure -help output) - -no-xkb + $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xkb) # always enable session management support: it doesn't need extra deps # at configure time and turning it off is dangerous, see bug 518262
