| 1 |
commit: dd99c2642b5e2b098a1406ca7a8bcdf7df30cd88 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 23 16:38:28 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 23 16:38:28 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dd99c264 |
| 7 |
|
| 8 |
[qt5-build.eclass] Some updates for 5.5 support. |
| 9 |
|
| 10 |
eclass/qt5-build.eclass | 21 ++++++++++++++++----- |
| 11 |
1 file changed, 16 insertions(+), 5 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 14 |
index d0db81f..008700c 100644 |
| 15 |
--- a/eclass/qt5-build.eclass |
| 16 |
+++ b/eclass/qt5-build.eclass |
| 17 |
@@ -535,9 +535,6 @@ qt5_base_configure() { |
| 18 |
-system-zlib |
| 19 |
-system-pcre |
| 20 |
|
| 21 |
- # don't specify -no-gif because there is no way to override it later |
| 22 |
- #-no-gif |
| 23 |
- |
| 24 |
# disable everything to prevent automagic deps (part 1) |
| 25 |
-no-mtdev |
| 26 |
-no-journald |
| 27 |
@@ -545,8 +542,12 @@ qt5_base_configure() { |
| 28 |
-no-freetype -no-harfbuzz |
| 29 |
-no-openssl |
| 30 |
$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy) |
| 31 |
+ $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-xkbcommon-evdev) |
| 32 |
-no-xinput2 -no-xcb-xlib |
| 33 |
|
| 34 |
+ # don't specify -no-gif because there is no way to override it later |
| 35 |
+ #-no-gif |
| 36 |
+ |
| 37 |
# always enable glib event loop support |
| 38 |
-glib |
| 39 |
|
| 40 |
@@ -578,7 +579,10 @@ qt5_base_configure() { |
| 41 |
-iconv |
| 42 |
|
| 43 |
# disable everything to prevent automagic deps (part 3) |
| 44 |
- -no-cups -no-evdev -no-icu -no-fontconfig -no-dbus |
| 45 |
+ -no-cups -no-evdev |
| 46 |
+ $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-tslib) |
| 47 |
+ -no-icu -no-fontconfig |
| 48 |
+ -no-dbus |
| 49 |
|
| 50 |
# don't strip |
| 51 |
-no-strip |
| 52 |
@@ -614,9 +618,16 @@ qt5_base_configure() { |
| 53 |
# typedef qreal to double (warning: changing this flag breaks the ABI) |
| 54 |
-qreal double |
| 55 |
|
| 56 |
- # disable opengl and egl by default, override in qtgui and qtopengl |
| 57 |
+ # disable OpenGL and EGL support by default, override in qtgui, |
| 58 |
+ # qtopengl, qtprintsupport and qtwidgets |
| 59 |
-no-opengl -no-egl |
| 60 |
|
| 61 |
+ # disable libinput-based generic plugin by default, override in qtgui |
| 62 |
+ $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libinput) |
| 63 |
+ |
| 64 |
+ # disable gstreamer by default, override in qtmultimedia |
| 65 |
+ $([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-gstreamer) |
| 66 |
+ |
| 67 |
# use upstream default |
| 68 |
#-no-system-proxies |
Archives