qt5-build.eclass: initial support for Qt 5.6 and 5.7 (dev branch)
authorDavide Pesavento <pesa@gentoo.org>
Thu, 24 Sep 2015 16:50:38 +0000 (18:50 +0200)
committerDavide Pesavento <pesa@gentoo.org>
Thu, 24 Sep 2015 16:50:38 +0000 (18:50 +0200)
Signed-off-by: Davide Pesavento <pesa@gentoo.org>
eclass/qt5-build.eclass

index cd4571a56785c7f68d7540526fa15adf5af4f4a2..66ba829169890a03f3814bfb4f45329cba46d58b 100644 (file)
@@ -544,6 +544,7 @@ qt5_base_configure() {
                # disable everything to prevent automagic deps (part 1)
                -no-mtdev
                -no-journald
+               $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-syslog)
                -no-libpng -no-libjpeg
                -no-freetype -no-harfbuzz
                -no-openssl
@@ -559,10 +560,7 @@ qt5_base_configure() {
 
                # disable everything to prevent automagic deps (part 2)
                -no-pulseaudio -no-alsa
-
-               # override in qtgui and qtwidgets where x11-libs/cairo[qt4] is blocked
-               # to avoid adding qt4 include paths (bug 433826)
-               -no-gtkstyle
+               $([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -no-gtk || echo -no-gtkstyle)
 
                # exclude examples and tests from default build
                -nomake examples
@@ -606,7 +604,8 @@ qt5_base_configure() {
                #-use-gold-linker
 
                # disable all platform plugins by default, override in qtgui
-               -no-xcb -no-eglfs -no-directfb -no-linuxfb -no-kms
+               -no-xcb -no-eglfs -no-kms -no-directfb -no-linuxfb
+               $([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient)
 
                # disable undocumented X11-related flags, override in qtgui
                # (not shown in ./configure -help output)