| 1 |
commit: 677153ee925d8324ec0bb9fc22dc07c139649337 |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 15 11:18:45 2018 +0000 |
| 4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 15 11:20:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=677153ee |
| 7 |
|
| 8 |
qt5-build.eclass: fix configure for 5.12 |
| 9 |
|
| 10 |
The 'xinput2' configure option has been renamed to 'xcb-xinput' in: |
| 11 |
http://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.12&id=a692d7cd |
| 12 |
|
| 13 |
eclass/qt5-build.eclass | 4 +++- |
| 14 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 17 |
index defbcad2..d709e3cd 100644 |
| 18 |
--- a/eclass/qt5-build.eclass |
| 19 |
+++ b/eclass/qt5-build.eclass |
| 20 |
@@ -613,7 +613,9 @@ qt5_base_configure() { |
| 21 |
-no-freetype -no-harfbuzz |
| 22 |
-no-openssl -no-libproxy |
| 23 |
-no-xkbcommon-x11 -no-xkbcommon-evdev |
| 24 |
- -no-xinput2 -no-xcb-xlib |
| 25 |
+ -no-xcb-xlib |
| 26 |
+ $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2) |
| 27 |
+ $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput) |
| 28 |
|
| 29 |
# cannot use -no-gif because there is no way to override it later |
| 30 |
#-no-gif |
Archives