commit: 53e51ab097bd73ec05d56c389bc68da17eaf22d5
Author: Matthias Dahl <matthias.dahl <AT> binary-island <DOT> eu>
AuthorDate: Thu Apr 20 07:55:36 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 00:51:37 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=53e51ab0
qt5-build.eclass: workaround global disabling of dbus for qtbase >= 5.8
Passing a 'no-dbus' to configure will result in a QT_NO_DBUS macro in
QtCore/qconfig.h when qtcore is compiled -- causing all sorts of havoc
naturally while compiling packages that require QtDBus.
If we use 'dbus-runtime' instead, there will be no hard dependencies
on DBus, while avoiding that macro altogether.
I recompiled Qt 5.8.9999 with it, as well as kde-frameworks/*,
and everything turned out fine. I did not find any side-effects.
Gentoo-Bug: 599636
eclass/qt5-build.eclass | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d679da40..0c92a306 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -630,7 +630,12 @@ 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 -no-dbus
+ -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)
# let portage handle stripping
-no-strip
