| 1 |
commit: c4945b28532728c8aafd2804256e09c3002c883b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 3 17:58:25 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 8 20:07:00 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4945b28 |
| 7 |
|
| 8 |
qt5-build.eclass: xkbcommon-{evdev,x11} was dropped in >=5.12.1 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/672340 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/qt5-build.eclass | 6 +++--- |
| 14 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 17 |
index d709e3cd58b..ee4875deaad 100644 |
| 18 |
--- a/eclass/qt5-build.eclass |
| 19 |
+++ b/eclass/qt5-build.eclass |
| 20 |
@@ -612,10 +612,10 @@ qt5_base_configure() { |
| 21 |
-no-libpng -no-libjpeg |
| 22 |
-no-freetype -no-harfbuzz |
| 23 |
-no-openssl -no-libproxy |
| 24 |
- -no-xkbcommon-x11 -no-xkbcommon-evdev |
| 25 |
-no-xcb-xlib |
| 26 |
- $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2) |
| 27 |
- $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput) |
| 28 |
+ $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev) |
| 29 |
+ $([[ ${PV} = 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon-x11 -no-xkbcommon-evdev) # bug 672340 |
| 30 |
+ $([[ ${QT5_MINOR_VERSION} -ge 12 && ${PV} != 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340 |
| 31 |
|
| 32 |
# cannot use -no-gif because there is no way to override it later |
| 33 |
#-no-gif |
Archives