aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimi Huotari <chiitoo@gentoo.org>2017-03-01 18:26:30 +0200
committerDavide Pesavento <pesa@gentoo.org>2017-04-15 06:28:55 +0200
commitb285e86e38c9ebb5cf7be322498de8fa75e051e5 (patch)
tree2444b8bbc163e4651dcc257f14dc8d42e091abf0
parentdev-qt/qtquickcontrols2: sync keywords with main tree (diff)
downloadqt-b285e86e38c9ebb5cf7be322498de8fa75e051e5.tar.gz
qt-b285e86e38c9ebb5cf7be322498de8fa75e051e5.tar.bz2
qt-b285e86e38c9ebb5cf7be322498de8fa75e051e5.zip
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
-rw-r--r--eclass/qt5-build.eclass4
1 files changed, 3 insertions, 1 deletions
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)