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 3B8411381F3 for ; Tue, 1 Oct 2013 00:55:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F102CE0B0F; Tue, 1 Oct 2013 00:55:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 706F1E0B0F for ; Tue, 1 Oct 2013 00:55:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA6B833EF03 for ; Tue, 1 Oct 2013 00:54:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 996FEE5309 for ; Tue, 1 Oct 2013 00:54:57 +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: <1380588581.4a53db2477f5e2f9088f20b43830306aa51f3329.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.2.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: 4a53db2477f5e2f9088f20b43830306aa51f3329 X-VCS-Branch: master Date: Tue, 1 Oct 2013 00:54:57 +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: 46480e58-0c35-49ca-b8d1-9dbb6e152794 X-Archives-Hash: 0d78e09248aa341096f0360694ff4ef7 commit: 4a53db2477f5e2f9088f20b43830306aa51f3329 Author: Davide Pesavento gmail com> AuthorDate: Tue Oct 1 00:49:41 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Oct 1 00:49:41 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4a53db24 [dev-qt/qtgui:5] Add support for inputcontext plugins. Package-Manager: portage-2.2.7 --- dev-qt/qtgui/metadata.xml | 3 ++- dev-qt/qtgui/qtgui-5.2.9999.ebuild | 10 ++++++++-- dev-qt/qtgui/qtgui-5.9999.ebuild | 10 ++++++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index 315ddb4..c02d5b6 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -17,7 +17,8 @@ Use media-libs/harfbuzz for text shaping (EXPERIMENTAL). If enabled, it can still be disabled at runtime by setting QT_HARFBUZZ environment variable to "old". - Enable KMS-based QPA plugin + Build the IBus input method plugin + Build the KMS platform plugin Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4. diff --git a/dev-qt/qtgui/qtgui-5.2.9999.ebuild b/dev-qt/qtgui/qtgui-5.2.9999.ebuild index 417d5d1..299d3a8 100644 --- a/dev-qt/qtgui/qtgui-5.2.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.2.9999.ebuild @@ -16,9 +16,9 @@ else KEYWORDS="~amd64" fi -# TODO: directfb, linuxfb, ibus +# TODO: directfb, linuxfb, offscreen -IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz jpeg kms opengl +png udev +xcb" +IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz ibus jpeg kms opengl +png udev +xcb" REQUIRED_USE=" eglfs? ( evdev gles2 ) gles2? ( opengl ) @@ -37,6 +37,7 @@ RDEPEND=" ) ) glib? ( dev-libs/glib:2 ) harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= ) + ibus? ( ~dev-qt/qtdbus-${PV}[debug=] ) jpeg? ( virtual/jpeg:0 ) kms? ( media-libs/mesa[gbm] @@ -65,11 +66,15 @@ DEPEND="${RDEPEND} evdev? ( sys-kernel/linux-headers ) test? ( ~dev-qt/qtnetwork-${PV}[debug=] ) " +PDEPEND=" + ibus? ( app-i18n/ibus ) +" QT5_TARGET_SUBDIRS=( src/gui src/platformsupport src/plugins/imageformats + src/plugins/platforminputcontexts/compose src/plugins/platforms ) @@ -91,6 +96,7 @@ pkg_setup() { $(use gles2 && echo QT_EGL) $(use jpeg && echo QT_IMAGEFORMAT_JPEG)" + use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions) qt5-build_pkg_setup diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index 417d5d1..299d3a8 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -16,9 +16,9 @@ else KEYWORDS="~amd64" fi -# TODO: directfb, linuxfb, ibus +# TODO: directfb, linuxfb, offscreen -IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz jpeg kms opengl +png udev +xcb" +IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz ibus jpeg kms opengl +png udev +xcb" REQUIRED_USE=" eglfs? ( evdev gles2 ) gles2? ( opengl ) @@ -37,6 +37,7 @@ RDEPEND=" ) ) glib? ( dev-libs/glib:2 ) harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= ) + ibus? ( ~dev-qt/qtdbus-${PV}[debug=] ) jpeg? ( virtual/jpeg:0 ) kms? ( media-libs/mesa[gbm] @@ -65,11 +66,15 @@ DEPEND="${RDEPEND} evdev? ( sys-kernel/linux-headers ) test? ( ~dev-qt/qtnetwork-${PV}[debug=] ) " +PDEPEND=" + ibus? ( app-i18n/ibus ) +" QT5_TARGET_SUBDIRS=( src/gui src/platformsupport src/plugins/imageformats + src/plugins/platforminputcontexts/compose src/plugins/platforms ) @@ -91,6 +96,7 @@ pkg_setup() { $(use gles2 && echo QT_EGL) $(use jpeg && echo QT_IMAGEFORMAT_JPEG)" + use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions) qt5-build_pkg_setup