Codebase list ibus-array / 0595f55
debian/patches: Dropped, all merged upstream Boyuan Yang 3 years ago
3 changed file(s) with 0 addition(s) and 258 deletion(s). Raw diff Collapse all Expand all
+0
-32
debian/patches/fix-preedit-text-behaviour-at-engine-reset.patch less more
0 Description: Hide instead of update the preedit text upon engine reset
1 This fixes a disappearing cursor issue seen on VTE-based terminals,
2 and removes a left-behind lookup table fragment seen on XTerm.
3 .
4 This also fixes a problem where text would get deleted upon
5 double-click selection in applications such as Google Chrome.
6 Author: Anthony Fok <foka@debian.org>
7 Origin: upstream, https://github.com/lexical/ibus-array/pull/12
8 Bug: https://github.com/lexical/ibus-array/issues/2
9 Last-Update: 2020-06-05
10 ---
11 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
12 --- a/src/engine.c
13 +++ b/src/engine.c
14 @@ -220,7 +220,7 @@
15 arrayeng->table = NULL;
16 }
17
18 - IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)arrayeng);
19 + IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)arrayeng);
20 }
21
22 static void ibus_array_engine_reset(IBusEngine *engine) {
23 @@ -229,7 +229,7 @@
24 arrayeng->cursor_pos = 0;
25 arrayeng->space_press_count = 0;
26
27 - ibus_array_engine_update_preedit (arrayeng);
28 + ibus_engine_hide_preedit_text (engine);
29 ibus_engine_hide_lookup_table (engine);
30 ibus_engine_hide_auxiliary_text (engine);
31 parent_class->reset(engine);
+0
-2
debian/patches/series less more
0 fix-preedit-text-behaviour-at-engine-reset.patch
1 update-version-number-and-array-xml.patch
+0
-224
debian/patches/update-version-number-and-array-xml.patch less more
0 Description: Update version number and array.xml
1 Add <symbol>&#x884C;</symbol> so that the Array input method
2 shows up as "行" rather than something like "zh₁".
3 .
4 Some ideas were borrowed from ibus-anthy and ibus-tables.
5 For example, array.xml.in.in was renamed to array.inputMethod.xml.in.in
6 to allow for gettext to pick up the XML file based on the rules in
7 /usr/share/gettext/its/ibus.its and /usr/share/gettext/its/ibus.loc.
8 Author: Anthony Fok <foka@debian.org>
9 Origin: upstream, https://github.com/lexical/ibus-array/pull/14
10 Last-Update: 2020-06-05
11 ---
12 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
13 --- a/configure.ac
14 +++ b/configure.ac
15 @@ -20,15 +20,15 @@
16
17 # if not 1, append datestamp to the version number.
18 m4_define([package_name], [ibus-array])
19 -m4_define([ibus_released], [0])
20 -m4_define([ibus_major_version], [0])
21 -m4_define([ibus_minor_version], [0])
22 -m4_define([ibus_micro_version], [2])
23 +m4_define([ibus_array_released], [0])
24 +m4_define([ibus_array_major_version], [0])
25 +m4_define([ibus_array_minor_version], [2])
26 +m4_define([ibus_array_micro_version], [1])
27
28 -m4_define([ibus_version],
29 - ibus_major_version.ibus_minor_version.ibus_micro_version)
30 +m4_define([ibus_array_version],
31 + ibus_array_major_version.ibus_array_minor_version.ibus_array_micro_version)
32
33 -AC_INIT([package_name], [ibus_version], [http://code.google.com/p/ibus/issues/entry], [package_name])
34 +AC_INIT([package_name], [ibus_array_version], [https://github.com/ibus/ibus-anthy/issues], [package_name])
35 AM_INIT_AUTOMAKE([1.10])
36 AC_GNU_SOURCE
37
38 @@ -80,7 +80,7 @@
39 Makefile
40 ibus-array.spec
41 src/Makefile
42 -src/array.xml.in
43 +src/array.inputMethod.xml.in
44 icons/Makefile
45 setup/Makefile
46 setup/ibus-setup-array
47 --- a/po/POTFILES.in
48 +++ b/po/POTFILES.in
49 @@ -1,2 +1,3 @@
50 +src/array.inputMethod.xml.in.in
51 src/engine.c
52 setup/main.py
53 --- a/po/zh_TW.po
54 +++ b/po/zh_TW.po
55 @@ -5,39 +5,51 @@
56 #
57 msgid ""
58 msgstr ""
59 -"Project-Id-Version: 0.0.4\n"
60 -"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
61 -"POT-Creation-Date: 2014-11-01 18:21+0800\n"
62 -"PO-Revision-Date: 2014-11-01 16:44+0800\n"
63 -"Last-Translator: Keng-Yu Lin <kengyu@lexical.tw>\n"
64 +"Project-Id-Version: ibus-array 0.2.1\n"
65 +"Report-Msgid-Bugs-To: https://github.com/ibus/ibus-anthy/issues\n"
66 +"POT-Creation-Date: 2019-12-10 22:09+0800\n"
67 +"PO-Revision-Date: 2019-12-10 22:12+0800\n"
68 +"Last-Translator: Anthony Fok <foka@debian.org>\n"
69 "Language-Team: Chinese (traditional)\n"
70 "Language: zh_TW\n"
71 "MIME-Version: 1.0\n"
72 "Content-Type: text/plain; charset=UTF-8\n"
73 "Content-Transfer-Encoding: 8bit\n"
74
75 -#: src/engine.c:179
76 +#: src/array.inputMethod.xml.in.in:5
77 +msgid "Array 30 Input Method Component"
78 +msgstr "行列30輸入法元件"
79 +
80 +#: src/array.inputMethod.xml.in.in:24
81 +msgid "Array"
82 +msgstr "行列"
83 +
84 +#: src/array.inputMethod.xml.in.in:25
85 +msgid "Array 30 Input Method 行列30輸入法"
86 +msgstr "行列30輸入法 Array 30 Input Method"
87 +
88 +#: src/engine.c:194
89 msgid "Setup"
90 msgstr "設定"
91
92 -#: src/engine.c:180
93 +#: src/engine.c:195
94 msgid "Configure Array 30 engine"
95 msgstr "設定行列輸入法"
96
97 -#: src/engine.c:422
98 +#: src/engine.c:416
99 msgid ""
100 "1.comma 2.bracket 3.symbol 4.math 5.arrow 6.unit 7.table 8.roman 9.greek 0."
101 "bopomo"
102 msgstr "1.標點 2.括弧 3.符號 4.數學 5.箭頭 6.單位 7.圖表 8.羅馬 9.希臘 0.注音"
103
104 -#: setup/main.py:43
105 +#: setup/main.py:42
106 msgid "ibus-array setup"
107 msgstr "行列輸入法設定"
108
109 -#: setup/main.py:50
110 +#: setup/main.py:49
111 msgid "Special Code Notification"
112 msgstr "當有特別碼時，顯示提示"
113
114 -#: setup/main.py:52
115 -msgid "Speical Code Only Mode"
116 +#: setup/main.py:51
117 +msgid "Special Code Only Mode"
118 msgstr "當有特別碼時，只能用特別碼輸入 (特別碼練習模式)"
119 --- a/setup/main.py
120 +++ b/setup/main.py
121 @@ -47,7 +47,7 @@
122 self.__window.set_icon_from_file(icon_file)
123 self.__special_notify_button = Gtk.CheckButton(_("Special Code Notification"))
124 self.__window.vbox.pack_start(self.__special_notify_button, True, True, 10)
125 - self.__special_only_button = Gtk.CheckButton(_("Speical Code Only Mode"))
126 + self.__special_only_button = Gtk.CheckButton(_("Special Code Only Mode"))
127 self.__window.vbox.pack_start(self.__special_only_button, True, True ,10)
128
129 current_special_mode = self.__read("SpecialOnly", False)
130 --- a/src/array.xml.in.in
131 +++ /dev/null
132 @@ -1,28 +0,0 @@
133 -<?xml version=\"1.0\" encoding=\"utf-8\"?>
134 -<!-- filename: enchant.xml -->
135 -<component>
136 - <name>org.freedesktop.IBus.Array</name>
137 - <description>Array 30 Input Method Component</description>
138 - <exec>${libexecdir}/ibus-engine-array --ibus</exec>
139 - <version>@VERSION@</version>
140 - <author>Yu-Chun Wang &lt;mainlander1122@gmail.com&gt;</author>
141 - <license>GPL</license>
142 - <homepage>http://code.google.com/p/ibus</homepage>
143 - <textdomain>ibus-array</textdomain>
144 -
145 - <engines>
146 - <engine>
147 - <name>array</name>
148 - <language>zh_TW</language>
149 - <license>GPL</license>
150 - <author>Yu-Chun Wang &lt;mainlander1122@gmail.com&gt;</author>
151 - <icon>${pkgdatadir}/icons/ibus-array.png</icon>
152 - <layout>us</layout>
153 - <longname>Array</longname>
154 - <description>Array 30 Input Method</description>
155 - <setup>${libexecdir}/ibus-setup-array</setup>
156 - <rank>99</rank>
157 - </engine>
158 - </engines>
159 -
160 -</component>
161 --- a/src/Makefile.am
162 +++ b/src/Makefile.am
163 @@ -47,20 +47,17 @@
164 componentdir = @datadir@/ibus/component
165
166 EXTRA_DIST = \
167 - array.xml.in \
168 + array.inputMethod.xml.in \
169 $(NULL)
170
171 CLEANFILES = \
172 array.xml \
173 $(NULL)
174
175 -array.xml: array.xml.in
176 - ( \
177 - libexecdir=${libexecdir}; \
178 - pkgdatadir=${pkgdatadir}; \
179 - s=`cat $<`; \
180 - eval "echo \"$${s}\""; \
181 - ) > $@
182 +%.xml: %.inputMethod.xml.in
183 + sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|g" \
184 + -e "s|\@PKGDATADIR\@|$(pkgdatadir)|g" \
185 + $< > $@
186
187 test: ibus-engine-array
188 $(builddir)/ibus-engine-array
189 --- /dev/null
190 +++ b/src/array.inputMethod.xml.in.in
191 @@ -0,0 +1,32 @@
192 +<?xml version="1.0" encoding="utf-8"?>
193 +<!-- filename: array.xml -->
194 +<component>
195 + <name>org.freedesktop.IBus.Array</name>
196 + <description>Array 30 Input Method Component</description>
197 + <exec>@LIBEXECDIR@/ibus-engine-array --ibus</exec>
198 + <version>@VERSION@</version>
199 + <author>
200 + 王昱鈞 Yu-Chun Wang &lt;mainlander1122@gmail.com&gt;
201 + 林耕宇 Keng-Yu Lin &lt;kengyu@debian.org&gt;</author>
202 + <license>GPL</license>
203 + <homepage>https://github.com/lexical/ibus-array</homepage>
204 + <textdomain>ibus-array</textdomain>
205 + <engines>
206 + <engine>
207 + <name>array</name>
208 + <language>zh_TW</language>
209 + <license>GPL</license>
210 + <author>
211 + 王昱鈞 Yu-Chun Wang &lt;mainlander1122@gmail.com&gt;
212 + 林耕宇 Keng-Yu Lin &lt;kengyu@debian.org&gt;</author>
213 + <icon>@PKGDATADIR@/icons/ibus-array.png</icon>
214 + <layout>us</layout>
215 + <longname>Array</longname>
216 + <description>Array 30 Input Method
217 +行列30輸入法</description>
218 + <setup>@LIBEXECDIR@/ibus-setup-array</setup>
219 + <rank>99</rank>
220 + <symbol>&#x884C;</symbol>
221 + </engine>
222 + </engines>
223 +</component>