Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
Date: Sat, 15 Apr 2017 04:46:24
Message-Id: 1492230535.b285e86e38c9ebb5cf7be322498de8fa75e051e5.pesa@gentoo
1 commit: b285e86e38c9ebb5cf7be322498de8fa75e051e5
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 1 16:26:30 2017 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 15 04:28:55 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b285e86e
7
8 qt5-build.eclass: Fix qtbase configure for {5,5.8}.9999
9
10 Upstream has removed an "unused Xlib's XRender dependency", which
11 results into live and future packages failing during their configure
12 phases due to an unknown command line option (-xrender or -no-xrender).
13
14 http://code.qt.io/cgit/qt/qtbase.git/commit/?id=d37c353dc0f2ae5bb803fe9e5752eff846246439
15
16 eclass/qt5-build.eclass | 4 +++-
17 1 file changed, 3 insertions(+), 1 deletion(-)
18
19 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
20 index eea388d8..d679da40 100644
21 --- a/eclass/qt5-build.eclass
22 +++ b/eclass/qt5-build.eclass
23 @@ -654,7 +654,9 @@ qt5_base_configure() {
24
25 # disable undocumented X11-related flags, override in qtgui
26 # (not shown in ./configure -help output)
27 - -no-xkb -no-xrender
28 + -no-xkb
29 + $([[ ${QT5_MINOR_VERSION} -lt 8 || ${QT5_MINOR_VERSION} -eq 8
30 + && ${QT5_PATCH_VERSION} -lt 1 ]] && echo -no-xrender)
31
32 # disable obsolete/unused X11-related flags
33 $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync)