| 1 |
commit: 2a31ee5c821ef947ead4503e4fde9916246468fe |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 13 14:29:52 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 18 16:15:28 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a31ee5c |
| 7 |
|
| 8 |
qt5-build.eclass: Drop obsolete pre-Qt-5.15 quirks |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/qt5-build.eclass | 9 ++------- |
| 13 |
1 file changed, 2 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 16 |
index cb385ea21ed..ad7f6a64a44 100644 |
| 17 |
--- a/eclass/qt5-build.eclass |
| 18 |
+++ b/eclass/qt5-build.eclass |
| 19 |
@@ -185,7 +185,7 @@ qt5-build_src_configure() { |
| 20 |
if [[ ${QT5_MODULE} == qtbase ]]; then |
| 21 |
qt5_base_configure |
| 22 |
fi |
| 23 |
- if [[ ${QT5_MINOR_VERSION} -ge 15 ]] && [[ ${QT5_MODULE} == qttools ]] && [[ -z ${QT5_TARGET_SUBDIRS[@]} ]]; then |
| 24 |
+ if [[ ${QT5_MODULE} == qttools ]] && [[ -z ${QT5_TARGET_SUBDIRS[@]} ]]; then |
| 25 |
qt5_tools_configure |
| 26 |
fi |
| 27 |
|
| 28 |
@@ -564,8 +564,7 @@ qt5_base_configure() { |
| 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 |
+ -no-bundled-xcb-xinput |
| 35 |
|
| 36 |
# cannot use -no-gif because there is no way to override it later |
| 37 |
#-no-gif |
| 38 |
@@ -610,10 +609,6 @@ qt5_base_configure() { |
| 39 |
# disable all platform plugins by default, override in qtgui |
| 40 |
-no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb |
| 41 |
|
| 42 |
- # disable undocumented X11-related flags, override in qtgui |
| 43 |
- # (not shown in ./configure -help output) |
| 44 |
- $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xkb) |
| 45 |
- |
| 46 |
# always enable session management support: it doesn't need extra deps |
| 47 |
# at configure time and turning it off is dangerous, see bug 518262 |
| 48 |
-sm |
Archives