Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:qtbase59 commit in: eclass/
Date: Sun, 27 Aug 2017 03:49:49
Message-Id: 1503805748.b64a61991e951958415f5e0ba72043d1a385a894.kensington@gentoo
1 commit: b64a61991e951958415f5e0ba72043d1a385a894
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 7 14:41:26 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 27 03:49:08 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b64a6199
7
8 Revert "qt5-build.eclass: workaround global disabling of dbus for qtbase >= 5.8"
9
10 This reverts commit 53e51ab097bd73ec05d56c389bc68da17eaf22d5.
11
12 eclass/qt5-build.eclass | 7 +------
13 1 file changed, 1 insertion(+), 6 deletions(-)
14
15 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
16 index 7ec6cac3..b6c211bc 100644
17 --- a/eclass/qt5-build.eclass
18 +++ b/eclass/qt5-build.eclass
19 @@ -616,12 +616,7 @@ qt5_base_configure() {
20 $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
21
22 # disable everything to prevent automagic deps (part 3)
23 - -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig
24 -
25 - # FIXME
26 - # since 5.8, disabling dbus generates a QT_NO_DBUS in QtCore/qconfig.h,
27 - # thus specify runtime loading of libdbus to avoid the #define
28 - $([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime || echo -no-dbus)
29 + -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
30
31 # let portage handle stripping
32 -no-strip