qt5-build.eclass: Fix qtbase configure for {5,5.8}.9999
authorJimi Huotari <chiitoo@gentoo.org>
Wed, 1 Mar 2017 16:26:30 +0000 (18:26 +0200)
committerMichael Palimaka <kensington@gentoo.org>
Sun, 8 Oct 2017 01:46:23 +0000 (12:46 +1100)
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

index 62c79d0962855fdc3a25fc34c14210ee0c1def66..6f46b2e7b8d4f0a9fb3e8d838d6b353fa1332bb0 100644 (file)
@@ -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)