From: Jimi Huotari <chiitoo@gentoo.org>
Date: Wed, 1 Mar 2017 16:26:30 +0000 (+0200)
Subject: qt5-build.eclass: Fix qtbase configure for {5,5.8}.9999
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=442e76a602d125c6d1d67223ea85c2b8b4c19e40;p=gentoo.git

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
---

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 62c79d096285..6f46b2e7b8d4 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -639,7 +639,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)