1 |
commit: 4a53db2477f5e2f9088f20b43830306aa51f3329 |
2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Oct 1 00:49:41 2013 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 1 00:49:41 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4a53db24 |
7 |
|
8 |
[dev-qt/qtgui:5] Add support for inputcontext plugins. |
9 |
|
10 |
Package-Manager: portage-2.2.7 |
11 |
|
12 |
--- |
13 |
dev-qt/qtgui/metadata.xml | 3 ++- |
14 |
dev-qt/qtgui/qtgui-5.2.9999.ebuild | 10 ++++++++-- |
15 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 10 ++++++++-- |
16 |
3 files changed, 18 insertions(+), 5 deletions(-) |
17 |
|
18 |
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml |
19 |
index 315ddb4..c02d5b6 100644 |
20 |
--- a/dev-qt/qtgui/metadata.xml |
21 |
+++ b/dev-qt/qtgui/metadata.xml |
22 |
@@ -17,7 +17,8 @@ |
23 |
<flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for text shaping |
24 |
(EXPERIMENTAL). If enabled, it can still be disabled at runtime by |
25 |
setting QT_HARFBUZZ environment variable to "old".</flag> |
26 |
- <flag name="kms">Enable KMS-based QPA plugin</flag> |
27 |
+ <flag name="ibus">Build the IBus input method plugin</flag> |
28 |
+ <flag name="kms">Build the KMS platform plugin</flag> |
29 |
<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that |
30 |
this does not mean you can compile pure Qt3 programs with Qt4.</flag> |
31 |
<flag name="trace"> |
32 |
|
33 |
diff --git a/dev-qt/qtgui/qtgui-5.2.9999.ebuild b/dev-qt/qtgui/qtgui-5.2.9999.ebuild |
34 |
index 417d5d1..299d3a8 100644 |
35 |
--- a/dev-qt/qtgui/qtgui-5.2.9999.ebuild |
36 |
+++ b/dev-qt/qtgui/qtgui-5.2.9999.ebuild |
37 |
@@ -16,9 +16,9 @@ else |
38 |
KEYWORDS="~amd64" |
39 |
fi |
40 |
|
41 |
-# TODO: directfb, linuxfb, ibus |
42 |
+# TODO: directfb, linuxfb, offscreen |
43 |
|
44 |
-IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz jpeg kms opengl +png udev +xcb" |
45 |
+IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz ibus jpeg kms opengl +png udev +xcb" |
46 |
REQUIRED_USE=" |
47 |
eglfs? ( evdev gles2 ) |
48 |
gles2? ( opengl ) |
49 |
@@ -37,6 +37,7 @@ RDEPEND=" |
50 |
) ) |
51 |
glib? ( dev-libs/glib:2 ) |
52 |
harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= ) |
53 |
+ ibus? ( ~dev-qt/qtdbus-${PV}[debug=] ) |
54 |
jpeg? ( virtual/jpeg:0 ) |
55 |
kms? ( |
56 |
media-libs/mesa[gbm] |
57 |
@@ -65,11 +66,15 @@ DEPEND="${RDEPEND} |
58 |
evdev? ( sys-kernel/linux-headers ) |
59 |
test? ( ~dev-qt/qtnetwork-${PV}[debug=] ) |
60 |
" |
61 |
+PDEPEND=" |
62 |
+ ibus? ( app-i18n/ibus ) |
63 |
+" |
64 |
|
65 |
QT5_TARGET_SUBDIRS=( |
66 |
src/gui |
67 |
src/platformsupport |
68 |
src/plugins/imageformats |
69 |
+ src/plugins/platforminputcontexts/compose |
70 |
src/plugins/platforms |
71 |
) |
72 |
|
73 |
@@ -91,6 +96,7 @@ pkg_setup() { |
74 |
$(use gles2 && echo QT_EGL) |
75 |
$(use jpeg && echo QT_IMAGEFORMAT_JPEG)" |
76 |
|
77 |
+ use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) |
78 |
use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions) |
79 |
|
80 |
qt5-build_pkg_setup |
81 |
|
82 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
83 |
index 417d5d1..299d3a8 100644 |
84 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
85 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
86 |
@@ -16,9 +16,9 @@ else |
87 |
KEYWORDS="~amd64" |
88 |
fi |
89 |
|
90 |
-# TODO: directfb, linuxfb, ibus |
91 |
+# TODO: directfb, linuxfb, offscreen |
92 |
|
93 |
-IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz jpeg kms opengl +png udev +xcb" |
94 |
+IUSE="accessibility eglfs evdev gif gles2 +glib harfbuzz ibus jpeg kms opengl +png udev +xcb" |
95 |
REQUIRED_USE=" |
96 |
eglfs? ( evdev gles2 ) |
97 |
gles2? ( opengl ) |
98 |
@@ -37,6 +37,7 @@ RDEPEND=" |
99 |
) ) |
100 |
glib? ( dev-libs/glib:2 ) |
101 |
harfbuzz? ( >=media-libs/harfbuzz-0.9.12:0= ) |
102 |
+ ibus? ( ~dev-qt/qtdbus-${PV}[debug=] ) |
103 |
jpeg? ( virtual/jpeg:0 ) |
104 |
kms? ( |
105 |
media-libs/mesa[gbm] |
106 |
@@ -65,11 +66,15 @@ DEPEND="${RDEPEND} |
107 |
evdev? ( sys-kernel/linux-headers ) |
108 |
test? ( ~dev-qt/qtnetwork-${PV}[debug=] ) |
109 |
" |
110 |
+PDEPEND=" |
111 |
+ ibus? ( app-i18n/ibus ) |
112 |
+" |
113 |
|
114 |
QT5_TARGET_SUBDIRS=( |
115 |
src/gui |
116 |
src/platformsupport |
117 |
src/plugins/imageformats |
118 |
+ src/plugins/platforminputcontexts/compose |
119 |
src/plugins/platforms |
120 |
) |
121 |
|
122 |
@@ -91,6 +96,7 @@ pkg_setup() { |
123 |
$(use gles2 && echo QT_EGL) |
124 |
$(use jpeg && echo QT_IMAGEFORMAT_JPEG)" |
125 |
|
126 |
+ use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) |
127 |
use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions) |
128 |
|
129 |
qt5-build_pkg_setup |