diff options
author | Michael Palimaka <kensington@gentoo.org> | 2015-04-05 15:49:41 +0000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2015-04-05 15:49:41 +0000 |
commit | a2b575bae494ce41705d6d9af4d423863d92051f (patch) | |
tree | f7ef8d2d00a5798bfc233f49384576f2676433ff | |
parent | Remove old. (diff) | |
download | historical-a2b575bae494ce41705d6d9af4d423863d92051f.tar.gz historical-a2b575bae494ce41705d6d9af4d423863d92051f.tar.bz2 historical-a2b575bae494ce41705d6d9af4d423863d92051f.zip |
Remove old.
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!
-rw-r--r-- | app-i18n/ibus-chewing/ChangeLog | 13 | ||||
-rw-r--r-- | app-i18n/ibus-chewing/Manifest | 43 | ||||
-rw-r--r-- | app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-cflags.patch | 12 | ||||
-rw-r--r-- | app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-fix_save_setting.patch | 22 | ||||
-rw-r--r-- | app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-ibus-1.4.patch | 53 | ||||
-rw-r--r-- | app-i18n/ibus-chewing/files/ibus-chewing-1.4.3-content-type.patch | 134 | ||||
-rw-r--r-- | app-i18n/ibus-chewing/ibus-chewing-1.3.10-r1.ebuild | 48 | ||||
-rw-r--r-- | app-i18n/ibus-chewing/ibus-chewing-1.3.10.ebuild | 45 | ||||
-rw-r--r-- | app-i18n/ibus-chewing/ibus-chewing-1.4.2.ebuild | 43 | ||||
-rw-r--r-- | app-i18n/ibus-chewing/ibus-chewing-1.4.3-r1.ebuild | 44 |
10 files changed, 27 insertions, 430 deletions
diff --git a/app-i18n/ibus-chewing/ChangeLog b/app-i18n/ibus-chewing/ChangeLog index f6bea5d3d5e8..73104e1d49ba 100644 --- a/app-i18n/ibus-chewing/ChangeLog +++ b/app-i18n/ibus-chewing/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-i18n/ibus-chewing -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ChangeLog,v 1.36 2014/04/08 06:38:22 naota Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-chewing/ChangeLog,v 1.37 2015/04/05 15:49:30 kensington Exp $ + + 05 Apr 2015; Michael Palimaka <kensington@gentoo.org> + -files/ibus-chewing-1.3.10-cflags.patch, + -files/ibus-chewing-1.3.10-fix_save_setting.patch, + -files/ibus-chewing-1.3.10-ibus-1.4.patch, + -files/ibus-chewing-1.4.3-content-type.patch, -ibus-chewing-1.3.10-r1.ebuild, + -ibus-chewing-1.3.10.ebuild, -ibus-chewing-1.4.2.ebuild, + -ibus-chewing-1.4.3-r1.ebuild: + Remove old. *ibus-chewing-1.4.7 (08 Apr 2014) diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest index 9c360b8f21ca..bffbcf4cdab7 100644 --- a/app-i18n/ibus-chewing/Manifest +++ b/app-i18n/ibus-chewing/Manifest @@ -1,36 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- 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 -DIST ibus-chewing-1.4.3-Source.tar.gz 84023 SHA256 3780fa780e8288934b35e4c321429ec6096273ebccff1511d801eb19398098af SHA512 b8aef1e39114bfd2a3440e1d04fa6ef355b30094abd86f696dcb523a39f122e01b0d07805c42cf786da99a614ed277c5c7fcc76eb6b28f308f8cceb81fb754ec WHIRLPOOL 1decbbf42db1b5aa507d340de13d7a64884ef65a8a528ae3789aac04ff353be981fc657ecc2b19832c2a4ba369aeccfc4e1de5644b82439bd386bc8029cef902 DIST ibus-chewing-1.4.7-Source.tar.gz 108078 SHA256 73426b024be52eea0182f6b8c7936482ca2df7754e971e0b7980e504afdf8af2 SHA512 70e9c4950ac846c2f0087200d3b42f845ef8f911962d3f6bf37a3a0054606fa0fc061daa5dac390d022dbd29801fbcae596d2c5126270eb6e9843a9e0af4486e WHIRLPOOL 67b12375adfcc40c9e61e8f69e1bddc8b7c2354e9bdbe4a8fde97c6db3f212ca5b426428e1bf96ede1d5c55f5ffe230a57acd026ef1c0b960ee4cdc692aa35ca -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-r1.ebuild 971 SHA256 a3513e6a081e15efdfeed63c35227b6c6ad6ee97b821e2a7ff2f48cd1ed27044 SHA512 e589715f2f476b5149156deb75bc68f847a47e0d81733c16858abb5f9a73cdd12e57f44a2335d9c021f52c2bfcf02a0d3c0cb3e9887a0a860f79e52e25117397 WHIRLPOOL 336ca0d22ade5b5847be4919c43025aef4ca694c69376d75dc20e56fa4ca85d8327ba1f01161ffd83d352dde9b49ab7fcf349003f41b0feb240dacd8defd3896 EBUILD ibus-chewing-1.4.7.ebuild 917 SHA256 4b4e608ed0c8efbfcdc3643785543eebc6021678990ec223e6bd2cf44e7f1a0f SHA512 a9861eba77b2eec95950eff465d80e9d43a4ed11d03796997e02f9a8c35f375e07ebb2fb152d93cf2fe50a869bf8921fe3d8680bb217a4923fe31efae2f9bbb4 WHIRLPOOL 9ddfd6659f400ce954566e1334671823d646112ac8aea18e3c863c512b58ced22df5f72c1fb9eb004b7b91fb40ff2752115ea5155137168acc8f693007f9c468 -MISC ChangeLog 7217 SHA256 b6aaf192edcb7d56deed65f4e4e2ef6de924318335b76564615e04f1d8026b32 SHA512 a71a93e4d6670c0f93a3e5ec9eb9cc020fcbccd8921a7ce8d8582ab1b525b638bd89d48b368f4cf397953321abbe4489101171f624abb89a273086863992fee5 WHIRLPOOL b5da7b38965c3da41cafae65d666b3870522aa3793de7c3bc9b1c413f4e317888b0eb28bdd03863f2d44f532fc371c2a7431d6f794f1fb36aa035d3da58f9ccb +MISC ChangeLog 7606 SHA256 dfc6066d703440fc36063c42de857438fcba49495e24d66a4ea8ea289185e03d SHA512 da79797491697247a655386a106e485400600ddd7cdf470d6f41a097eacd70dcd6df7307e0785b3aa24159d1d284558ddd178aea99c4c482a31a4b0bd5ce744d WHIRLPOOL b7444fd6c2f2da5fe51b4fd9324d4c19e4906a3b11c37bb635c3c616003e950ec16394767cc1503d9d234060344b6bd5d658861ef55ca5af83356ddafa3d7805 MISC metadata.xml 365 SHA256 efdc1b5b8f64d574b1d9252aae1005a17c3fcffc10b09fa0049fcb19092879c3 SHA512 0b221466ea54ae15f11aa9b486f129abdf9fb0ec3db859c49ca99bd2b702230c55875cca266783c27029887a10393bce1109a4a987965345fb8be33dbac7df2d WHIRLPOOL 91dc05d8a2361aeea8a9a0013e72c7144061a12b4aef3d19c108905436f051006c0e1439e15a6b2fd0a86df5593e533940568ae54c10f8cf7ad75544666aee28 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJTQ5lgAAoJEDYO1FT4VRUUh6QP/3lJEm4RmBW5gCYWfPHIeEN3 -pUEujgdrDdSE/A03wtnPMz7yjvy4kv8qp7JHOgTXXPbTGpdX0W5E+f4qw6+J+kml -Zm6n7f0OO8xFHc7cxnjr91qMYeE3aJS8Om18y2kn6IsSkP0NE6HVVBfkpzAU7xfD -YI9fqbugXfMmAXU0x7FkSSAlMXhjdzhT9HP9GjWiNIdFIZsm71scMM5IJAQYUJ40 -ktfuKVo5KGq4I8ca7bcYzZxgKSSBp1qTWMwoZgcPFpfj02/8MreeXdbDcgu+6Pym -eDb2NA4BoDXf/PSgldyRD15JdKI0nJHXaA+eXwskVckiYsOr9/NWb0sW1etQzbzN -qAPFOlBIuycPvRA1uKRiNi6BfkmCEjQQiI4wbMCJyyyZhw8t/0ZIU2dYyxq1254B -kpWF/BzOmOeSg4HInuV5bS3cuZkWJJh//4RxQhaSAIBc/Z3dfDLOkn54FCLEs7aK -6PQp2L6cVokNdjTzMU0NiaTsqCgQmlSUM9FG23RzGrFxMqWsyPIa8ibaVWXW6ySO -SwUjdN/aFqwiHiSGgIkZm1P9myKfgI4MpYiST8p655K5sty6CR+fBpGTGjRzRQZJ -+E/YFNBusdD3vAb723mRW6aqZHaVVb7/r09Wou43IweOy82RZOwHc+eoPGmDe7D/ -QjusocLzl5+5ZcH5hGj6 -=o/sV +iQJiBAEBCABMBQJVIVmIRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 +MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh +7DYOEACKz0LiB6OZDIq5EcnWVspqI9YREq6PU3XkeWnVhFW4SKewhK30KfeEnqlQ +NxNsOAhyZWWMST6RAPXfGpCn15OV+12nEmFFM7ejDQ5bYfEkbpB6doC7iQn5XguW +UlC6aPe74c5ixtHgcwodJ669Dd9HqmMU/N7DoWHXDX9IaVF8farSB0KZSzoBZRy4 +NHuW2zQVI43o2A6IJDm5uc7Rx9DFRrZuVfN1RRkphvzDP5rlpnfkmHlp0ceqOZIZ +WDKzuaw+PvM9jowWNJ9ju0km8rpNTszaLXb5tFCEXxuYrGOE+tmXpqghRkon2ynj +srg5x7fTMhd33LcmX5xDq12jL54kWckq1DWggPXoCXQIeU2VSsNU1ks5IF4EAaX6 +Rjx40YsmYo1B8XV4lzrb79GFJMjgHxsySC3nbqezpihVoQYu3RfW+gI4Zv/CzhuO +W51VJWFtUtjBIvhS/OIisWt4qCY7L6p0Daig/V0NooRBwGA7u3dOLFJxQ1YK0nWX +HQ99HacTGzGOGhCTkcIhCMdTIEcEFHGpxRUuvOw2QWZAzLcqFP7+o8IiU+bgYI2Y +s6/eoxcABVC11HF90j/ZtJWaKnnfXW7zYYKLiNWdPazSgTFhDW8Az1S8RHqdZqM1 +NkbYk6l6Y26pM77v0sziarjfNa8PraK4QnyZpD52XEmLW9vD0g== +=LhVW -----END PGP SIGNATURE----- diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-cflags.patch b/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-cflags.patch deleted file mode 100644 index 5915c0efa1f4..000000000000 --- a/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNrbB ibus-chewing-1.3.10-Source.bak/CMakeLists.txt ibus-chewing-1.3.10-Source/CMakeLists.txt ---- ibus-chewing-1.3.10-Source.bak/CMakeLists.txt 2011-10-12 19:50:51.371121417 +0800 -+++ ibus-chewing-1.3.10-Source/CMakeLists.txt 2011-10-24 09:24:06.189668872 +0800 -@@ -20,7 +20,7 @@ - - Chewing also support toned Hanyu pinyin input.") - --SET(CMAKE_C_FLAGS "-Wall") -+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") - - SET(AUTHORS "Peng Huang, Ding-Yi Chen") - SET(MAINTAINER "Ding-Yi Chen <dchen at redhat.com>") diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-fix_save_setting.patch b/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-fix_save_setting.patch deleted file mode 100644 index 05a21b33cffa..000000000000 --- a/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-fix_save_setting.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://bugs.gentoo.org/407779 -http://code.google.com/p/ibus/issues/detail?id=1428 - ---- src/IBusChewingEngine-def.c -+++ src/IBusChewingEngine-def.c -@@ -392,13 +392,13 @@ - gVar=g_variant_new_uint32(g_value_get_uint(gValue)); - break; - case G_TYPE_UINT64: -- gVar=g_variant_new_uint64(g_value_get_uint(gValue)); -+ gVar=g_variant_new_uint64(g_value_get_uint64(gValue)); - break; - case G_TYPE_INT: -- gVar=g_variant_new_int32(g_value_get_uint(gValue)); -+ gVar=g_variant_new_int32(g_value_get_int(gValue)); - break; - case G_TYPE_INT64: -- gVar=g_variant_new_int64(g_value_get_uint(gValue)); -+ gVar=g_variant_new_int64(g_value_get_int64(gValue)); - break; - case G_TYPE_STRING: - gVar=g_variant_new_string(g_value_get_string(gValue)); diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-ibus-1.4.patch b/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-ibus-1.4.patch deleted file mode 100644 index 7376c02d0581..000000000000 --- a/app-i18n/ibus-chewing/files/ibus-chewing-1.3.10-ibus-1.4.patch +++ /dev/null @@ -1,53 +0,0 @@ -http://bugs.gentoo.org/407695 -http://code.google.com/p/ibus/issues/detail?id=1427 - ---- src/IBusChewingEngine.gob -+++ src/IBusChewingEngine.gob -@@ -1041,12 +1041,21 @@ - /* Toggle Full <-> Half */ - chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context)); - }else if (strcmp(prop_name,"chewing_settings_prop")==0){ -- if (self->settings_prop->state==PROP_STATE_UNCHECKED){ -+#if IBUS_CHECK_VERSION(1, 4, 0) -+ if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED) -+#else -+ if (self->settings_prop->state==PROP_STATE_UNCHECKED) -+#endif -+ { - if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){ - self_save_config_all(self); - } - gtk_widget_hide(self->setting_dialog); -+#if IBUS_CHECK_VERSION(1, 4, 0) -+ ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED); -+#else - self->settings_prop->state=PROP_STATE_UNCHECKED; -+#endif - } - }else{ - G_DEBUG_MSG(3,"[I3] property_activate(-, %s, %u) not recognized",prop_name, prop_state); ---- src/IBusChewingEngine-input-events.c -+++ src/IBusChewingEngine-input-events.c -@@ -291,12 +291,21 @@ - /* Toggle Full <-> Half */ - chewing_set_ShapeMode(self->context, !chewing_get_ShapeMode(self->context)); - }else if (strcmp(prop_name,"chewing_settings_prop")==0){ -- if (self->settings_prop->state==PROP_STATE_UNCHECKED){ -+#if IBUS_CHECK_VERSION(1, 4, 0) -+ if (ibus_property_get_state(self->settings_prop)==PROP_STATE_UNCHECKED) -+#else -+ if (self->settings_prop->state==PROP_STATE_UNCHECKED) -+#endif -+ { - if (gtk_dialog_run(GTK_DIALOG(self->setting_dialog))==GTK_RESPONSE_OK){ - self_save_config_all(self); - } - gtk_widget_hide(self->setting_dialog); -+#if IBUS_CHECK_VERSION(1, 4, 0) -+ ibus_property_set_state(self->settings_prop,PROP_STATE_UNCHECKED); -+#else - self->settings_prop->state=PROP_STATE_UNCHECKED; -+#endif - } - }else{ - G_DEBUG_MSG(3,"[I3] property_activate(-, %s, %u) not recognized",prop_name, prop_state); 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 deleted file mode 100644 index 203728ad5abd..000000000000 --- a/app-i18n/ibus-chewing/files/ibus-chewing-1.4.3-content-type.patch +++ /dev/null @@ -1,134 +0,0 @@ -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.3.10-r1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.3.10-r1.ebuild deleted file mode 100644 index 7feeb72e13cf..000000000000 --- a/app-i18n/ibus-chewing/ibus-chewing-1.3.10-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 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.3.10-r1.ebuild,v 1.2 2012/05/03 19:24:29 jdhore Exp $ - -EAPI=4 -inherit cmake-utils - -MY_P=${P}-Source - -DESCRIPTION="The Chewing IMEngine for IBus Framework" -HOMEPAGE="http://code.google.com/p/ibus/" -SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz - https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-modules-only-latest.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -RDEPEND="x11-libs/libXtst - >=app-i18n/ibus-1.1 - >=dev-libs/libchewing-0.3.2 - x11-libs/gtk+:2 - dev-util/gob:2" -DEPEND="${RDEPEND} - dev-util/cmake-fedora - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -CMAKE_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${P}-cflags.patch - "${FILESDIR}"/${P}-ibus-1.4.patch - "${FILESDIR}"/${P}-fix_save_setting.patch - ) - -DOCS="AUTHORS ChangeLog ChangeLog.prev README RELEASE-NOTES.txt USER-GUIDE" - -src_configure() { - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR=/etc - -DPRJ_DOC_DIR=/usr/share/doc/${PF} - ) - - cmake-utils_src_configure -} diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.3.10.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.3.10.ebuild deleted file mode 100644 index 4fee7528225d..000000000000 --- a/app-i18n/ibus-chewing/ibus-chewing-1.3.10.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2012 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.3.10.ebuild,v 1.3 2012/05/03 19:24:29 jdhore Exp $ - -EAPI=3 -inherit cmake-utils - -MY_P="${P}-Source" -DESCRIPTION="The Chewing IMEngine for IBus Framework" -HOMEPAGE="http://code.google.com/p/ibus/" -SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz - https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-modules-only-latest.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -RDEPEND="x11-libs/libXtst - >=app-i18n/ibus-1.1 - >=dev-libs/libchewing-0.3.2 - x11-libs/gtk+:2 - dev-util/gob:2" -DEPEND="${RDEPEND} - dev-util/cmake-fedora - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -CMAKE_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${P}-cflags.patch - "${FILESDIR}"/${P}-ibus-1.4.patch - ) - -DOCS="AUTHORS ChangeLog ChangeLog.prev README RELEASE-NOTES.txt USER-GUIDE" - -src_install() { - cmake-utils_src_install - - # Move /gconf to /etc/gconf - dodir /etc - mv -vf "${ED}"/gconf "${ED}"/etc -} diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.4.2.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.4.2.ebuild deleted file mode 100644 index 6da16580c188..000000000000 --- a/app-i18n/ibus-chewing/ibus-chewing-1.4.2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2012 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.2.ebuild,v 1.1 2012/08/29 20:11:22 naota Exp $ - -EAPI=4 -inherit cmake-utils - -MY_P=${P}-Source - -DESCRIPTION="The Chewing IMEngine for IBus Framework" -HOMEPAGE="http://code.google.com/p/ibus/" -SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -RDEPEND="x11-libs/libXtst - >=app-i18n/ibus-1.1 - >=dev-libs/libchewing-0.3.2 - x11-libs/gtk+:2 - dev-util/gob:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -CMAKE_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.10-cflags.patch - ) - -DOCS="AUTHORS ChangeLog ChangeLog.prev README RELEASE-NOTES.txt USER-GUIDE" - -src_configure() { - local mycmakeargs=( - -DPRJ_DOC_DIR=/usr/share/doc/${PF} - ) - - cmake-utils_src_configure -} diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.4.3-r1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.4.3-r1.ebuild deleted file mode 100644 index 3e54315b10db..000000000000 --- a/app-i18n/ibus-chewing/ibus-chewing-1.4.3-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# 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-r1.ebuild,v 1.1 2013/12/30 08:17:38 naota Exp $ - -EAPI=4 -inherit cmake-utils - -MY_P=${P}-Source - -DESCRIPTION="The Chewing IMEngine for IBus Framework" -HOMEPAGE="http://code.google.com/p/ibus/" -SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -RDEPEND="x11-libs/libXtst - >=app-i18n/ibus-1.3 - >=dev-libs/libchewing-0.3.3 - x11-libs/gtk+:2 - dev-util/gob:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -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" - -src_configure() { - local mycmakeargs=( - -DPRJ_DOC_DIR=/usr/share/doc/${PF} - ) - - cmake-utils_src_configure -} |