Apply a patch to set content type method.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

4 files changed, 163 insertions, 20 deletions

diff --git a/app-i18n/ibus-chewing/ChangeLog b/app-i18n/ibus-chewing/ChangeLog
index 6a571727eb01..0e159a7910a0 100644
--- a/app-i18n/ibus-chewing/ChangeLog
+++ b/app-i18n/ibus-chewing/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/ibus-chewing
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ChangeLog,v 1.34 2012/12/22 10:11:06 naota Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ChangeLog,v 1.35 2013/12/30 08:17:38 naota Exp $
+
+*ibus-chewing-1.4.3-r1 (30 Dec 2013)
+
+  30 Dec 2013; Naohiro Aota <naota@gentoo.org>
+  +files/ibus-chewing-1.4.3-content-type.patch, +ibus-chewing-1.4.3-r1.ebuild,
+  -ibus-chewing-1.4.3.ebuild:
+  Apply a patch to set content type method.
 
 *ibus-chewing-1.4.3 (22 Dec 2012)
 
diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
index 9783624c5c33..93f54daa32f8 100644
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX ibus-chewing-1.3.10-cflags.patch 510 SHA256 bfb9ba81ebabcc4b77a46ec80bf9217d6ad4e863a77d7edcd336b8780cb8cafd SHA512 9629c8af9f6dded4230d363f13bc405b646a5e0dd51b0e266629cbb47a997b46e0c88cc99875c4c89122cbf6d0ee3946c048dd2193127218e91fab97fa87b73b WHIRLPOOL 70ab424683508cb4c5e61938ad71f85b4c75e855dc8f4df20264796d91fcc671c1429733148e19fbaf49d03486dcf868a1a3b8320cd540ee4d757012c5452642
 AUX ibus-chewing-1.3.10-fix_save_setting.patch 777 SHA256 f7ff35f3a2b390f69758754edaf66c69644c98cea115903f1a2dd04e9b515f4c SHA512 672baba7b3efe8b330b8a02617e6b8512afdf015947b66828a6ef431f44219d1e09eb68f2fbbde82195a8f18d09ff4a03af15d5e517459aa55b774c820c1901e WHIRLPOOL f0bab8703a2473628c0b62ea30886476a50d3463c7f19eea8b4e72897966d86f265efb7bff1b30b56e84f64a71dd0aafc6253b554b4ec95a5a67449bf5af4f3d
 AUX ibus-chewing-1.3.10-ibus-1.4.patch 1987 SHA256 6f3dbc5e992b8466e22face485ead8716106c64cce9328374a7415fa1ad935d4 SHA512 4314582853e57c1b43b049d78730f4fd16d30afc165beef5b3c277668910a70a2bc2b28b126ed20da40b77e9232aebc0fc56550f40f6b13a85e1c939f622e607 WHIRLPOOL 13f796665a1982416998e1de184f529ca5a4b0260448a9c2a375d557b289f640cf4a459664da1ae46602bd6946d7a173d5e72f056bfb931cddc5b7394bc9c842
+AUX ibus-chewing-1.4.3-content-type.patch 5383 SHA256 cad9ecce75164bd0bbc9aa8c22926cbe3ddf1f9e83715c53005967ae90cd6e8c SHA512 a03b44003e092f870ce3c5bcdd86e074f8ef0c537df63a36d13dc72962751859d2f8d9f0a99bc0dfeaa010be990b54bdca5b38d8efa04fdc2081986f8eeb0fbf WHIRLPOOL 6b47346865b81c852c8da9915b1b703249e6697aa91fd2f680c4f146d8180abb12da03aa4881c913d7f81ec663719449c5016a055ce1846bda313988110bd4d2
 DIST cmake-fedora-modules-only-latest.tar.gz 26660 SHA256 019b1d6727430e305996eb042410be83af9c780bcaf197501b16aca42ee68643 SHA512 cfde79db21ae7bc95b6437d227c243859b26f2dd1e7e8ad665a56d88d2dc0256d40a32309be982d72769413d51087f8547df15eeeb1170e09f4785dc3560c5eb WHIRLPOOL cac6892e322b218bf35820aa1782d966a0080addbd148da193e749284514b1a8b79c94136efa6ce06d96fe1fd823afe52c0aaadaf874645bb78a65612452376c
 DIST ibus-chewing-1.3.10-Source.tar.gz 75365 SHA256 171402a7d6d141d485454493e097746d73da7cef172d2ab5ec1a2c593a2ee1c8 SHA512 d9c326ef12a6e22cbfff5be1a0dd810e5c4be7ba426914ec832d50c9c2b54865fef020a3b81acad8d3a5d833365d78e4e7c53a751d4290214ae77280ba47737d WHIRLPOOL a2e35a3bd45b10ac3f09c46d4581e1c8f9450238651957c789fddd3c505b24b91806601593970db8da8b8553eb3cd673301d460b20f3a72902445a194f1ad714
 DIST ibus-chewing-1.4.2-Source.tar.gz 84351 SHA256 857f479ebd85ecc217550573f80e1bff91b6e9bca4d1c9189f790fa6a9e3f75f SHA512 7502abb553958bd6ea5a9bb8a9c600ee84f694aa2ff7d2c2733b74de088196f157f6023f26fe5307e3bec9dbb2c62cc46037355e2db9d90edb55feb89cb61d3c WHIRLPOOL dd90bb049d1d39c4bbc8f23fce5dbde2e923abc686715ea3ccd87fa6d8b57105c8b6d1dc0da89eb6ff48224386ce4a2bbdd0a53a4f1641bd04dc360b60fa6493
@@ -11,23 +12,23 @@ DIST ibus-chewing-1.4.3-Source.tar.gz 84023 SHA256 3780fa780e8288934b35e4c321429
 EBUILD ibus-chewing-1.3.10-r1.ebuild 1148 SHA256 94d513aa5a3fb21ee96cd76e166fe135311184a2a6186cb61c32cd216acca201 SHA512 5ea5e783054a58a86f79177cb014fc239445e97043d56cd771de4380d538ee4a9c077b2af3931a48c4bb8b71ab2e920d4e666cc1854bd20dd359b4aef4ea79ea WHIRLPOOL fcdf29e0072e2aa34609cf5e7b1e59ed42184264f2c82d286f955ef06e0ec99b1615772ec433dcfc920d32c6ef273049c9c11b4b58fb8ca3240d8945592b61bc
 EBUILD ibus-chewing-1.3.10.ebuild 1083 SHA256 e73058b2a11a72630142e4ee1f59ec019106c95e2bec43f22f50f2e8e4e06fec SHA512 26afa2f9591246e10558929b3fbd02cccb69ecb3682d02b612272873eb7c7eb9ed0ea4460fa0d0074b081c7178988fdf843df53754dd33d0b6c7bcde7f802c6f WHIRLPOOL 2e376a4454ec26fc17f5e9ed182a21e06063d6248abab668be132fadaa5e2537fe385e06dc62b2b4e13f3470d630f0cd99ac5eaf6bdc310bf5226553af7809fd
 EBUILD ibus-chewing-1.4.2.ebuild 929 SHA256 7679047a70876c8facdc427a25be85402632d5dbab79820b3bfd68c95999d205 SHA512 467a1ee3593fd473256de9cf7c03761bbdb8a488169d540c07a847d5f9024c89687e39abbc724ebb69b07b767d7bc6a376ed38e703ad439bd260de6e5c081a36 WHIRLPOOL 581c1df8b25c518436c9673c92fcc4c4faa926a825ec49bb0f5875bbcc070907632059409e8ba1fdc20c7b1275015b08784e1fdcde235ea8b9bb1d85e91378ae
-EBUILD ibus-chewing-1.4.3.ebuild 929 SHA256 bd19521e5295d8438db8372ca8b686741de08415c9d74e6788a523fedbef677c SHA512 23cc4ce710e02f0b0096b9c4851ad9826140dcd1ae93a7fa25e11706630e2028b3da968f29277321f424c83d6f641b6a47b311e54e11851c5d60ec23f3939d7a WHIRLPOOL 0934cce28e2456d45a324a8088264cd12b5db537d01ebdeb39a4a38505ac82ccea1c35f21421d87468688aee6c5fcc02deb0e2e19058fffc90b645dca7abe7fa
-MISC ChangeLog 6852 SHA256 279b69c2e1d1f6e6052c7498498266812443520dccbfade79d250380cb34aade SHA512 3bf26af6ede45c6d3a19bf940484a21b8bd82fdad737ae152d390ff96be62eb604a7cabfdfa109f43a6ed1597f10721921214d7beb62cffdf567540e088d71ad WHIRLPOOL 0fcb59d671bd59d47f408ecd2eba2f572887bccddbc822f94c9c85eba0a86878bd5cbaf8a9fd50eb0a97d7545e144a072956a2da31ab6379bee02f6dc2f6b825
+EBUILD ibus-chewing-1.4.3-r1.ebuild 971 SHA256 a3513e6a081e15efdfeed63c35227b6c6ad6ee97b821e2a7ff2f48cd1ed27044 SHA512 e589715f2f476b5149156deb75bc68f847a47e0d81733c16858abb5f9a73cdd12e57f44a2335d9c021f52c2bfcf02a0d3c0cb3e9887a0a860f79e52e25117397 WHIRLPOOL 336ca0d22ade5b5847be4919c43025aef4ca694c69376d75dc20e56fa4ca85d8327ba1f01161ffd83d352dde9b49ab7fcf349003f41b0feb240dacd8defd3896
+MISC ChangeLog 7091 SHA256 3fd469137e3921836d39c8f188b0a4efc0d6114a3bf0b97f19f6231f32f2def7 SHA512 df48382a04406f14f53f2ebc90ba872fa9aa82da5e9914c33717cdfc5897a7a9cb51c16eea44b1e54bd31dfcdecee6f7394c0f370c60c5e9b26b0e31f75ba7b2 WHIRLPOOL 7f8ae0fb03cedecb0e616e7c47262d5ce685e0f900c341455243a0558398efdedf5f839c3b7e06a665eb495523b370096a3c91a3dc01cafe8f09020c7fc8eb93
 MISC metadata.xml 365 SHA256 efdc1b5b8f64d574b1d9252aae1005a17c3fcffc10b09fa0049fcb19092879c3 SHA512 0b221466ea54ae15f11aa9b486f129abdf9fb0ec3db859c49ca99bd2b702230c55875cca266783c27029887a10393bce1109a4a987965345fb8be33dbac7df2d WHIRLPOOL 91dc05d8a2361aeea8a9a0013e72c7144061a12b4aef3d19c108905436f051006c0e1439e15a6b2fd0a86df5593e533940568ae54c10f8cf7ad75544666aee28
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ1YdoAAoJEDYO1FT4VRUUScwQAKC2J03rvj2Pq/5sh65qfSxy
-WcG839z73hfcdlOXiwQt+XryN2OkRS/GEMqZ8VxSnUdjIleG2Z9tMIHlLFzW0ytD
-4UOXisObHj9JtikVRJju1G7VwT4N8CrmTbNlwt7WPxdhlOnYCB+03luggaEo4gnl
-vJFZtIqBlG+JbWNKJRkrwTDB5Rr/h84Zn06OFj9c2uQR9jrBlI1x45Di2T45l7SE
-nN1/qI1uhpM/HO+R4b4D2EqLfFDpc24vgmdSjlTar5XxPWZoq/zbbpxO2/Adr/Qu
-nJUJTgUW+bkXzHshjDL1E7pq4IEO1JNbe+eV5o9x3Fcrz98Hkm2F7KlrdvTAZMiy
-LDSjnTA+zQVpuLHxyF4BcJrZEDOjoAsQQqQRovUpspoaZjJ6A4U3dNDs3CbcRXcR
-VGehPv4LfTOZZFAXlf0+H/PvP4oVBvVQU+0xwVsEYZHbhj7kY/zwk1u3o0VAJffu
-3JncqAZArkEbvR9NLG3XZaXeR+dpfLc6tqClvvlzevV5BfQpSXb5kHk2DQtgPU6M
-fnBtAT5vbKCPWb3HPxldHTJKX7PHf64+U91euewN7lxEP01XExAqJElMSTsbP5zA
-WbwxhLiaOyzNyO5Ptf8xCrvTgwHAuobwveBJ2xl9JtyMvfRk5dLV4o715IabZgqT
-miAY0J5bJ6fjAZ4W9vuU
-=v75p
+iQIcBAEBCAAGBQJSwSwkAAoJEDYO1FT4VRUUsrwP/3QXPVgVfJU6PmjsQb29efc7
+Vue0hhH82Vg0Q5saTchOhMnpp3lSRFPgPdJgerPk1pZes5Bt8O7f4qkGw5H3iiXD
+aISJwrO5ywL/EjYYi5fHuA5gZx1llyyN8y0JzALHfEkeVgnJTmWGjK5Mi71jJk85
+KhGXFFtppQZozFLAtk62wA9uHxqmgb6rA8IHTRAMTIJdRPFf5uqxoVlhNnTBnHuO
+ZH0zRPvWAVYf7SYBdpWZFZynGGHoB5YQPxsMd9NdCrdJhTV9i1uUBGjtPVB+EfqZ
+5RHuyXlHqGFCwEaL0i6H7G5o+/b3GYTZSku2mCanpNlOY1Hs1DFk0fjO5iZyt8na
+ldjZRD77/rs3Qe0GTPHyAnB7fyL0NErlk9u7VhPXiw/vn6UKMvYSGCnAnPWfDzyC
+5kzqAxo4Qvn1Fg5sxDx/tABG8kWe+R0uB1mL1gb6238VSyZ/RqIH1X3ySCUUp/Gl
+NbPMKhsWKqHD11I1YRIEfMgb4dLuTuLA+3b21IelLnKMlRbtT6xSrX/jJMb417c7
+0VYLEy6cO3TpPcNdPTptE8IZHw+soKS/Pooh23ZIvsrQWNwNDoMGCudzV3u2nsO9
+g3pBxjXGPcTeEgCc8vni8s+nA3CAWWgQgubXSesJlJnK0HOLFt656Hq8WNhGX26M
+WEC5iQ3sBYKfbAEpa4zp
+=C/Ek
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-1.4.3-content-type.patch b/app-i18n/ibus-chewing/files/ibus-chewing-1.4.3-content-type.patch
new file mode 100644
index 000000000000..203728ad5abd
--- /dev/null
+++ b/app-i18n/ibus-chewing/files/ibus-chewing-1.4.3-content-type.patch
@@ -0,0 +1,134 @@
+From eea7a170ba329a825644956ac390bb63c1a4e667 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?=
+ <czchen@gmail.com>
+Date: Sun, 15 Dec 2013 12:22:05 +0800
+Subject: [PATCH] Skip key event when input purpose is password
+
+---
+ src/IBusChewingEngine-input-events.c | 16 ++++++++++++++++
+ src/IBusChewingEngine.gob            | 15 +++++++++++++++
+ 2 files changed, 31 insertions(+)
+
+diff --git a/src/IBusChewingEngine-input-events.c b/src/IBusChewingEngine-input-events.c
+index 974cf75..ef78c4c 100644
+--- a/src/IBusChewingEngine-input-events.c
++++ b/src/IBusChewingEngine-input-events.c
+@@ -29,6 +29,7 @@ gboolean ibus_chewing_engine_process_key_event(IBusEngine *engine,
+     gboolean result=TRUE;
+ 
+     IBusChewingEngine *self=IBUS_CHEWING_ENGINE(engine);
++    if (ibus_chewing_engine_is_password(self)) return FALSE;
+     guint kSym=ibus_chewing_engine_keycode_to_keysym(self,keysym, keycode, modifiers);
+ 
+     if (modifiers & IBUS_RELEASE_MASK){
+@@ -282,6 +283,7 @@ void ibus_chewing_engine_handle_Default(IBusChewingEngine *self, guint keyval, g
+ void ibus_chewing_engine_candidate_clicked(IBusEngine *engine, guint index, guint button, guint state){
+     G_DEBUG_MSG(2,"***[I2] candidate_clicked(-, %u, %u, %u) ... proceed.", index, button, state);
+     IBusChewingEngine *self=IBUS_CHEWING_ENGINE(engine);
++    if (ibus_chewing_engine_is_password(self)) return;
+     if (index >= chewing_get_candPerPage(self->context) || index <0) {
+ 	G_DEBUG_MSG(3,"[I3]  candidate_clicked() index out of ranged");
+ 	return;
+@@ -329,3 +331,17 @@ void ibus_chewing_engine_property_activate(IBusEngine *engine, const gchar  *pro
+     if (needRefresh)
+ 	self_refresh_property(self,prop_name);
+ }
++
++#if IBUS_CHECK_VERSION(1, 5, 4)
++void ibus_chewing_engine_set_content_type(IBusEngine *engine, guint purpose, guint hints){
++    G_DEBUG_MSG(5,"[I5] set_content_type(%d, %d)", purpose, hints);
++
++    Self *self=SELF(engine);
++    if (purpose == IBUS_INPUT_PURPOSE_PASSWORD ||
++	purpose == IBUS_INPUT_PURPOSE_PIN) {
++	ibus_chewing_engine_set_status_flag(self, ENGINE_STATUS_IS_PASSWORD);
++    } else {
++	ibus_chewing_engine_clear_status_flag(self, ENGINE_STATUS_IS_PASSWORD);
++    }
++}
++#endif
+diff --git a/src/IBusChewingEngine.gob b/src/IBusChewingEngine.gob
+index 8bb742a..68986ad 100644
+--- a/src/IBusChewingEngine.gob
++++ b/src/IBusChewingEngine.gob
+@@ -110,6 +110,7 @@ enum CHEWING_FLAG{
+  * @SHOW_CANDIDATE:     Whether the candidate selection should be shown. Important for Plain Zhuyin.
+  * @NEED_COMMIT:        There's Something to commit.
+  * @FORCE_COMMIT:       The engine should commit
++ * @IS_PASSWORD:        Current input is password.
+  *
+  * Engine status show the current states of engine,
+  * Thus this will change quite often.
+@@ -124,6 +125,7 @@ enum ENGINE_STATUS{
+     SHOW_CANDIDATE=		0x8,
+     NEED_COMMIT=		0x10,
+     FORCE_COMMIT=		0x20,
++    IS_PASSWORD=		0x40,
+ } Engine:Status;
+ 
+ %h{
+@@ -152,6 +154,7 @@ void ibus_chewing_engine_handle_Default(IBusChewingEngine *self, guint keyval, g
+ gboolean ibus_chewing_engine_process_key_event(IBusEngine *engine, guint keysym,  guint keycode, guint modifiers);
+ void ibus_chewing_engine_candidate_clicked(IBusEngine *engine, guint index, guint button, guint state);
+ void ibus_chewing_engine_property_activate(IBusEngine *engine, const gchar  *prop_name, guint  prop_state);
++void ibus_chewing_engine_set_content_type(IBusEngine *engine, guint purpose, guint hints);
+ 
+ %}
+ 
+@@ -268,6 +271,9 @@ class IBus:Chewing:Engine from IBus:Engine{
+ 	ibus_engine_class->property_activate= ibus_chewing_engine_property_activate;
+ 	ibus_engine_class->process_key_event = ibus_chewing_engine_process_key_event;
+ 	ibus_engine_class->candidate_clicked = ibus_chewing_engine_candidate_clicked;
++#if IBUS_CHECK_VERSION(1, 5, 4)
++	ibus_engine_class->set_content_type = ibus_chewing_engine_set_content_type;
++#endif
+     }
+ 
+     private  void load_setting(self){
+@@ -633,6 +639,11 @@ class IBus:Chewing:Engine from IBus:Engine{
+ 	}
+     }
+ 
++    protected gboolean is_password(self){
++	G_DEBUG_MSG(5, "[I5] is_password = %d", self->chewingFlags & ENGINE_STATUS_IS_PASSWORD);
++	return !!(self->_priv->statusFlags & ENGINE_STATUS_IS_PASSWORD);
++    }
++
+     /**
+      * refresh_property_list:
+      * @self: this instances.
+@@ -952,6 +963,7 @@ class IBus:Chewing:Engine from IBus:Engine{
+     override (IBus:Engine) void
+     page_up(IBus:Engine *engine){
+ 	Self *self=SELF(engine);
++	if (self_is_password(self)) return;
+ 	chewing_handle_PageUp(self->context);
+ 	self_update(self);
+     }
+@@ -960,6 +972,7 @@ class IBus:Chewing:Engine from IBus:Engine{
+     override (IBus:Engine) void
+     page_down(IBus:Engine *engine){
+ 	Self *self=SELF(engine);
++	if (self_is_password(self)) return;
+ 	chewing_handle_PageDown(self->context);
+ 	self_update(self);
+     }
+@@ -967,6 +980,7 @@ class IBus:Chewing:Engine from IBus:Engine{
+     override (IBus:Engine) void
+     cursor_up(IBus:Engine *engine){
+ 	Self *self=SELF(engine);
++	if (self_is_password(self)) return;
+ 	chewing_handle_Up(self->context);
+ 	self_update(self);
+     }
+@@ -974,6 +988,7 @@ class IBus:Chewing:Engine from IBus:Engine{
+     override (IBus:Engine) void
+     cursor_down(IBus:Engine *engine){
+ 	Self *self=SELF(engine);
++	if (self_is_password(self)) return;
+ 	chewing_handle_Down(self->context);
+ 	self_update(self);
+     }
+-- 
+1.8.5.1
+
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.4.3.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.4.3-r1.ebuild
index d15493c454f1..3e54315b10db 100644
--- a/app-i18n/ibus-chewing/ibus-chewing-1.4.3.ebuild
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ibus-chewing-1.4.3.ebuild,v 1.1 2012/12/22 10:11:06 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ibus-chewing-1.4.3-r1.ebuild,v 1.1 2013/12/30 08:17:38 naota Exp $
 
 EAPI=4
 inherit cmake-utils
@@ -30,6 +30,7 @@ CMAKE_IN_SOURCE_BUILD=1
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.10-cflags.patch
+	"${FILESDIR}"/${P}-content-type.patch
 	)
 
 DOCS="AUTHORS ChangeLog ChangeLog.prev README RELEASE-NOTES.txt USER-GUIDE"