commit: 1b73567ccfe0be30606035104052af548223cdb8
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 20:18:40 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 20:18:40 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1b73567c
[dev-qt/qtgui:5] Add USE=tuio to disable the TuioTouch plugin.
...and avoid a qtnetwork dependency.
Package-Manager: portage-2.2.20
dev-qt/qtgui/metadata.xml | 7 +++----
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 10 ++++++++--
dev-qt/qtgui/qtgui-5.5.9999.ebuild | 10 ++++++++--
dev-qt/qtgui/qtgui-5.9999.ebuild | 10 ++++++++--
4 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 3ecd8fd..a3505b0 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -10,8 +10,7 @@
inside the event loop (recommended by upstream)</flag>
<flag name="gles2">Use GLES 2.0 or later instead of full
OpenGL</flag>
<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop
support</flag>
- <flag name="gtkstyle">Build a Qt style called GTK+ that mimics
the active
- GTK+ theme</flag>
+ <flag name="gtkstyle">Build a Qt style called GTK+ that mimics
the active GTK+ theme</flag>
<flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for
text shaping</flag>
<flag name="ibus">Build the IBus input method plugin</flag>
<flag name="kms">Build the KMS platform plugin</flag>
@@ -20,8 +19,8 @@
<flag name="trace">Build the 'trace' graphicssystem engine
which allows to record
all drawing operations into a trace buffer. The trace
can be replayed
later with the qttracereplay tool.</flag>
- <flag name="tslib">Enable support for touchscreen devices via
- <pkg>x11-libs/tslib</pkg></flag>
+ <flag name="tslib">Enable support for touchscreen devices via
<pkg>x11-libs/tslib</pkg></flag>
+ <flag name="tuio">Build plugin to receive touch events over the
TUIO protocol</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
index e890de3..dc1a65f 100644
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild
@@ -12,9 +12,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
+# TODO: directfb, linuxfb, offscreen (auto-depends on X11), libinput
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus
jpeg kms +png tslib udev +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
+ ibus jpeg kms +png tslib tuio udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
@@ -48,6 +49,7 @@ RDEPEND="
)
png? ( media-libs/libpng:0= )
tslib? ( x11-libs/tslib )
+ tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
xcb? (
x11-libs/libICE
@@ -131,6 +133,10 @@ src_prepare() {
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
src/platformsupport/platformsupport.pro || die
+ # avoid automagic dep on qtnetwork
+ use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
+ src/plugins/generic/generic.pro || die
+
qt5-build_src_prepare
}
diff --git a/dev-qt/qtgui/qtgui-5.5.9999.ebuild
b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
index e890de3..dc1a65f 100644
--- a/dev-qt/qtgui/qtgui-5.5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.9999.ebuild
@@ -12,9 +12,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
+# TODO: directfb, linuxfb, offscreen (auto-depends on X11), libinput
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus
jpeg kms +png tslib udev +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
+ ibus jpeg kms +png tslib tuio udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
@@ -48,6 +49,7 @@ RDEPEND="
)
png? ( media-libs/libpng:0= )
tslib? ( x11-libs/tslib )
+ tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
xcb? (
x11-libs/libICE
@@ -131,6 +133,10 @@ src_prepare() {
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
src/platformsupport/platformsupport.pro || die
+ # avoid automagic dep on qtnetwork
+ use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
+ src/plugins/generic/generic.pro || die
+
qt5-build_src_prepare
}
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index e890de3..dc1a65f 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -12,9 +12,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
-# TODO: directfb, linuxfb, offscreen (auto-depends on X11)
+# TODO: directfb, linuxfb, offscreen (auto-depends on X11), libinput
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus
jpeg kms +png tslib udev +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle +harfbuzz
+ ibus jpeg kms +png tslib tuio udev +xcb"
REQUIRED_USE="
accessibility? ( dbus xcb )
egl? ( evdev )
@@ -48,6 +49,7 @@ RDEPEND="
)
png? ( media-libs/libpng:0= )
tslib? ( x11-libs/tslib )
+ tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
xcb? (
x11-libs/libICE
@@ -131,6 +133,10 @@ src_prepare() {
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \
src/platformsupport/platformsupport.pro || die
+ # avoid automagic dep on qtnetwork
+ use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \
+ src/plugins/generic/generic.pro || die
+
qt5-build_src_prepare
}
