From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 09F24138D02 for ; Tue, 23 Jun 2015 20:57:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 810F5E0936; Tue, 23 Jun 2015 20:57:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E83BAE0936 for ; Tue, 23 Jun 2015 20:57:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED61F3409E2 for ; Tue, 23 Jun 2015 20:57:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04DEFA54 for ; Tue, 23 Jun 2015 20:57:09 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1435090720.1b73567ccfe0be30606035104052af548223cdb8.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtgui/metadata.xml dev-qt/qtgui/qtgui-5.5.0_rc.ebuild dev-qt/qtgui/qtgui-5.5.9999.ebuild dev-qt/qtgui/qtgui-5.9999.ebuild X-VCS-Directories: dev-qt/qtgui/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 1b73567ccfe0be30606035104052af548223cdb8 X-VCS-Branch: master Date: Tue, 23 Jun 2015 20:57:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 96a55508-9eb0-4422-b89b-77d56b1520dd X-Archives-Hash: b1bb0312c68803914d9b1b83f91b23bc commit: 1b73567ccfe0be30606035104052af548223cdb8 Author: Davide Pesavento gentoo org> AuthorDate: Tue Jun 23 20:18:40 2015 +0000 Commit: Davide Pesavento gentoo 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) Use GLES 2.0 or later instead of full OpenGL Enable dev-libs/glib eventloop support - Build a Qt style called GTK+ that mimics the active - GTK+ theme + Build a Qt style called GTK+ that mimics the active GTK+ theme Use media-libs/harfbuzz for text shaping Build the IBus input method plugin Build the KMS platform plugin @@ -20,8 +19,8 @@ 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. - Enable support for touchscreen devices via - x11-libs/tslib + Enable support for touchscreen devices via x11-libs/tslib + Build plugin to receive touch events over the TUIO protocol https://bugreports.qt.io/ 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 }