| 1 |
commit: 90571f78e8d2fc24aa6d34051a36edde7ddb1efc |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 24 16:50:38 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 24 16:50:38 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90571f78 |
| 7 |
|
| 8 |
qt5-build.eclass: initial support for Qt 5.6 and 5.7 (dev branch) |
| 9 |
|
| 10 |
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/qt5-build.eclass | 9 ++++----- |
| 13 |
1 file changed, 4 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 16 |
index cd4571a..66ba829 100644 |
| 17 |
--- a/eclass/qt5-build.eclass |
| 18 |
+++ b/eclass/qt5-build.eclass |
| 19 |
@@ -544,6 +544,7 @@ qt5_base_configure() { |
| 20 |
# disable everything to prevent automagic deps (part 1) |
| 21 |
-no-mtdev |
| 22 |
-no-journald |
| 23 |
+ $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-syslog) |
| 24 |
-no-libpng -no-libjpeg |
| 25 |
-no-freetype -no-harfbuzz |
| 26 |
-no-openssl |
| 27 |
@@ -559,10 +560,7 @@ qt5_base_configure() { |
| 28 |
|
| 29 |
# disable everything to prevent automagic deps (part 2) |
| 30 |
-no-pulseaudio -no-alsa |
| 31 |
- |
| 32 |
- # override in qtgui and qtwidgets where x11-libs/cairo[qt4] is blocked |
| 33 |
- # to avoid adding qt4 include paths (bug 433826) |
| 34 |
- -no-gtkstyle |
| 35 |
+ $([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -no-gtk || echo -no-gtkstyle) |
| 36 |
|
| 37 |
# exclude examples and tests from default build |
| 38 |
-nomake examples |
| 39 |
@@ -606,7 +604,8 @@ qt5_base_configure() { |
| 40 |
#-use-gold-linker |
| 41 |
|
| 42 |
# disable all platform plugins by default, override in qtgui |
| 43 |
- -no-xcb -no-eglfs -no-directfb -no-linuxfb -no-kms |
| 44 |
+ -no-xcb -no-eglfs -no-kms -no-directfb -no-linuxfb |
| 45 |
+ $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient) |
| 46 |
|
| 47 |
# disable undocumented X11-related flags, override in qtgui |
| 48 |
# (not shown in ./configure -help output) |
Archives