commit:     b64a61991e951958415f5e0ba72043d1a385a894
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  7 14:41:26 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 03:49:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b64a6199

Revert "qt5-build.eclass: workaround global disabling of dbus for qtbase >= 5.8"

This reverts commit 53e51ab097bd73ec05d56c389bc68da17eaf22d5.

 eclass/qt5-build.eclass | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7ec6cac3..b6c211bc 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -616,12 +616,7 @@ qt5_base_configure() {
                $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
 
                # disable everything to prevent automagic deps (part 3)
-               -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig
-
-               # FIXME
-               # since 5.8, disabling dbus generates a QT_NO_DBUS in 
QtCore/qconfig.h,
-               # thus specify runtime loading of libdbus to avoid the #define
-               $([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime || 
echo -no-dbus)
+               -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
 
                # let portage handle stripping
                -no-strip

Reply via email to