| 1 |
commit: 3c7ccc40ac224ac086c1660342eb6f06669a402a |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 30 19:37:07 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 1 13:49:10 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c7ccc40 |
| 7 |
|
| 8 |
dev-qt/qtgui: fix automagic dependency |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
dev-qt/qtgui/qtgui-5.8.9999.ebuild | 11 ++++++----- |
| 13 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 11 ++++++----- |
| 14 |
2 files changed, 12 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-qt/qtgui/qtgui-5.8.9999.ebuild b/dev-qt/qtgui/qtgui-5.8.9999.ebuild |
| 17 |
index b4e9ee6..93d456c 100644 |
| 18 |
--- a/dev-qt/qtgui/qtgui-5.8.9999.ebuild |
| 19 |
+++ b/dev-qt/qtgui/qtgui-5.8.9999.ebuild |
| 20 |
@@ -15,7 +15,7 @@ fi |
| 21 |
# TODO: linuxfb |
| 22 |
|
| 23 |
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk |
| 24 |
- ibus jpeg libinput +png tslib tuio +udev +xcb" |
| 25 |
+ ibus jpeg libinput +png tslib tuio +udev vnc +xcb" |
| 26 |
REQUIRED_USE=" |
| 27 |
|| ( eglfs xcb ) |
| 28 |
accessibility? ( dbus xcb ) |
| 29 |
@@ -56,6 +56,7 @@ RDEPEND=" |
| 30 |
tslib? ( x11-libs/tslib ) |
| 31 |
tuio? ( ~dev-qt/qtnetwork-${PV} ) |
| 32 |
udev? ( virtual/libudev:= ) |
| 33 |
+ vnc? ( ~dev-qt/qtnetwork-${PV} ) |
| 34 |
xcb? ( |
| 35 |
x11-libs/libICE |
| 36 |
x11-libs/libSM |
| 37 |
@@ -133,16 +134,16 @@ src_prepare() { |
| 38 |
# egl_x11 is activated when both egl and xcb are enabled |
| 39 |
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) |
| 40 |
|
| 41 |
- # avoid automagic dep on qtdbus |
| 42 |
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ |
| 43 |
src/platformsupport/platformsupport.pro || die |
| 44 |
|
| 45 |
+ qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro |
| 46 |
+ |
| 47 |
qt_use_disable_mod ibus dbus \ |
| 48 |
src/plugins/platforminputcontexts/platforminputcontexts.pro |
| 49 |
|
| 50 |
- # avoid automagic dep on qtnetwork |
| 51 |
- use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \ |
| 52 |
- src/plugins/generic/generic.pro || die |
| 53 |
+ use vnc || sed -i -e '/SUBDIRS += vnc/d' \ |
| 54 |
+ src/plugins/platforms/platforms.pro || die |
| 55 |
|
| 56 |
qt5-build_src_prepare |
| 57 |
} |
| 58 |
|
| 59 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 60 |
index b4e9ee6..93d456c 100644 |
| 61 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 62 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 63 |
@@ -15,7 +15,7 @@ fi |
| 64 |
# TODO: linuxfb |
| 65 |
|
| 66 |
IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk |
| 67 |
- ibus jpeg libinput +png tslib tuio +udev +xcb" |
| 68 |
+ ibus jpeg libinput +png tslib tuio +udev vnc +xcb" |
| 69 |
REQUIRED_USE=" |
| 70 |
|| ( eglfs xcb ) |
| 71 |
accessibility? ( dbus xcb ) |
| 72 |
@@ -56,6 +56,7 @@ RDEPEND=" |
| 73 |
tslib? ( x11-libs/tslib ) |
| 74 |
tuio? ( ~dev-qt/qtnetwork-${PV} ) |
| 75 |
udev? ( virtual/libudev:= ) |
| 76 |
+ vnc? ( ~dev-qt/qtnetwork-${PV} ) |
| 77 |
xcb? ( |
| 78 |
x11-libs/libICE |
| 79 |
x11-libs/libSM |
| 80 |
@@ -133,16 +134,16 @@ src_prepare() { |
| 81 |
# egl_x11 is activated when both egl and xcb are enabled |
| 82 |
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) |
| 83 |
|
| 84 |
- # avoid automagic dep on qtdbus |
| 85 |
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ |
| 86 |
src/platformsupport/platformsupport.pro || die |
| 87 |
|
| 88 |
+ qt_use_disable_config tuio udpsocket src/plugins/generic/generic.pro |
| 89 |
+ |
| 90 |
qt_use_disable_mod ibus dbus \ |
| 91 |
src/plugins/platforminputcontexts/platforminputcontexts.pro |
| 92 |
|
| 93 |
- # avoid automagic dep on qtnetwork |
| 94 |
- use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \ |
| 95 |
- src/plugins/generic/generic.pro || die |
| 96 |
+ use vnc || sed -i -e '/SUBDIRS += vnc/d' \ |
| 97 |
+ src/plugins/platforms/platforms.pro || die |
| 98 |
|
| 99 |
qt5-build_src_prepare |
| 100 |
} |
Archives