aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2017-06-04 23:32:30 +1000
committerMichael Palimaka <kensington@gentoo.org>2017-06-04 23:32:35 +1000
commit7518ff161f46f5dd508f7b40ce07d2ecc39a44b9 (patch)
tree51359ab1bbbb64af1bba42d1c00f4ed0d6ed099d
parentdev-qt/qtwebengine: add missing virtual/jpeg dependency (diff)
downloadqt-7518ff161f46f5dd508f7b40ce07d2ecc39a44b9.tar.gz
qt-7518ff161f46f5dd508f7b40ce07d2ecc39a44b9.tar.bz2
qt-7518ff161f46f5dd508f7b40ce07d2ecc39a44b9.zip
dev-qt/qtgui: fix build with USE="-dbus"
Gentoo-bug: 620348 Package-Manager: Portage-2.3.5, Repoman-2.3.2
-rw-r--r--dev-qt/qtgui/qtgui-5.9.0.ebuild4
-rw-r--r--dev-qt/qtgui/qtgui-5.9.9999.ebuild4
-rw-r--r--dev-qt/qtgui/qtgui-5.9999.ebuild4
3 files changed, 6 insertions, 6 deletions
diff --git a/dev-qt/qtgui/qtgui-5.9.0.ebuild b/dev-qt/qtgui/qtgui-5.9.0.ebuild
index b328d687..53aa133b 100644
--- a/dev-qt/qtgui/qtgui-5.9.0.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9.0.ebuild
@@ -123,8 +123,8 @@ src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
- use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
- src/platformsupport/platformsupport.pro || die
+ qt_use_disable_config dbus dbus \
+ src/platformsupport/themes/genericunix/genericunix.pri
qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
diff --git a/dev-qt/qtgui/qtgui-5.9.9999.ebuild b/dev-qt/qtgui/qtgui-5.9.9999.ebuild
index b328d687..53aa133b 100644
--- a/dev-qt/qtgui/qtgui-5.9.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9.9999.ebuild
@@ -123,8 +123,8 @@ src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
- use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
- src/platformsupport/platformsupport.pro || die
+ qt_use_disable_config dbus dbus \
+ src/platformsupport/themes/genericunix/genericunix.pri
qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index b328d687..53aa133b 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -123,8 +123,8 @@ src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11)
- use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
- src/platformsupport/platformsupport.pro || die
+ qt_use_disable_config dbus dbus \
+ src/platformsupport/themes/genericunix/genericunix.pri
qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro