| 1 |
commit: 7518ff161f46f5dd508f7b40ce07d2ecc39a44b9 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 4 13:32:30 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 4 13:32:35 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7518ff16 |
| 7 |
|
| 8 |
dev-qt/qtgui: fix build with USE="-dbus" |
| 9 |
|
| 10 |
Gentoo-bug: 620348 |
| 11 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 12 |
|
| 13 |
dev-qt/qtgui/qtgui-5.9.0.ebuild | 4 ++-- |
| 14 |
dev-qt/qtgui/qtgui-5.9.9999.ebuild | 4 ++-- |
| 15 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 4 ++-- |
| 16 |
3 files changed, 6 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtgui/qtgui-5.9.0.ebuild b/dev-qt/qtgui/qtgui-5.9.0.ebuild |
| 19 |
index b328d687..53aa133b 100644 |
| 20 |
--- a/dev-qt/qtgui/qtgui-5.9.0.ebuild |
| 21 |
+++ b/dev-qt/qtgui/qtgui-5.9.0.ebuild |
| 22 |
@@ -123,8 +123,8 @@ src_prepare() { |
| 23 |
# egl_x11 is activated when both egl and xcb are enabled |
| 24 |
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) |
| 25 |
|
| 26 |
- use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ |
| 27 |
- src/platformsupport/platformsupport.pro || die |
| 28 |
+ qt_use_disable_config dbus dbus \ |
| 29 |
+ src/platformsupport/themes/genericunix/genericunix.pri |
| 30 |
|
| 31 |
qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/dev-qt/qtgui/qtgui-5.9.9999.ebuild b/dev-qt/qtgui/qtgui-5.9.9999.ebuild |
| 35 |
index b328d687..53aa133b 100644 |
| 36 |
--- a/dev-qt/qtgui/qtgui-5.9.9999.ebuild |
| 37 |
+++ b/dev-qt/qtgui/qtgui-5.9.9999.ebuild |
| 38 |
@@ -123,8 +123,8 @@ src_prepare() { |
| 39 |
# egl_x11 is activated when both egl and xcb are enabled |
| 40 |
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) |
| 41 |
|
| 42 |
- use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ |
| 43 |
- src/platformsupport/platformsupport.pro || die |
| 44 |
+ qt_use_disable_config dbus dbus \ |
| 45 |
+ src/platformsupport/themes/genericunix/genericunix.pri |
| 46 |
|
| 47 |
qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro |
| 48 |
|
| 49 |
|
| 50 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 51 |
index b328d687..53aa133b 100644 |
| 52 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 53 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 54 |
@@ -123,8 +123,8 @@ src_prepare() { |
| 55 |
# egl_x11 is activated when both egl and xcb are enabled |
| 56 |
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) |
| 57 |
|
| 58 |
- use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ |
| 59 |
- src/platformsupport/platformsupport.pro || die |
| 60 |
+ qt_use_disable_config dbus dbus \ |
| 61 |
+ src/platformsupport/themes/genericunix/genericunix.pri |
| 62 |
|
| 63 |
qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro |
Archives