commit:     b285e86e38c9ebb5cf7be322498de8fa75e051e5
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  1 16:26:30 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 04:28:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b285e86e

qt5-build.eclass: Fix qtbase configure for {5,5.8}.9999

Upstream has removed an "unused Xlib's XRender dependency", which
results into live and future packages failing during their configure
phases due to an unknown command line option (-xrender or -no-xrender).

http://code.qt.io/cgit/qt/qtbase.git/commit/?id=d37c353dc0f2ae5bb803fe9e5752eff846246439

 eclass/qt5-build.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index eea388d8..d679da40 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -654,7 +654,9 @@ qt5_base_configure() {
 
                # disable undocumented X11-related flags, override in qtgui
                # (not shown in ./configure -help output)
-               -no-xkb -no-xrender
+               -no-xkb
+               $([[ ${QT5_MINOR_VERSION} -lt 8 || ${QT5_MINOR_VERSION} -eq 8
+                       && ${QT5_PATCH_VERSION} -lt 1 ]] && echo -no-xrender)
 
                # disable obsolete/unused X11-related flags
                $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm 
-no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync)

Reply via email to