1 |
commit: 2dc658022e54737f8365fda87c7ea01716905d02 |
2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 18 13:54:21 2019 +0000 |
4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 18 13:54:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2dc65802 |
7 |
|
8 |
qt5-build.eclass: adjust configure options for >=5.15 |
9 |
|
10 |
Upstream has removed the -qt-xcb, -system-xcb, -xkb, -xcb-xinput |
11 |
switches [1] in 5.15 and 6.0. |
12 |
|
13 |
1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.15&id=60588e1a |
14 |
|
15 |
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> |
16 |
|
17 |
eclass/qt5-build.eclass | 8 ++++++-- |
18 |
1 file changed, 6 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
21 |
index b2212410..88164d62 100644 |
22 |
--- a/eclass/qt5-build.eclass |
23 |
+++ b/eclass/qt5-build.eclass |
24 |
@@ -569,7 +569,11 @@ qt5_base_configure() { |
25 |
-no-freetype -no-harfbuzz |
26 |
-no-openssl -no-libproxy |
27 |
-no-xcb-xlib |
28 |
- -no-xcb-xinput -no-xkbcommon # bug 672340 |
29 |
+ |
30 |
+ # bug 672340 |
31 |
+ -no-xkbcommon |
32 |
+ $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xcb-xinput) |
33 |
+ $([[ ${QT5_MINOR_VERSION} -ge 15 ]] && echo -no-bundled-xcb-xinput) |
34 |
|
35 |
# cannot use -no-gif because there is no way to override it later |
36 |
#-no-gif |
37 |
@@ -617,7 +621,7 @@ qt5_base_configure() { |
38 |
|
39 |
# disable undocumented X11-related flags, override in qtgui |
40 |
# (not shown in ./configure -help output) |
41 |
- -no-xkb |
42 |
+ $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xkb) |
43 |
|
44 |
# always enable session management support: it doesn't need extra deps |
45 |
# at configure time and turning it off is dangerous, see bug 518262 |