1 |
commit: 710a10897f53040823ee971c316aad4ca49ed65e |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Wed Nov 1 12:45:31 2017 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 1 20:54:19 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=710a1089 |
7 |
|
8 |
app-i18n/mozc: Delete old versions (1.10.1390.102-r1, 1.13.1651.102, 2.16.2037.102). |
9 |
|
10 |
app-i18n/mozc/Manifest | 10 - |
11 |
.../files/mozc-1.10.1390.102-drop-Werror.patch | 12 - |
12 |
.../files/mozc-1.13.1651.102-gtk-renderer.patch | 13 - |
13 |
app-i18n/mozc/files/mozc-ibus-1.5.4.patch | 299 --------------------- |
14 |
app-i18n/mozc/metadata.xml | 6 +- |
15 |
app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild | 176 ------------ |
16 |
app-i18n/mozc/mozc-1.13.1651.102.ebuild | 181 ------------- |
17 |
app-i18n/mozc/mozc-2.16.2037.102.ebuild | 230 ---------------- |
18 |
8 files changed, 2 insertions(+), 925 deletions(-) |
19 |
|
20 |
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest |
21 |
index 03af05380cd..c6ed7c5ef6f 100644 |
22 |
--- a/app-i18n/mozc/Manifest |
23 |
+++ b/app-i18n/mozc/Manifest |
24 |
@@ -1,13 +1,3 @@ |
25 |
-DIST fcitx-mozc-2.16.2037.102.2.patch 140421 SHA256 ff175f3e0301c33f750780765ea264887827d00bc7a59fc8b55ae514ba449a1e SHA512 22b885859588bb8e0efd354d153da461a654203729c723156a419bf33fae473e3f7165964aa3cb3b5c969f97c2727f9d87b0d587330e4eeab67f07d4458542a3 WHIRLPOOL cd9534c8904a7c9f866a8ddd41ab4c57b3ad8b5650fda4cf9ccc1e544c8e0da25c749870606687ee66e4252f224babdbe10415e035038ced654812bad8d299dc |
26 |
DIST fcitx-mozc-2.18.2612.102.1.patch 140722 SHA256 0ec5dc2e9798ce7a6dbcbe847cf016b0b49be1851008143d167c13333a15ed27 SHA512 725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb WHIRLPOOL 25d0efd313175f6648504b989302c73ab6d82a0cf4eecf332b68347331e1feff2df6251edd49c3d4e9251a2c7e01df56eb8de54ebbbc31582f7c2b89d1da53c1 |
27 |
-DIST gmock-1.6.0.zip 2053682 SHA256 341ad07c31c619ba32c88c2265bc23693da1df062f47f146a7ed340f646d82b7 SHA512 7adff00bb6ff81a6ffb704be71d0747636d69e24b4a8b709e1fb8c177a9a47f6dea8d14fde73034ebfb1529c291c7212a944ad92a34f88abdfe23c2d0b11b6f7 WHIRLPOOL 1a03ff8f2d96287f5deb24f970688f20f3480e77a4a71089ef1399a87f28f616bf0feaedc217e7ac1ca8ca1246e53f5d882f350704be111ae547961949939530 |
28 |
-DIST gtest-1.6.0.zip 1121697 SHA256 5ec97df8e75b4ee796604e74716d1b50582beba22c5502edd055a7e67a3965d8 SHA512 f4718dfbfa3339bb9449c3f14e5b44ae405ea7df64c10a0957a6300985b71c4642981d069a1382e27ae041a4e2873527a9e442aff978447e795a190f99fac115 WHIRLPOOL 745a49020d4353ed2fa38adfc80bbd777358c831719bbe3b7c90d243f84256615222ba5f04d48d98b9e1a803bb40766799b3aedd575024c19d853d9239a12f8a |
29 |
-DIST gyp-20140602.tar.bz2 432422 SHA256 f67be748f4dc36aa1619f43d4624c746728cf268af7f4ebf78dab3fa6d43d973 SHA512 e3a59daac57ddafc5804384c01cf51d4b90cd119d263afd83ec6eef9239c38bc7715736f70e20e44fae04fd8be1b86aa5323908a92d574372aa298f3355ce15f WHIRLPOOL 17e4630dcd7592e8ee197b4130d6147d9fd63404938f62e08ad10a204bd4bddcfc7d394abf3572a337e3dea46d4a7361dbc0cccc02e07ab99ed8f90e80830451 |
30 |
-DIST japanese-usage-dictionary-10.tar.bz2 56142 SHA256 8c22284c97fdfad854790517f9200c439453c033db8f6a9d25aa5d95266b2384 SHA512 f299cf9183b9ec219d80c1fa745f351765d246d601f3c4091d1705e3c8b5ef66a32288d4c162e7bbc456b6d49ee90f1e5bf33721e1229165f3ee069daddd3198 WHIRLPOOL d2f690335cf271b0780c969f56616ece9d28f3dbe990548053a252c855db18a4a31d21e6bd8c34160c0893c21fab4543e5ff3cecb48c7f6ecfd5c84465d314a6 |
31 |
DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 SHA256 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7 WHIRLPOOL 1c4324a6408cfc0b2e1df33a32583384ccf10374bc1a8f49f574e681a72174f7bee7e8500c93d714ee6459c087f7cd408e57cb52b8506ec50292249e50045cd2 |
32 |
-DIST jsoncpp-src-0.6.0-rc2.tar.gz 117661 SHA256 d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283 SHA512 5d44e766aa2d7657bc68cf16173130febaa6744d5fca0c6df5465617a3f306023a17cbeb07a62ad1a34c2d183d916401b4be48f37c2416c895db4ad5d9481b3d WHIRLPOOL bfa7e70e14f3ed0911c5127da0d2099ca8b9159a900a5bc5147d1e50b5a9f9d5be69a8d46a761d277ca1edabaab8d0d3b9f81417572e4664ed8239fd83c953e6 |
33 |
-DIST mozc-1.10.1390.102.tar.bz2 57879881 SHA256 72a8ed6657daa1c03b1efe50c262a69be2ab66d45747a47df6e54996b6d5ee39 SHA512 4482e822f8a14bffd02cb1eaa5d14ba0a213266b2f0dd6402c42b9b357bf0d8c4dd572cef79f1d400bd68b7bd6cb4367933574f8f5967f68738249a300e3cfb9 WHIRLPOOL 90518e621ef784b438fcf677e211fdb6753719f3d78d14ce866ccea22d6d87f8d64e334bc568eebe93cb2850d3d545eb0b73d6f6de820eaf1d43f16bfdef4100 |
34 |
-DIST mozc-1.13.1651.102.tar.bz2 31635636 SHA256 a275accc726d55d696adf235fa40822ae099f0a02d3dc9f8d0257ba191a1bc49 SHA512 caa75e60704e904a72fd06e315a219ff304a54adaeee70a8ab75d413f7801960add103b9aae1c19ee92f6d10c4c408fd840cf78c5dde0cc21c605feac59deaf4 WHIRLPOOL 72a870cc1bc5bc63227bba61c73183f69160aa5c58c9b89e75fa65bf16bbdc2c2b873b7407d0543b3847bc046866392d9bbe6d771d7b4b7eb3f6be759f1a63b4 |
35 |
-DIST mozc-2.16.2037.102.tar.bz2 41172838 SHA256 4b78769b36366f056282267935a859e587f77e9aaf17132687d0e4d0c4da5cd0 SHA512 ff114a93054b43109407c44bc7c75de79fa2b028f9dba5c2ecc1776c5cbb032f184a91155b6b31bc17f0183dd70b0150ce13e80f59e26810daf4b65ba7e52be1 WHIRLPOOL 625c5a28da164ee96cdf523af32a7101357254cea1d57cd7f272bdf86ba8344d3e39bf2b2bfb0a79640d7961fd46c183eabc4002c8d86215ecffe183e4e0d193 |
36 |
DIST mozc-2.20.2673.102.tar.gz 48624369 SHA256 004cb773d335e7e1075cf20fd9e713f6dcf6d158d75077bcb95358a116ad3cca SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae WHIRLPOOL f78140126a950eb28548c6ef8b20ec5599e04ac1de7d22d2b0ba00cc2471d43ec9823996e399f9025cfcbc7b50a3ecdbd3283463acb423b65089f56c96cc88db |
37 |
-DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d |
38 |
|
39 |
diff --git a/app-i18n/mozc/files/mozc-1.10.1390.102-drop-Werror.patch b/app-i18n/mozc/files/mozc-1.10.1390.102-drop-Werror.patch |
40 |
deleted file mode 100644 |
41 |
index e254f38b874..00000000000 |
42 |
--- a/app-i18n/mozc/files/mozc-1.10.1390.102-drop-Werror.patch |
43 |
+++ /dev/null |
44 |
@@ -1,12 +0,0 @@ |
45 |
-diff --git a/gyp/common.gypi b/gyp/common.gypi |
46 |
-index 6c176ff..3613b1b 100755 |
47 |
---- a/gyp/common.gypi |
48 |
-+++ b/gyp/common.gypi |
49 |
-@@ -58,7 +58,6 @@ |
50 |
- # warning_cflags will be shared with Mac and Linux. |
51 |
- 'warning_cflags': [ |
52 |
- '-Wall', |
53 |
-- '-Werror', |
54 |
- '-Wno-char-subscripts', |
55 |
- '-Wno-sign-compare', |
56 |
- '-Wno-deprecated-declarations', |
57 |
|
58 |
diff --git a/app-i18n/mozc/files/mozc-1.13.1651.102-gtk-renderer.patch b/app-i18n/mozc/files/mozc-1.13.1651.102-gtk-renderer.patch |
59 |
deleted file mode 100644 |
60 |
index bff0822a602..00000000000 |
61 |
--- a/app-i18n/mozc/files/mozc-1.13.1651.102-gtk-renderer.patch |
62 |
+++ /dev/null |
63 |
@@ -1,13 +0,0 @@ |
64 |
-diff --git a/unix/ibus/mozc_engine.cc b/unix/ibus/mozc_engine.cc |
65 |
-index e256ea4..534262e 100755 |
66 |
---- a/unix/ibus/mozc_engine.cc |
67 |
-+++ b/unix/ibus/mozc_engine.cc |
68 |
-@@ -250,8 +250,6 @@ MozcEngine::MozcEngine() |
69 |
- #ifdef ENABLE_GTK_RENDERER |
70 |
- gtk_candidate_window_handler_(new GtkCandidateWindowHandler( |
71 |
- new renderer::RendererClient())), |
72 |
--#else |
73 |
-- gtk_candidate_window_handler_(NULL), |
74 |
- #endif // ENABLE_GTK_RENDERER |
75 |
- ibus_candidate_window_handler_(new IBusCandidateWindowHandler()), |
76 |
- preedit_method_(config::Config::ROMAN) { |
77 |
|
78 |
diff --git a/app-i18n/mozc/files/mozc-ibus-1.5.4.patch b/app-i18n/mozc/files/mozc-ibus-1.5.4.patch |
79 |
deleted file mode 100644 |
80 |
index 619b1d25150..00000000000 |
81 |
--- a/app-i18n/mozc/files/mozc-ibus-1.5.4.patch |
82 |
+++ /dev/null |
83 |
@@ -1,299 +0,0 @@ |
84 |
-Index: engine_interface.h |
85 |
-=================================================================== |
86 |
---- unix/ibus/engine_interface.h (revision 177) |
87 |
-+++ unix/ibus/engine_interface.h (working copy) |
88 |
-@@ -106,6 +106,11 @@ |
89 |
- gint y, |
90 |
- gint w, |
91 |
- gint h) = 0; |
92 |
-+ |
93 |
-+ // The interface function for the "set-content-type" signal |
94 |
-+ virtual void SetContentType(IBusEngine *engine, |
95 |
-+ guint purpose, |
96 |
-+ guint hints) = 0; |
97 |
- }; |
98 |
- |
99 |
- } // namespace ibus |
100 |
-Index: engine_registrar.cc |
101 |
-=================================================================== |
102 |
---- unix/ibus/engine_registrar.cc (revision 177) |
103 |
-+++ unix/ibus/engine_registrar.cc (working copy) |
104 |
-@@ -63,7 +63,9 @@ |
105 |
- engine_class->reset = Reset; |
106 |
- engine_class->set_capabilities = SetCapabilities; |
107 |
- engine_class->set_cursor_location = SetCursorLocation; |
108 |
-- |
109 |
-+#if defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE) |
110 |
-+ engine_class->set_content_type = SetContentType; |
111 |
-+#endif // MOZC_ENABLE_IBUS_INPUT_PURPOSE |
112 |
- return true; |
113 |
- } |
114 |
- |
115 |
-@@ -87,6 +89,9 @@ |
116 |
- engine_class->reset = NULL; |
117 |
- engine_class->set_capabilities = NULL; |
118 |
- engine_class->set_cursor_location = NULL; |
119 |
-+#if defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE) |
120 |
-+ engine_class->set_content_type = NULL; |
121 |
-+#endif // MOZC_ENABLE_IBUS_INPUT_PURPOSE |
122 |
- |
123 |
- mozc::ibus::EngineInterface *previous = g_engine; |
124 |
- g_engine = NULL; |
125 |
-@@ -179,5 +184,12 @@ |
126 |
- g_engine->SetCursorLocation(engine, x, y, w, h); |
127 |
- } |
128 |
- |
129 |
-+void EngineRegistrar::SetContentType( |
130 |
-+ IBusEngine *engine, |
131 |
-+ guint purpose, |
132 |
-+ guint hints) { |
133 |
-+ g_engine->SetContentType(engine, purpose, hints); |
134 |
-+} |
135 |
-+ |
136 |
- } // namespace ibus |
137 |
- } // namespace mozc |
138 |
-Index: engine_registrar.h |
139 |
-=================================================================== |
140 |
---- unix/ibus/engine_registrar.h (revision 177) |
141 |
-+++ unix/ibus/engine_registrar.h (working copy) |
142 |
-@@ -84,6 +84,9 @@ |
143 |
- gint y, |
144 |
- gint w, |
145 |
- gint h); |
146 |
-+ static void SetContentType(IBusEngine *engine, |
147 |
-+ guint purpose, |
148 |
-+ guint hints); |
149 |
- }; |
150 |
- |
151 |
- } // namespace ibus |
152 |
-Index: ibus_header.h |
153 |
-=================================================================== |
154 |
---- unix/ibus/ibus_header.h (revision 177) |
155 |
-+++ unix/ibus/ibus_header.h (working copy) |
156 |
-@@ -36,5 +36,10 @@ |
157 |
- #error "ibus-mozc now requires IBus>=1.4.1" |
158 |
- #endif // libibus (<1.4.1) |
159 |
- |
160 |
-+#if IBUS_CHECK_VERSION(1, 5, 4) |
161 |
-+#if !defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE) |
162 |
-+#define MOZC_ENABLE_IBUS_INPUT_PURPOSE |
163 |
-+#endif // !MOZC_ENABLE_IBUS_INPUT_PURPOSE |
164 |
-+#endif // libibus(>=1.5.4) |
165 |
- |
166 |
- #endif // MOZC_UNIX_IBUS_IBUS_HEADER_H_ |
167 |
-Index: mozc_engine.cc |
168 |
-=================================================================== |
169 |
---- unix/ibus/mozc_engine.cc (revision 177) |
170 |
-+++ unix/ibus/mozc_engine.cc (working copy) |
171 |
-@@ -372,6 +372,7 @@ |
172 |
- |
173 |
- void MozcEngine::FocusOut(IBusEngine *engine) { |
174 |
- GetCandidateWindowHandler(engine)->Hide(engine); |
175 |
-+ property_handler_->ResetContentType(engine); |
176 |
- |
177 |
- // Do not call SubmitSession or RevertSession. Preedit string will commit on |
178 |
- // Focus Out event automatically by ibus_engine_update_preedit_text_with_mode |
179 |
-@@ -397,6 +398,11 @@ |
180 |
- VLOG(2) << "keyval: " << keyval |
181 |
- << ", keycode: " << keycode |
182 |
- << ", modifiers: " << modifiers; |
183 |
-+ if (property_handler_->IsDisabled()) { |
184 |
-+ // It is each enginze's responsibility for ignoreing keyevents on |
185 |
-+ // the password field on the locked screen since IBus 1.5.4. |
186 |
-+ return FALSE; |
187 |
-+ } |
188 |
- |
189 |
- // Send current caret location to mozc_server to manage suggest window |
190 |
- // position. |
191 |
-@@ -501,6 +507,18 @@ |
192 |
- // Do nothing |
193 |
- } |
194 |
- |
195 |
-+void MozcEngine::SetContentType(IBusEngine *engine, |
196 |
-+ guint purpose, |
197 |
-+ guint hints) { |
198 |
-+ const bool prev_disabled = |
199 |
-+ property_handler_->IsDisabled(); |
200 |
-+ property_handler_->UpdateContentType(engine); |
201 |
-+ if (!prev_disabled && property_handler_->IsDisabled()) { |
202 |
-+ // Make sure on-going composition is reverted. |
203 |
-+ RevertSession(engine); |
204 |
-+ } |
205 |
-+} |
206 |
-+ |
207 |
- GType MozcEngine::GetType() { |
208 |
- static GType type = 0; |
209 |
- |
210 |
-Index: mozc_engine.h |
211 |
-=================================================================== |
212 |
---- unix/ibus/mozc_engine.h (revision 177) |
213 |
-+++ unix/ibus/mozc_engine.h (working copy) |
214 |
-@@ -99,6 +99,9 @@ |
215 |
- gint y, |
216 |
- gint w, |
217 |
- gint h); |
218 |
-+ void SetContentType(IBusEngine *engine, |
219 |
-+ guint purpose, |
220 |
-+ guint hints); |
221 |
- |
222 |
- // Returns the GType which this class represents. |
223 |
- static GType GetType(); |
224 |
-Index: property_handler.cc |
225 |
-=================================================================== |
226 |
---- unix/ibus/property_handler.cc (revision 177) |
227 |
-+++ unix/ibus/property_handler.cc (working copy) |
228 |
-@@ -61,6 +61,19 @@ |
229 |
- bool IsMozcToolAvailable() { |
230 |
- return FileUtil::FileExists(SystemUtil::GetToolPath()); |
231 |
- } |
232 |
-+ |
233 |
-+bool GetDisabled(IBusEngine *engine) { |
234 |
-+ bool disabled = false; |
235 |
-+#if defined(MOZC_ENABLE_IBUS_INPUT_PURPOSE) |
236 |
-+ guint purpose = IBUS_INPUT_PURPOSE_FREE_FORM; |
237 |
-+ guint hints = IBUS_INPUT_HINT_NONE; |
238 |
-+ ibus_engine_get_content_type(engine, &purpose, &hints); |
239 |
-+ disabled = (purpose == IBUS_INPUT_PURPOSE_PASSWORD || |
240 |
-+ purpose == IBUS_INPUT_PURPOSE_PIN); |
241 |
-+#endif // MOZC_ENABLE_IBUS_INPUT_PURPOSE |
242 |
-+ return disabled; |
243 |
-+} |
244 |
-+ |
245 |
- } // namespace |
246 |
- |
247 |
- PropertyHandler::PropertyHandler(MessageTranslatorInterface *translator, |
248 |
-@@ -71,7 +84,8 @@ |
249 |
- client_(client), |
250 |
- translator_(translator), |
251 |
- original_composition_mode_(kMozcEngineInitialCompositionMode), |
252 |
-- is_activated_(true) { |
253 |
-+ is_activated_(true), |
254 |
-+ is_disabled_(false) { |
255 |
- |
256 |
- AppendCompositionPropertyToPanel(); |
257 |
- #ifndef OS_CHROMEOS |
258 |
-@@ -105,6 +119,7 @@ |
259 |
- |
260 |
- void PropertyHandler::Register(IBusEngine *engine) { |
261 |
- ibus_engine_register_properties(engine, prop_root_); |
262 |
-+ UpdateContentType(engine); |
263 |
- } |
264 |
- |
265 |
- // TODO(nona): do not use kMozcEngine*** directory. |
266 |
-@@ -228,8 +243,34 @@ |
267 |
- ibus_prop_list_append(prop_root_, prop_mozc_tool_); |
268 |
- } |
269 |
- |
270 |
-+void PropertyHandler::UpdateContentTypeImpl(IBusEngine *engine, |
271 |
-+ bool disabled) { |
272 |
-+ const bool prev_is_disabled = is_disabled_; |
273 |
-+ is_disabled_ = disabled; |
274 |
-+ if (prev_is_disabled == is_disabled_) { |
275 |
-+ return; |
276 |
-+ } |
277 |
-+ const commands::CompositionMode visible_mode = |
278 |
-+ (prev_is_disabled && !is_disabled_ && IsActivated()) |
279 |
-+ ? original_composition_mode_ : |
280 |
-+ kMozcEnginePropertyIMEOffState->composition_mode; |
281 |
-+ UpdateCompositionModeIcon(engine, visible_mode); |
282 |
-+} |
283 |
-+ |
284 |
-+void PropertyHandler::ResetContentType(IBusEngine *engine) { |
285 |
-+ UpdateContentTypeImpl(engine, false); |
286 |
-+} |
287 |
-+ |
288 |
-+void PropertyHandler::UpdateContentType(IBusEngine *engine) { |
289 |
-+ UpdateContentTypeImpl(engine, GetDisabled(engine)); |
290 |
-+} |
291 |
-+ |
292 |
- void PropertyHandler::Update(IBusEngine *engine, |
293 |
- const commands::Output &output) { |
294 |
-+ if (IsDisabled()) { |
295 |
-+ return; |
296 |
-+ } |
297 |
-+ |
298 |
- if (output.has_status() && |
299 |
- (output.status().activated() != is_activated_ || |
300 |
- output.status().mode() != original_composition_mode_)) { |
301 |
-@@ -325,6 +366,10 @@ |
302 |
- const gchar *property_name, |
303 |
- guint property_state) { |
304 |
- #ifndef OS_CHROMEOS |
305 |
-+ if (IsDisabled()) { |
306 |
-+ return; |
307 |
-+ } |
308 |
-+ |
309 |
- if (prop_mozc_tool_) { |
310 |
- for (guint prop_index = 0; ; ++prop_index) { |
311 |
- IBusProperty *prop = ibus_prop_list_get( |
312 |
-@@ -371,9 +416,13 @@ |
313 |
- } |
314 |
- |
315 |
- bool PropertyHandler::IsActivated() const { |
316 |
-- return is_activated_; |
317 |
-+ return is_activated_ && !IsDisabled(); |
318 |
- } |
319 |
- |
320 |
-+bool PropertyHandler::IsDisabled() const { |
321 |
-+ return is_disabled_; |
322 |
-+} |
323 |
-+ |
324 |
- commands::CompositionMode PropertyHandler::GetOriginalCompositionMode() const { |
325 |
- return original_composition_mode_; |
326 |
- } |
327 |
-Index: property_handler.h |
328 |
-=================================================================== |
329 |
---- unix/ibus/property_handler.h (revision 177) |
330 |
-+++ unix/ibus/property_handler.h (working copy) |
331 |
-@@ -54,14 +54,19 @@ |
332 |
- virtual ~PropertyHandler(); |
333 |
- |
334 |
- virtual void Register(IBusEngine *engine); |
335 |
-+ virtual void ResetContentType(IBusEngine *engine); |
336 |
-+ virtual void UpdateContentType(IBusEngine *engine); |
337 |
- virtual void Update(IBusEngine *engine, const commands::Output &output); |
338 |
- virtual void ProcessPropertyActivate(IBusEngine *engine, |
339 |
- const gchar *property_name, |
340 |
- guint property_state); |
341 |
- virtual bool IsActivated() const; |
342 |
-+ virtual bool IsDisabled() const; |
343 |
- virtual commands::CompositionMode GetOriginalCompositionMode() const; |
344 |
- |
345 |
- private: |
346 |
-+ void UpdateContentTypeImpl(IBusEngine *engine, bool disabled); |
347 |
-+ |
348 |
- // Appends composition properties into panel |
349 |
- void AppendCompositionPropertyToPanel(); |
350 |
- // Appends tool properties into panel |
351 |
-@@ -79,6 +84,7 @@ |
352 |
- scoped_ptr<MessageTranslatorInterface> translator_; |
353 |
- commands::CompositionMode original_composition_mode_; |
354 |
- bool is_activated_; |
355 |
-+ bool is_disabled_; |
356 |
- }; |
357 |
- |
358 |
- } // namespace ibus |
359 |
-Index: property_handler_interface.h |
360 |
-=================================================================== |
361 |
---- unix/ibus/property_handler_interface.h (revision 177) |
362 |
-+++ unix/ibus/property_handler_interface.h (working copy) |
363 |
-@@ -45,6 +45,9 @@ |
364 |
- // Registers current properties into engine. |
365 |
- virtual void Register(IBusEngine *engine) ABSTRACT; |
366 |
- |
367 |
-+ virtual void ResetContentType(IBusEngine *engine) ABSTRACT; |
368 |
-+ virtual void UpdateContentType(IBusEngine *engine) ABSTRACT; |
369 |
-+ |
370 |
- // Update properties. |
371 |
- virtual void Update(IBusEngine *engine, |
372 |
- const commands::Output &output) ABSTRACT; |
373 |
-@@ -55,6 +58,9 @@ |
374 |
- // Returns if IME is activated or not. |
375 |
- virtual bool IsActivated() const ABSTRACT; |
376 |
- |
377 |
-+ // Returns if IME is forcesully disabled, e.g. on a password field. |
378 |
-+ virtual bool IsDisabled() const ABSTRACT; |
379 |
-+ |
380 |
- // Returns original composition mode before. |
381 |
- virtual commands::CompositionMode GetOriginalCompositionMode() const ABSTRACT; |
382 |
- }; |
383 |
|
384 |
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml |
385 |
index f5031cbbd25..5b85ef8a79d 100644 |
386 |
--- a/app-i18n/mozc/metadata.xml |
387 |
+++ b/app-i18n/mozc/metadata.xml |
388 |
@@ -10,10 +10,9 @@ |
389 |
<name>Cjk</name> |
390 |
</maintainer> |
391 |
<longdescription lang="en"> |
392 |
-Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as Chromium OS, Windows, Mac and Linux. This open-source project originates from Google Japanese Input. |
393 |
-</longdescription> |
394 |
+ Mozc is a subset of Google Japanese Input (Google 日本語入力) released in open-source form. |
395 |
+ </longdescription> |
396 |
<use> |
397 |
- <flag name="fcitx">Enable support for <pkg>app-i18n/fcitx</pkg></flag> |
398 |
<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag> |
399 |
<flag name="gui">Install graphical user interface tool (mozc_tool)</flag> |
400 |
<flag name="handwriting-tegaki">Use handwriting recognition model from <pkg>app-i18n/tegaki-zinnia-japanese</pkg></flag> |
401 |
@@ -22,7 +21,6 @@ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as |
402 |
<flag name="renderer">Enable native candidate window</flag> |
403 |
</use> |
404 |
<upstream> |
405 |
- <remote-id type="sourceforge">jsoncpp</remote-id> |
406 |
<remote-id type="github">google/mozc</remote-id> |
407 |
</upstream> |
408 |
</pkgmetadata> |
409 |
|
410 |
diff --git a/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild b/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild |
411 |
deleted file mode 100644 |
412 |
index 7aa21965a5f..00000000000 |
413 |
--- a/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild |
414 |
+++ /dev/null |
415 |
@@ -1,176 +0,0 @@ |
416 |
-# Copyright 1999-2017 Gentoo Foundation |
417 |
-# Distributed under the terms of the GNU General Public License v2 |
418 |
- |
419 |
-EAPI="5" |
420 |
-PYTHON_COMPAT=( python2_7 ) |
421 |
-inherit elisp-common eutils multilib multiprocessing python-single-r1 toolchain-funcs |
422 |
- |
423 |
-DESCRIPTION="The Mozc engine for IBus Framework" |
424 |
-HOMEPAGE="https://github.com/google/mozc" |
425 |
- |
426 |
-PROTOBUF_VER="2.5.0" |
427 |
-GMOCK_VER="1.6.0" |
428 |
-GTEST_VER="1.6.0" |
429 |
-JSONCPP_VER="0.6.0-rc2" |
430 |
-MOZC_URL="https://mozc.googlecode.com/files/${P}.tar.bz2" |
431 |
-PROTOBUF_URL="https://protobuf.googlecode.com/files/protobuf-${PROTOBUF_VER}.tar.bz2" |
432 |
-GMOCK_URL="https://googlemock.googlecode.com/files/gmock-${GMOCK_VER}.zip" |
433 |
-GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip" |
434 |
-JSONCPP_URL="mirror://sourceforge/jsoncpp/jsoncpp-src-${JSONCPP_VER}.tar.gz" |
435 |
-SRC_URI="${MOZC_URL} ${PROTOBUF_URL} |
436 |
- test? ( ${GMOCK_URL} ${GTEST_URL} ${JSONCPP_URL} )" |
437 |
- |
438 |
-LICENSE="BSD ipadic public-domain unicode" |
439 |
-SLOT="0" |
440 |
-KEYWORDS="~amd64 ~x86" |
441 |
-IUSE="emacs +ibus +qt4 renderer test" |
442 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
443 |
- |
444 |
-RDEPEND="dev-libs/glib:2 |
445 |
- dev-libs/openssl:0= |
446 |
- x11-libs/libxcb |
447 |
- emacs? ( virtual/emacs ) |
448 |
- ibus? ( >=app-i18n/ibus-1.4.1 ) |
449 |
- renderer? ( x11-libs/gtk+:2 ) |
450 |
- qt4? ( |
451 |
- dev-qt/qtgui:4 |
452 |
- app-i18n/zinnia |
453 |
- ) |
454 |
- ${PYTHON_DEPS}" |
455 |
-DEPEND="${RDEPEND} |
456 |
- virtual/pkgconfig" |
457 |
- |
458 |
-BUILDTYPE="${BUILDTYPE:-Release}" |
459 |
- |
460 |
-RESTRICT="test" |
461 |
- |
462 |
-SITEFILE=50${PN}-gentoo.el |
463 |
- |
464 |
-src_unpack() { |
465 |
- unpack $(basename ${MOZC_URL}) |
466 |
- |
467 |
- cd "${S}"/protobuf |
468 |
- unpack $(basename ${PROTOBUF_URL}) |
469 |
- mv protobuf-${PROTOBUF_VER} files || die |
470 |
- |
471 |
- if use test; then |
472 |
- cd "${S}"/third_party |
473 |
- unpack $(basename ${GMOCK_URL}) $(basename ${GTEST_URL}) \ |
474 |
- $(basename ${JSONCPP_URL}) |
475 |
- mv gmock-${GMOCK_VER} gmock || die |
476 |
- mv gtest-${GTEST_VER} gtest || die |
477 |
- mv jsoncpp-src-${JSONCPP_VER} jsoncpp || die |
478 |
- fi |
479 |
-} |
480 |
- |
481 |
-src_prepare() { |
482 |
- epatch "${FILESDIR}"/${P}-drop-Werror.patch |
483 |
- epatch "${FILESDIR}"/${PN}-ibus-1.5.4.patch |
484 |
- epatch_user |
485 |
-} |
486 |
- |
487 |
-src_configure() { |
488 |
- local myconf="--server_dir=/usr/$(get_libdir)/mozc" |
489 |
- |
490 |
- if ! use qt4 ; then |
491 |
- myconf+=" --noqt" |
492 |
- export GYP_DEFINES="use_libzinnia=0" |
493 |
- fi |
494 |
- |
495 |
- if ! use renderer ; then |
496 |
- export GYP_DEFINES="${GYP_DEFINES} enable_gtk_renderer=0" |
497 |
- fi |
498 |
- |
499 |
- # export GYP_DEFINES="${GYP_DEFINES} use_libprotobuf=1" |
500 |
- |
501 |
- "${PYTHON}" build_mozc.py gyp ${myconf} || die "gyp failed" |
502 |
-} |
503 |
- |
504 |
-src_compile() { |
505 |
- tc-export CC CXX AR AS RANLIB LD |
506 |
- |
507 |
- local my_makeopts=$(makeopts_jobs) |
508 |
- # This is for a safety. -j without a number, makeopts_jobs returns 999. |
509 |
- local myjobs=-j${my_makeopts/999/1} |
510 |
- |
511 |
- local mytarget="server/server.gyp:mozc_server" |
512 |
- use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper" |
513 |
- use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc" |
514 |
- use renderer && mytarget="${mytarget} renderer/renderer.gyp:mozc_renderer" |
515 |
- if use qt4 ; then |
516 |
- export QTDIR="${EPREFIX}/usr" |
517 |
- mytarget="${mytarget} gui/gui.gyp:mozc_tool" |
518 |
- fi |
519 |
- |
520 |
- V=1 "${PYTHON}" build_mozc.py build_tools -c "${BUILDTYPE}" ${myjobs} || die |
521 |
- V=1 "${PYTHON}" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} ${myjobs} || die |
522 |
- |
523 |
- if use emacs ; then |
524 |
- elisp-compile unix/emacs/*.el || die |
525 |
- fi |
526 |
-} |
527 |
- |
528 |
-src_test() { |
529 |
- tc-export CC CXX AR AS RANLIB LD |
530 |
- V=1 "${PYTHON}" build_mozc.py runtests -c "${BUILDTYPE}" || die |
531 |
-} |
532 |
- |
533 |
-src_install() { |
534 |
- if use emacs ; then |
535 |
- dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die |
536 |
- elisp-install ${PN} unix/emacs/*.{el,elc} || die |
537 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die |
538 |
- fi |
539 |
- |
540 |
- if use ibus ; then |
541 |
- exeinto /usr/libexec || die |
542 |
- newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die |
543 |
- insinto /usr/share/ibus/component || die |
544 |
- doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die |
545 |
- insinto /usr/share/ibus-mozc || die |
546 |
- ( |
547 |
- cd data/images/unix |
548 |
- newins ime_product_icon_opensource-32.png product_icon.png || die |
549 |
- for f in ui-* |
550 |
- do |
551 |
- newins ${f} ${f/ui-} || die |
552 |
- done |
553 |
- ) |
554 |
- |
555 |
- fi |
556 |
- |
557 |
- exeinto "/usr/$(get_libdir)/mozc" || die |
558 |
- doexe "out_linux/${BUILDTYPE}/mozc_server" || die |
559 |
- |
560 |
- if use qt4 ; then |
561 |
- exeinto "/usr/$(get_libdir)/mozc" || die |
562 |
- doexe "out_linux/${BUILDTYPE}/mozc_tool" || die |
563 |
- fi |
564 |
- |
565 |
- if use renderer ; then |
566 |
- exeinto "/usr/$(get_libdir)/mozc" || die |
567 |
- doexe "out_linux/${BUILDTYPE}/mozc_renderer" || die |
568 |
- fi |
569 |
-} |
570 |
- |
571 |
-pkg_postinst() { |
572 |
- if use emacs ; then |
573 |
- elisp-site-regen |
574 |
- elog "You can use mozc-mode via LEIM (Library of Emacs Input Method)." |
575 |
- elog "Write the following settings into your init file (~/.emacs.d/init.el" |
576 |
- elog "or ~/.emacs) in order to use mozc-mode by default, or you can call" |
577 |
- elog "\`set-input-method' and set \"japanese-mozc\" anytime you have loaded" |
578 |
- elog "mozc.el" |
579 |
- elog |
580 |
- elog " (require 'mozc)" |
581 |
- elog " (set-language-environment \"Japanese\")" |
582 |
- elog " (setq default-input-method \"japanese-mozc\")" |
583 |
- elog |
584 |
- elog "Having the above settings, just type C-\\ which is bound to" |
585 |
- elog "\`toggle-input-method' by default." |
586 |
- fi |
587 |
-} |
588 |
- |
589 |
-pkg_postrm() { |
590 |
- use emacs && elisp-site-regen |
591 |
-} |
592 |
|
593 |
diff --git a/app-i18n/mozc/mozc-1.13.1651.102.ebuild b/app-i18n/mozc/mozc-1.13.1651.102.ebuild |
594 |
deleted file mode 100644 |
595 |
index 6fa63db9ed9..00000000000 |
596 |
--- a/app-i18n/mozc/mozc-1.13.1651.102.ebuild |
597 |
+++ /dev/null |
598 |
@@ -1,181 +0,0 @@ |
599 |
-# Copyright 1999-2017 Gentoo Foundation |
600 |
-# Distributed under the terms of the GNU General Public License v2 |
601 |
- |
602 |
-EAPI="5" |
603 |
-PYTHON_COMPAT=( python2_7 ) |
604 |
-inherit elisp-common eutils multilib multiprocessing python-single-r1 toolchain-funcs |
605 |
- |
606 |
-DESCRIPTION="The Mozc engine for IBus Framework" |
607 |
-HOMEPAGE="https://github.com/google/mozc" |
608 |
- |
609 |
-PROTOBUF_VER="2.5.0" |
610 |
-GMOCK_VER="1.6.0" |
611 |
-GTEST_VER="1.6.0" |
612 |
-JSONCPP_VER="0.6.0-rc2" |
613 |
-GYP_DATE="20140602" |
614 |
-MOZC_URL="https://mozc.googlecode.com/files/${P}.tar.bz2" |
615 |
-PROTOBUF_URL="https://protobuf.googlecode.com/files/protobuf-${PROTOBUF_VER}.tar.bz2" |
616 |
-GMOCK_URL="https://googlemock.googlecode.com/files/gmock-${GMOCK_VER}.zip" |
617 |
-GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip" |
618 |
-JSONCPP_URL="mirror://sourceforge/jsoncpp/jsoncpp-src-${JSONCPP_VER}.tar.gz" |
619 |
-GYP_URL="https://dev.gentoo.org/~naota/files/gyp-${GYP_DATE}.tar.bz2" |
620 |
-SRC_URI="${MOZC_URL} ${PROTOBUF_URL} ${GYP_URL} |
621 |
- test? ( ${GMOCK_URL} ${GTEST_URL} ${JSONCPP_URL} )" |
622 |
- |
623 |
-LICENSE="BSD ipadic public-domain unicode" |
624 |
-SLOT="0" |
625 |
-KEYWORDS="~amd64 ~x86" |
626 |
-IUSE="emacs +ibus +qt4 renderer test" |
627 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
628 |
- |
629 |
-RDEPEND="dev-libs/glib:2 |
630 |
- dev-libs/openssl:0= |
631 |
- >=dev-libs/protobuf-2.5.0 |
632 |
- x11-libs/libxcb |
633 |
- emacs? ( virtual/emacs ) |
634 |
- ibus? ( >=app-i18n/ibus-1.4.1 ) |
635 |
- renderer? ( x11-libs/gtk+:2 ) |
636 |
- qt4? ( |
637 |
- dev-qt/qtgui:4 |
638 |
- app-i18n/zinnia |
639 |
- ) |
640 |
- ${PYTHON_DEPS}" |
641 |
-DEPEND="${RDEPEND} |
642 |
- virtual/pkgconfig" |
643 |
- |
644 |
-BUILDTYPE="${BUILDTYPE:-Release}" |
645 |
- |
646 |
-RESTRICT="test" |
647 |
- |
648 |
-SITEFILE=50${PN}-gentoo.el |
649 |
- |
650 |
-src_unpack() { |
651 |
- unpack $(basename ${MOZC_URL}) |
652 |
- |
653 |
- unpack $(basename ${GYP_URL}) |
654 |
- mv gyp-${GYP_DATE}/* "${S}"/third_party/gyp || die |
655 |
- |
656 |
- cd "${S}"/protobuf |
657 |
- unpack $(basename ${PROTOBUF_URL}) |
658 |
- mv protobuf-${PROTOBUF_VER} files || die |
659 |
- |
660 |
- if use test; then |
661 |
- cd "${S}"/third_party |
662 |
- unpack $(basename ${GMOCK_URL}) $(basename ${GTEST_URL}) \ |
663 |
- $(basename ${JSONCPP_URL}) |
664 |
- mv gmock-${GMOCK_VER} gmock || die |
665 |
- mv gtest-${GTEST_VER} gtest || die |
666 |
- mv jsoncpp-src-${JSONCPP_VER} jsoncpp || die |
667 |
- fi |
668 |
-} |
669 |
- |
670 |
-src_prepare() { |
671 |
- epatch "${FILESDIR}"/${P}-gtk-renderer.patch |
672 |
- epatch_user |
673 |
-} |
674 |
- |
675 |
-src_configure() { |
676 |
- local myconf="--server_dir=/usr/$(get_libdir)/mozc" |
677 |
- |
678 |
- if ! use qt4 ; then |
679 |
- myconf+=" --noqt" |
680 |
- export GYP_DEFINES="use_libzinnia=0" |
681 |
- fi |
682 |
- |
683 |
- if ! use renderer ; then |
684 |
- export GYP_DEFINES="${GYP_DEFINES} enable_gtk_renderer=0" |
685 |
- fi |
686 |
- |
687 |
- export GYP_DEFINES="${GYP_DEFINES} use_libprotobuf=1" |
688 |
- |
689 |
- "${PYTHON}" build_mozc.py gyp ${myconf} || die "gyp failed" |
690 |
-} |
691 |
- |
692 |
-src_compile() { |
693 |
- tc-export CC CXX AR AS RANLIB LD |
694 |
- |
695 |
- local my_makeopts=$(makeopts_jobs) |
696 |
- # This is for a safety. -j without a number, makeopts_jobs returns 999. |
697 |
- local myjobs=-j${my_makeopts/999/1} |
698 |
- |
699 |
- local mytarget="server/server.gyp:mozc_server" |
700 |
- use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper" |
701 |
- use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc" |
702 |
- use renderer && mytarget="${mytarget} renderer/renderer.gyp:mozc_renderer" |
703 |
- if use qt4 ; then |
704 |
- export QTDIR="${EPREFIX}/usr" |
705 |
- mytarget="${mytarget} gui/gui.gyp:mozc_tool" |
706 |
- fi |
707 |
- |
708 |
- V=1 "${PYTHON}" build_mozc.py build_tools -c "${BUILDTYPE}" ${myjobs} || die |
709 |
- V=1 "${PYTHON}" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} ${myjobs} || die |
710 |
- |
711 |
- if use emacs ; then |
712 |
- elisp-compile unix/emacs/*.el || die |
713 |
- fi |
714 |
-} |
715 |
- |
716 |
-src_test() { |
717 |
- tc-export CC CXX AR AS RANLIB LD |
718 |
- V=1 "${PYTHON}" build_mozc.py runtests -c "${BUILDTYPE}" || die |
719 |
-} |
720 |
- |
721 |
-src_install() { |
722 |
- if use emacs ; then |
723 |
- dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die |
724 |
- elisp-install ${PN} unix/emacs/*.{el,elc} || die |
725 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die |
726 |
- fi |
727 |
- |
728 |
- if use ibus ; then |
729 |
- exeinto /usr/$(get_libdir)/ibus-mozc || die |
730 |
- newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die |
731 |
- insinto /usr/share/ibus/component || die |
732 |
- doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die |
733 |
- insinto /usr/share/ibus-mozc || die |
734 |
- ( |
735 |
- cd data/images/unix |
736 |
- newins ime_product_icon_opensource-32.png product_icon.png || die |
737 |
- for f in ui-* |
738 |
- do |
739 |
- newins ${f} ${f/ui-} || die |
740 |
- done |
741 |
- ) |
742 |
- |
743 |
- fi |
744 |
- |
745 |
- exeinto "/usr/$(get_libdir)/mozc" || die |
746 |
- doexe "out_linux/${BUILDTYPE}/mozc_server" || die |
747 |
- |
748 |
- if use qt4 ; then |
749 |
- exeinto "/usr/$(get_libdir)/mozc" || die |
750 |
- doexe "out_linux/${BUILDTYPE}/mozc_tool" || die |
751 |
- fi |
752 |
- |
753 |
- if use renderer ; then |
754 |
- exeinto "/usr/$(get_libdir)/mozc" || die |
755 |
- doexe "out_linux/${BUILDTYPE}/mozc_renderer" || die |
756 |
- fi |
757 |
-} |
758 |
- |
759 |
-pkg_postinst() { |
760 |
- if use emacs ; then |
761 |
- elisp-site-regen |
762 |
- elog "You can use mozc-mode via LEIM (Library of Emacs Input Method)." |
763 |
- elog "Write the following settings into your init file (~/.emacs.d/init.el" |
764 |
- elog "or ~/.emacs) in order to use mozc-mode by default, or you can call" |
765 |
- elog "\`set-input-method' and set \"japanese-mozc\" anytime you have loaded" |
766 |
- elog "mozc.el" |
767 |
- elog |
768 |
- elog " (require 'mozc)" |
769 |
- elog " (set-language-environment \"Japanese\")" |
770 |
- elog " (setq default-input-method \"japanese-mozc\")" |
771 |
- elog |
772 |
- elog "Having the above settings, just type C-\\ which is bound to" |
773 |
- elog "\`toggle-input-method' by default." |
774 |
- fi |
775 |
-} |
776 |
- |
777 |
-pkg_postrm() { |
778 |
- use emacs && elisp-site-regen |
779 |
-} |
780 |
|
781 |
diff --git a/app-i18n/mozc/mozc-2.16.2037.102.ebuild b/app-i18n/mozc/mozc-2.16.2037.102.ebuild |
782 |
deleted file mode 100644 |
783 |
index cb43400250d..00000000000 |
784 |
--- a/app-i18n/mozc/mozc-2.16.2037.102.ebuild |
785 |
+++ /dev/null |
786 |
@@ -1,230 +0,0 @@ |
787 |
-# Copyright 1999-2017 Gentoo Foundation |
788 |
-# Distributed under the terms of the GNU General Public License v2 |
789 |
- |
790 |
-EAPI="5" |
791 |
-PYTHON_COMPAT=( python2_7 ) |
792 |
-PLOCALES="de ja zh_CN zh_TW" |
793 |
-inherit elisp-common eutils l10n multilib multiprocessing python-single-r1 toolchain-funcs |
794 |
- |
795 |
-DESCRIPTION="The Mozc engine for IBus Framework" |
796 |
-HOMEPAGE="https://github.com/google/mozc" |
797 |
- |
798 |
-PROTOBUF_VER="2.5.0" |
799 |
-GMOCK_VER="1.6.0" |
800 |
-GTEST_VER="1.6.0" |
801 |
-JSONCPP_VER="0.6.0-rc2" |
802 |
-GYP_DATE="20140602" |
803 |
-JAPANESE_USAGE_DICT_VER="10" |
804 |
-FCITX_PATCH_VER="2" |
805 |
-FCITX_PATCH="fcitx-mozc-${PV}.${FCITX_PATCH_VER}.patch" |
806 |
-MOZC_URL="https://dev.gentoo.org/~naota/files/${P}.tar.bz2" |
807 |
-PROTOBUF_URL="https://protobuf.googlecode.com/files/protobuf-${PROTOBUF_VER}.tar.bz2" |
808 |
-GMOCK_URL="https://googlemock.googlecode.com/files/gmock-${GMOCK_VER}.zip" |
809 |
-GTEST_URL="https://googletest.googlecode.com/files/gtest-${GTEST_VER}.zip" |
810 |
-JSONCPP_URL="mirror://sourceforge/jsoncpp/jsoncpp-src-${JSONCPP_VER}.tar.gz" |
811 |
-GYP_URL="https://dev.gentoo.org/~naota/files/gyp-${GYP_DATE}.tar.bz2" |
812 |
-JAPANESE_USAGE_DICT_URL="https://dev.gentoo.org/~naota/files/japanese-usage-dictionary-${JAPANESE_USAGE_DICT_VER}.tar.bz2" |
813 |
-FCITX_PATCH_URL="http://download.fcitx-im.org/fcitx-mozc/${FCITX_PATCH}" |
814 |
-SRC_URI="${MOZC_URL} ${PROTOBUF_URL} ${GYP_URL} ${JAPANESE_USAGE_DICT_URL} |
815 |
- fcitx? ( ${FCITX_PATCH_URL} ) |
816 |
- test? ( ${GMOCK_URL} ${GTEST_URL} ${JSONCPP_URL} )" |
817 |
- |
818 |
-LICENSE="BSD ipadic public-domain unicode" |
819 |
-SLOT="0" |
820 |
-KEYWORDS="~amd64 ~x86" |
821 |
-IUSE="emacs fcitx +ibus +qt4 renderer test" |
822 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
823 |
- |
824 |
-RDEPEND="app-i18n/tegaki-zinnia-japanese |
825 |
- dev-libs/glib:2 |
826 |
- >=dev-libs/protobuf-2.5.0 |
827 |
- x11-libs/libxcb |
828 |
- emacs? ( virtual/emacs ) |
829 |
- fcitx? ( app-i18n/fcitx ) |
830 |
- ibus? ( |
831 |
- >=app-i18n/ibus-1.4.1 |
832 |
- qt4? ( app-i18n/ibus-qt ) |
833 |
- ) |
834 |
- renderer? ( x11-libs/gtk+:2 ) |
835 |
- qt4? ( |
836 |
- dev-qt/qtgui:4 |
837 |
- app-i18n/zinnia |
838 |
- ) |
839 |
- ${PYTHON_DEPS}" |
840 |
-DEPEND="${RDEPEND} |
841 |
- dev-util/ninja |
842 |
- virtual/pkgconfig" |
843 |
- |
844 |
-BUILDTYPE="${BUILDTYPE:-Release}" |
845 |
- |
846 |
-RESTRICT="test" |
847 |
- |
848 |
-SITEFILE=50${PN}-gentoo.el |
849 |
- |
850 |
-src_unpack() { |
851 |
- unpack $(basename ${MOZC_URL}) |
852 |
- |
853 |
- unpack $(basename ${GYP_URL}) |
854 |
- unpack $(basename ${JAPANESE_USAGE_DICT_URL}) |
855 |
- mv gyp-${GYP_DATE} "${S}"/third_party/gyp || die |
856 |
- mv japanese-usage-dictionary-${JAPANESE_USAGE_DICT_VER} "${S}"/third_party/japanese_usage_dictionary || die |
857 |
- |
858 |
- cd "${S}"/protobuf |
859 |
- unpack $(basename ${PROTOBUF_URL}) |
860 |
- mv protobuf-${PROTOBUF_VER} files || die |
861 |
- |
862 |
- if use test; then |
863 |
- cd "${S}"/third_party |
864 |
- unpack $(basename ${GMOCK_URL}) $(basename ${GTEST_URL}) \ |
865 |
- $(basename ${JSONCPP_URL}) |
866 |
- mv gmock-${GMOCK_VER} gmock || die |
867 |
- mv gtest-${GTEST_VER} gtest || die |
868 |
- mv jsoncpp-src-${JSONCPP_VER} jsoncpp || die |
869 |
- fi |
870 |
-} |
871 |
- |
872 |
-src_prepare() { |
873 |
- # verbose build |
874 |
- sed -i -e "/RunOrDie(\[make_command\]/s/build_args/build_args + [\"-v\"]/" \ |
875 |
- build_mozc.py || die |
876 |
- sed -i -e "s/<!(which clang)/$(tc-getCC)/" \ |
877 |
- -e "s/<!(which clang++)/$(tc-getCXX)/" \ |
878 |
- gyp/common.gypi || die |
879 |
- if use fcitx; then |
880 |
- EPATCH_OPTS="-p2" epatch "${DISTDIR}/${FCITX_PATCH}" |
881 |
- fi |
882 |
- epatch_user |
883 |
-} |
884 |
- |
885 |
-src_configure() { |
886 |
- local myconf="--server_dir=/usr/$(get_libdir)/mozc" |
887 |
- |
888 |
- if ! use qt4 ; then |
889 |
- myconf+=" --noqt" |
890 |
- export GYP_DEFINES="use_libzinnia=0" |
891 |
- fi |
892 |
- |
893 |
- if ! use renderer ; then |
894 |
- export GYP_DEFINES="${GYP_DEFINES} enable_gtk_renderer=0" |
895 |
- fi |
896 |
- |
897 |
- export GYP_DEFINES="${GYP_DEFINES} use_libprotobuf=1 compiler_target=gcc compiler_host=gcc" |
898 |
- |
899 |
- tc-export CC CXX AR AS RANLIB LD NM |
900 |
- |
901 |
- "${PYTHON}" build_mozc.py gyp -v ${myconf} || die "gyp failed" |
902 |
-} |
903 |
- |
904 |
-src_compile() { |
905 |
- tc-export CC CXX AR AS RANLIB LD |
906 |
- |
907 |
- local my_makeopts=$(makeopts_jobs) |
908 |
- # This is for a safety. -j without a number, makeopts_jobs returns 999. |
909 |
- local myjobs=-j${my_makeopts/999/1} |
910 |
- |
911 |
- local mytarget="server/server.gyp:mozc_server" |
912 |
- use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper" |
913 |
- use fcitx && mytarget="${mytarget} unix/fcitx/fcitx.gyp:fcitx-mozc" |
914 |
- use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc" |
915 |
- use renderer && mytarget="${mytarget} renderer/renderer.gyp:mozc_renderer" |
916 |
- if use qt4 ; then |
917 |
- export QTDIR="${EPREFIX}/usr" |
918 |
- mytarget="${mytarget} gui/gui.gyp:mozc_tool" |
919 |
- fi |
920 |
- |
921 |
- # V=1 "${PYTHON}" build_mozc.py build_tools -c "${BUILDTYPE}" ${myjobs} || die |
922 |
- "${PYTHON}" build_mozc.py build -v -c "${BUILDTYPE}" ${mytarget} ${myjobs} || die |
923 |
- |
924 |
- if use emacs ; then |
925 |
- elisp-compile unix/emacs/*.el || die |
926 |
- fi |
927 |
-} |
928 |
- |
929 |
-src_test() { |
930 |
- tc-export CC CXX AR AS RANLIB LD |
931 |
- V=1 "${PYTHON}" build_mozc.py runtests -c "${BUILDTYPE}" || die |
932 |
-} |
933 |
-src_install() { |
934 |
- install_fcitx_locale() { |
935 |
- lang=$1 |
936 |
- insinto "/usr/share/locale/${lang}/LC_MESSAGES/" |
937 |
- newins out_linux/${BUILDTYPE}/gen/unix/fcitx/po/${lang}.mo fcitx-mozc.mo |
938 |
- } |
939 |
- |
940 |
- if use emacs ; then |
941 |
- dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die |
942 |
- elisp-install ${PN} unix/emacs/*.{el,elc} || die |
943 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die |
944 |
- fi |
945 |
- |
946 |
- if use fcitx; then |
947 |
- exeinto /usr/$(get_libdir)/fcitx |
948 |
- doexe "out_linux/${BUILDTYPE}/fcitx-mozc.so" |
949 |
- insinto /usr/share/fcitx/addon |
950 |
- doins "unix/fcitx/fcitx-mozc.conf" |
951 |
- insinto /usr/share/fcitx/inputmethod |
952 |
- doins "unix/fcitx/mozc.conf" |
953 |
- insinto /usr/share/fcitx/mozc/icon |
954 |
- ( |
955 |
- cd data/images |
956 |
- newins product_icon_32bpp-128.png mozc.png |
957 |
- cd unix |
958 |
- for f in ui-* ; do |
959 |
- newins ${f} mozc-${f/ui-} |
960 |
- done |
961 |
- ) |
962 |
- l10n_for_each_locale_do install_fcitx_locale |
963 |
- fi |
964 |
- |
965 |
- if use ibus ; then |
966 |
- exeinto /usr/$(get_libdir)/ibus-mozc || die |
967 |
- newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die |
968 |
- insinto /usr/share/ibus/component || die |
969 |
- doins "out_linux/${BUILDTYPE}/gen/unix/ibus/mozc.xml" || die |
970 |
- insinto /usr/share/ibus-mozc || die |
971 |
- ( |
972 |
- cd data/images/unix |
973 |
- newins ime_product_icon_opensource-32.png product_icon.png || die |
974 |
- for f in ui-* |
975 |
- do |
976 |
- newins ${f} ${f/ui-} || die |
977 |
- done |
978 |
- ) |
979 |
- |
980 |
- fi |
981 |
- |
982 |
- exeinto "/usr/$(get_libdir)/mozc" || die |
983 |
- doexe "out_linux/${BUILDTYPE}/mozc_server" || die |
984 |
- |
985 |
- if use qt4 ; then |
986 |
- exeinto "/usr/$(get_libdir)/mozc" || die |
987 |
- doexe "out_linux/${BUILDTYPE}/mozc_tool" || die |
988 |
- fi |
989 |
- |
990 |
- if use renderer ; then |
991 |
- exeinto "/usr/$(get_libdir)/mozc" || die |
992 |
- doexe "out_linux/${BUILDTYPE}/mozc_renderer" || die |
993 |
- fi |
994 |
-} |
995 |
- |
996 |
-pkg_postinst() { |
997 |
- if use emacs ; then |
998 |
- elisp-site-regen |
999 |
- elog "You can use mozc-mode via LEIM (Library of Emacs Input Method)." |
1000 |
- elog "Write the following settings into your init file (~/.emacs.d/init.el" |
1001 |
- elog "or ~/.emacs) in order to use mozc-mode by default, or you can call" |
1002 |
- elog "\`set-input-method' and set \"japanese-mozc\" anytime you have loaded" |
1003 |
- elog "mozc.el" |
1004 |
- elog |
1005 |
- elog " (require 'mozc)" |
1006 |
- elog " (set-language-environment \"Japanese\")" |
1007 |
- elog " (setq default-input-method \"japanese-mozc\")" |
1008 |
- elog |
1009 |
- elog "Having the above settings, just type C-\\ which is bound to" |
1010 |
- elog "\`toggle-input-method' by default." |
1011 |
- fi |
1012 |
-} |
1013 |
- |
1014 |
-pkg_postrm() { |
1015 |
- use emacs && elisp-site-regen |
1016 |
-} |