pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/inputmethod/anthy
Module Name: pkgsrc
Committed By: wiz
Date: Tue Sep 15 13:00:15 UTC 2026
Modified Files:
pkgsrc/inputmethod/anthy: Makefile distinfo
Added Files:
pkgsrc/inputmethod/anthy/patches: patch-alt-cannadic_g_fname.t
patch-mkworddic_compound.t patch-mkworddic_name.t
patch-src-diclib_xstr.c patch-src-worddic_record.c
Log Message:
anthy: bugfixes from Fedora
Bump PKGREVISION.
>From Showta Ishizaki in PR 60727.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/inputmethod/anthy/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/inputmethod/anthy/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/inputmethod/anthy/patches/patch-alt-cannadic_g_fname.t \
pkgsrc/inputmethod/anthy/patches/patch-mkworddic_compound.t \
pkgsrc/inputmethod/anthy/patches/patch-mkworddic_name.t \
pkgsrc/inputmethod/anthy/patches/patch-src-diclib_xstr.c \
pkgsrc/inputmethod/anthy/patches/patch-src-worddic_record.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/inputmethod/anthy/Makefile
diff -u pkgsrc/inputmethod/anthy/Makefile:1.18 pkgsrc/inputmethod/anthy/Makefile:1.19
--- pkgsrc/inputmethod/anthy/Makefile:1.18 Wed Sep 6 01:50:50 2023
+++ pkgsrc/inputmethod/anthy/Makefile Tue Sep 15 13:00:15 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2023/09/06 01:50:50 msaitoh Exp $
+# $NetBSD: Makefile,v 1.19 2026/09/15 13:00:15 wiz Exp $
.include "../../inputmethod/anthy/Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER= taya%NetBSD.org@localhost
Index: pkgsrc/inputmethod/anthy/distinfo
diff -u pkgsrc/inputmethod/anthy/distinfo:1.16 pkgsrc/inputmethod/anthy/distinfo:1.17
--- pkgsrc/inputmethod/anthy/distinfo:1.16 Thu Sep 7 14:44:51 2023
+++ pkgsrc/inputmethod/anthy/distinfo Tue Sep 15 13:00:15 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2023/09/07 14:44:51 taca Exp $
+$NetBSD: distinfo,v 1.17 2026/09/15 13:00:15 wiz Exp $
BLAKE2s (2ch.t) = 64e9fc0ea6383d0579e088352feef16b525c1a395d38736db9809cc4fcf0a3fd
SHA512 (2ch.t) = bd6a487b6f90bf5a69ec7a61ea2a0fda07127f6feb8e8662ecc8a4436b3955e3a42c6cda40b0e47e8d7d4d5c76e34f41057bd4400428e561e541bc1ffd236efc
@@ -9,4 +9,9 @@ Size (anthy-9100h.tar.gz) = 4446148 byte
BLAKE2s (okinawa-20090801.t) = 723e4e0e6ed7bdd5a9ee309934c2465d5040ad8a5511929dfd9346e0cabe3590
SHA512 (okinawa-20090801.t) = 03cd20ef12ea25bb462a94e77ee04825c5acd4e9281bfe9c33d390a0106d2e3113c51083389bb21996af9bcf9a74acde6fbcdc6006f737b8a74fc55abc7d6260
Size (okinawa-20090801.t) = 165520 bytes
+SHA1 (patch-alt-cannadic_g_fname.t) = 8cc6442b616c98fba935ddb7b5a474efe3b8d4b4
SHA1 (patch-anthy.el) = 3464a065d4dd25f38cd2990e0796eba53e69876a
+SHA1 (patch-mkworddic_compound.t) = abef661d5f6bb8858946e434f153b03e6b093a2c
+SHA1 (patch-mkworddic_name.t) = 0f09fb25bda679db79c5231b11c29955500333da
+SHA1 (patch-src-diclib_xstr.c) = feb498f335c725693b44b54a50e3f7bb5a9f9a7d
+SHA1 (patch-src-worddic_record.c) = 1da8715b1f5b80e9ee2c9744d85f66d839405648
Added files:
Index: pkgsrc/inputmethod/anthy/patches/patch-alt-cannadic_g_fname.t
diff -u /dev/null pkgsrc/inputmethod/anthy/patches/patch-alt-cannadic_g_fname.t:1.1
--- /dev/null Tue Sep 15 13:00:15 2026
+++ pkgsrc/inputmethod/anthy/patches/patch-alt-cannadic_g_fname.t Tue Sep 15 13:00:15 2026
@@ -0,0 +1,25 @@
+$NetBSD: patch-alt-cannadic_g_fname.t,v 1.1 2026/09/15 13:00:15 wiz Exp $
+
+Fix the kanji for the novelist Abe Kobo (1924-1993). The entry reads
+"abekoubou" and gives 阿部公房; he wrote his family name 安部公房.
+
+The neighbouring entries in this file already spell 安倍晋三, 安倍晴明
+and 安倍なつみ correctly, so this is an isolated slip rather than a
+convention the dictionary follows. Writing a person's name with the
+wrong character is a discourtesy in Japanese, and an input method that
+offers only the wrong form makes the right one awkward to type.
+
+Taken from Fedora, which has carried this since 2010 as
+anthy-fix-typo-in-dict-name.patch.
+
+--- alt-cannadic/g_fname.t.orig
++++ alt-cannadic/g_fname.t
+@@ -82,7 +82,7 @@
+ あとうだたかし #JN*100 #_4阿刀田_3高
+ あなやまこすけ #JN*10 #_4穴山_3小介
+ あびるゆう #JN*100 #_3あびる_2優
+-あべこうぼう #JN*10 #_2阿部_4公房
++あべこうぼう #JN*10 #_2安部_4公房
+ あべしんぞう #JN*100 #_2安倍_4晋三
+ あべせいめい #JN*50 #_2安倍_4晴明
+ あべなつみ #JN*150 #_2安倍_3なつみ
Index: pkgsrc/inputmethod/anthy/patches/patch-mkworddic_compound.t
diff -u /dev/null pkgsrc/inputmethod/anthy/patches/patch-mkworddic_compound.t:1.1
--- /dev/null Tue Sep 15 13:00:15 2026
+++ pkgsrc/inputmethod/anthy/patches/patch-mkworddic_compound.t Tue Sep 15 13:00:15 2026
@@ -0,0 +1,207 @@
+$NetBSD: patch-mkworddic_compound.t,v 1.1 2026/09/15 13:00:15 wiz Exp $
+
+Fix wrong kanji, wrong readings and malformed part-of-speech tags.
+
+The conversions corrected here give a different word from the one the reading
+asks for:
+
+ げんかんしょうめい 玄関証明 -> 玄関照明
+ こうかいはんてい 高階判定 -> 公開判定
+ しょうかようすい 消化用水 -> 消火用水
+ ひなんじゃくしゃ 非難弱者 -> 避難弱者
+ ひなんたいろ 非難退路 -> 避難退路
+ ゆまくいじょう 油膜以上 -> 油膜異常
+ ぜんきょくろくおん 歩道整備 -> 全曲録音
+
+The last one had been given the entry for a different word entirely; 歩道整備
+is added back under its own reading, ほどうせいび.
+
+Two readings were wrong: あいずしっき for 会津漆器, which is あいづ, and
+かんすいきんぞく for 関水金属, which is せきすい. Seven entries carried a
+malformed part-of-speech tag (no leading #, or #35, #T5, #T#5 where #T30 or
+#T35 was meant); mkworddic takes the tag only from a token that starts with #
+and names a known type, so those compounds were never registered.
+
+Fedora has carried these since 2010, and anthy-unicode -- the fork that is
+still maintained -- has every one of them.
+
+--- mkworddic/compound.t.orig
++++ mkworddic/compound.t
+@@ -8,7 +8,6 @@
+ ������������� #T35 #_4����_4���
+ ������������� #T35 #_5���_4����
+ �������� #T35 #_5����_2̾
+-��������� #T35 #_3����_3����
+ ���������ä� #CN ���������å�
+ ������������ #T35 #_4����_2��
+ �������� #T35 #_3����_3����
+@@ -20,6 +19,7 @@
+ ����������� #T35 #_3����_5����
+ ���������� #T35 #_3����_4����
+ ��������ä��� #T35 #_3����_5�п�
++������ #T35 #_3����_3����
+ �����Ť������ #T35 #_3����_4���
+ �����ŤƤĤɤ� #T35 #_3����_4Ŵƻ
+ �����ŤƤĤɤ����� #T35 #_3����_6Ŵƻ��
+@@ -1987,7 +1987,7 @@
+ ���äѤ��䤯������ #T35 #_4����_3ͽ��_3����
+ ���äѤ��礯 #T35 #_4����_3��
+ ���äѤ��礳�� #T35 #_4����_4ι��
+-���äѤ��褦 #35 #_4����_3����
++���äѤ��褦 #T30 #_4����_3����
+ ���äѤ��褦���� #T35 #_4����_3����_2��
+ ���äѤ��褦����भ #T35 #_4����_3����_2��_2��
+ ���äѤ���� #T35 #_4����_3����
+@@ -9714,7 +9714,6 @@
+ ����� #T35 #_4����_3����
+ ������礦 #T35 #_4����_3Ģ
+ ����������� #T35 #_4����_3�ս�
+-���������� #T35 #_4�ؿ�_4��°
+ ��������� #T35 #_4����_2��
+ �������� #T35 #_4����_3���
+ ������������� #T35 #_4�ؿ�_4����
+@@ -10235,7 +10234,7 @@
+ ����֤�� #T35 #_3����_3�ͻ�
+ ����֤Ĥ� #T35 #_4��ʪ_1��
+ ����֤� #T35 #_2��_2�֥�
+-����֤�夦����� #T#5 #_3����_6ή��
++����֤�夦����� #T30 #_3����_6ή��
+ ����֤�ɤ����� #T35 #_4��ʸ_4����_2��
+ ����֤�Ƥ� #T35 #_4��ʸ_2Ū
+ ����פ����� #T35 #_4����_2��
+@@ -14320,7 +14319,7 @@
+ ������֤� #KK #_4����_4��ʹ
+ ������֤�Ϥ� #T35 #_4����_4��ʹ_2��
+ ����� #T35 #_4����_3��
+-�������������ɤ� T35 #_4����_5�Ĵ�_5���_2ƻ
++�������������ɤ� #T35 #_4����_5�Ĵ�_5���_2ƻ
+ ������ #T35 #_4����_2��
+ ������ߤä� #KK #_4����_5����ߥå�
+ ����������Ƥ� #T35 #_4����_5���_2ŵ
+@@ -19234,7 +19233,7 @@
+ ������ #T35 #_4����_2��
+ ������� #T35 #_2��_2��_4����
+ ������ #T35 #_4����_2��
+-������ #T35 #_4����_5����
++������ #T35 #_4����_5����
+ ������ #T35 #_2��_4�ؿ�
+ �����ޤ� #T35 #_4����_2�
+ ������ˤ� #T35 #_2��_3����_2��
+@@ -19964,7 +19963,7 @@
+ �����礦�礦���� #T35 #_5����_5Ĵã
+ ��������� #T35 #_4��Ϸ_2��
+ ��������� #T35 #_4��Ͻ_2��
+-������� #T5 #_2��_3ϩ��
++������� #T35 #_2��_3ϩ��
+ ���������� #T35 #_4����_4��
+ �����椦 #T35 #_4����_3��ͳ
+ ���������� #T35 #_4����_4���
+@@ -20163,7 +20162,7 @@
+ ����������� #T35 #_4��_4Ƥ��
+ ���������ʤޤۤ����� #T35 #_4��_2�_4����
+ ���������Ϥ� #T35 #_4�_2��
+-���������Ϥ�Ƥ� #T35 #_4�_4Ƚ��
++���������Ϥ�Ƥ� #T35 #_4��_4Ƚ��
+ ���������� #T35 #_4��_2��
+ ���������� #T35 #_4��_1��
+ ������������� #T35 #_4��_4����
+@@ -21650,7 +21649,7 @@
+ ������� #T35 #_4����_1��
+ �������������� #T35 #_4��Ū_3���_3�ݸ�
+ ���������� #T35 #_4��Ū_4����
+-���������� T35 #_4��Ū_3��Ϳ
++���������� #T30 #_4��Ū_3��Ϳ
+ ����������� #T35 #_4��Ū_3����
+ ����������� #T35 #_4��Ū_3��
+ ���������椦 #T35 #_4��Ū_4��ͻ
+@@ -30752,7 +30751,6 @@
+ ����夦��������� #T35 #_6�_4���_3����
+ ����夦�Τ� #T35 #_7���_1��
+ �����Ƥ��������� #T35 #_5����_4�к�
+-�����Ȥ����� #T35 #_5����_2��
+ �����ѤĤ�礯 #T35 #_5��ȯ_3��
+ �����ѤĤ�礯����� #T35 #_5��ȯ_3��_4����
+ �����Ӥ� #T35 #_5����_2�
+@@ -30839,7 +30837,7 @@
+ ������ #T35 #_3��_3����
+ ������ #T35 #_4�ز�_2˼
+ ���������� #T35 #_4�_4�װ�
+-���������� #T35 #_4�_4�ѿ�
++���������� #T35 #_4�ò�_4�ѿ�
+ �������礯 #T35 #_4�_3��
+ ���������� #T35 #_5��_3��
+ ���������� #T35 #_5��_3��
+@@ -40405,6 +40403,7 @@
+ �������� #T35 #_5�_2��
+ �������Ҥ礦 #T35 #_3�_3ɽ
+ ����������� #T35 #_6���_1��
++������������� #KK #_4�ؿ�_4��°
+ ����������� #T35 #_4�Կ�_3��
+ ������������ #T35 #_4�Կ�_5»��
+ ���������Ϥ� #T35 #_4�Կ�_4ȿ��
+@@ -40670,7 +40669,7 @@
+ ���ä�㤯���� #T35 #_5����_2��
+ ���ä�㤯���� #T35 #_5����_2��
+ ���ä�㤯�� #T35 #_5����_1��
+-���ä�㤯�֤֤� T35 #_5����_3��ʬ
++���ä�㤯�֤֤� #T35 #_5����_3��ʬ
+ ���ä�㤯��� #T35 #_5����_2��
+ ���ä�㤯��� #T35 #_5����_4����
+ ���ä�夦���� #T35 #_5����_2��
+@@ -41942,7 +41941,7 @@
+ �������� #T35 #_5���_2��
+ �����夦 #T35 #_5���_3��
+ ������ #T35 #_5���_2��
+-���������� #T35 #_5��ƻ_4���
++���������� #T30 #_5���_4Ͽ��
+ ������Ƥ����� #T35 #_4���_6�����
+ ������ #T35 #_4���_2��
+ ������ #T35 #_6�����_3��
+@@ -46498,7 +46497,7 @@
+ �夦�Ф���� #KK #_5��ȭ_2��
+ �夦�Ф��� #T35 #_5����_3�ʹ�
+ �夦�Ф�� #T35 #_5��Ƚ_4�ʾ�
+-�夦����������ɤ� T35 #_4����_5�Ĵ�_5���_2ƻ
++�夦����������ɤ� #T35 #_4����_5�Ĵ�_5���_2ƻ
+ �夦��� #T35 #_4����_2�
+ �夦�֤�� #T35 #_4����_2�϶�
+ �夦�֤�ۤ� #T35 #_4����_3����
+@@ -57562,11 +57561,11 @@
+ �Ҥʤ� #T35 #_3����_2����
+ �Ҥʤ� #T35 #_3����_2��
+ �Ҥʤ��� #T35 #_3����_3�ٱ�
+-�Ҥʤ㤯���� #T35 #_3����_5���
++�Ҥʤ㤯���� #T35 #_3����_5���
+ �Ҥʤ夦�ߤ� #T35 #_3����_5��̱
+ �Ҥʤ� #T35 #_3����_2��
+ �Ҥʤ����� #T35 #_3����_4���
+-�Ҥʤ��� #T35 #_3����_3��ϩ
++�Ҥʤ��� #T35 #_3����_3��ϩ
+ �Ҥʤ�Ĥ��� #T35 #_3����_3��ϩ
+ �Ҥʤ�Ф��� #T35 #_3����_3���
+ �Ҥʤ�椦� #T35 #_3����_4ͶƳ
+@@ -62585,6 +62584,7 @@
+ �ۤȤ����� #T35 #_3ʩ_2��
+ �ۤɤ����� #T35 #_3��ƻ_2¦
+ �ۤɤ���� #T35 #_3��ƻ_3��
++�ۤɤ������� #T30 #_3��ƻ_3���
+ �ۤɤ�� #T35 #_3��Ƴ_2��
+ �ۤˤ夦��֤� #T35 #_4Ӯ��_4ưʪ
+ �ۤˤ夦�Ӥ� #T35 #_4Ӯ��_2��
+@@ -66264,7 +66264,6 @@
+ ����� #T35 #_3͢��_1��
+ ��������� #T35 #_3͢��_3����
+ ������� #T35 #_3͢��_2����
+-������� #T35 #_3͢��_2����
+ �������� #T35 #_3͢��_3��Υ
+ ���������� #T35 #_3͢��_5�ȼ�
+ ����������� #T35 #_3͢��_4�ײ�
+@@ -66351,7 +66350,7 @@
+ ��Ӥ��������ˤ� #T35 #_4���_4��ǧ
+ ��Ӥ⤸ #T35 #_2��_2ʸ��
+ ��Ӥ��Τ����� #T35 #_3����_5ʪ��
+-��ޤ������ #T35 #_3����_4�ʾ�
++��ޤ������ #T35 #_3����_4�۾�
+ ��ޤ�����������礯 #T35 #_3����_4��_3��
+ ���餪��� #T35 #_3��¼_4����
+ ��ᤫ���� #T35 #_2̴_3��
Index: pkgsrc/inputmethod/anthy/patches/patch-mkworddic_name.t
diff -u /dev/null pkgsrc/inputmethod/anthy/patches/patch-mkworddic_name.t:1.1
--- /dev/null Tue Sep 15 13:00:15 2026
+++ pkgsrc/inputmethod/anthy/patches/patch-mkworddic_name.t Tue Sep 15 13:00:15 2026
@@ -0,0 +1,25 @@
+$NetBSD: patch-mkworddic_name.t,v 1.1 2026/09/15 13:00:15 wiz Exp $
+
+Fix the kanji for the novelist Abe Kobo (1924-1993). The entry reads
+"abekoubou" and gives 阿部公房; he wrote his family name 安部公房.
+
+The neighbouring entries in this file already spell 安倍晋三, 安倍晴明
+and 安倍なつみ correctly, so this is an isolated slip rather than a
+convention the dictionary follows. Writing a person's name with the
+wrong character is a discourtesy in Japanese, and an input method that
+offers only the wrong form makes the right one awkward to type.
+
+Taken from Fedora, which has carried this since 2010 as
+anthy-fix-typo-in-dict-name.patch.
+
+--- mkworddic/name.t.orig
++++ mkworddic/name.t
+@@ -43,7 +43,7 @@
+ ��������� #JN #_4������_3��
+ ���ʤ� #JN ���ʥ�
+ ���Ӥ�椦 #JN #_3���Ӥ�_2ͥ
+-������ #JN #_2����_4��˼
++������ #JN #_2����_4��˼
+ ����� #JN #_2����_5����
+ ������ #JN #_2����_4����
+ ������� #JN #_2����_3����
Index: pkgsrc/inputmethod/anthy/patches/patch-src-diclib_xstr.c
diff -u /dev/null pkgsrc/inputmethod/anthy/patches/patch-src-diclib_xstr.c:1.1
--- /dev/null Tue Sep 15 13:00:15 2026
+++ pkgsrc/inputmethod/anthy/patches/patch-src-diclib_xstr.c Tue Sep 15 13:00:15 2026
@@ -0,0 +1,27 @@
+$NetBSD: patch-src-diclib_xstr.c,v 1.1 2026/09/15 13:00:15 wiz Exp $
+
+Do not dereference a NULL xstr. reorder_by_suffix passes anthy_xstrcmp the
+result of anthy_get_nth_xstr(0), which is NULL whenever the first value of
+the matching SUFFIX_HISTORY row is not a string, and anthy then dies with
+SIGSEGV inside anthy_set_string -- so every conversion of a word ending in a
+suffix takes down whatever loaded the library. anthy's own record writer can
+produce such a row: write_quote_xstr puts nothing between the quotes when the
+value it is handed is empty or damaged.
+
+Fedora added this guard in 2013 as anthy-fix-segfault.patch, for ibus-anthy
+crashing in anthy_xstrcmp (their bug 973127), and anthy-unicode -- the fork
+that is still maintained -- has the same guard in src-diclib/xstr.c.
+
+--- src-diclib/xstr.c.orig
++++ src-diclib/xstr.c
+@@ -384,6 +384,10 @@
+ anthy_xstrcmp(xstr *x1, xstr *x2)
+ {
+ int i, m;
++ if (!x1)
++ return -1;
++ if (!x2)
++ return 1;
+ if (x1->len < x2->len) {
+ m = x1->len;
+ }else{
Index: pkgsrc/inputmethod/anthy/patches/patch-src-worddic_record.c
diff -u /dev/null pkgsrc/inputmethod/anthy/patches/patch-src-worddic_record.c:1.1
--- /dev/null Tue Sep 15 13:00:15 2026
+++ pkgsrc/inputmethod/anthy/patches/patch-src-worddic_record.c Tue Sep 15 13:00:15 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-src-worddic_record.c,v 1.1 2026/09/15 13:00:15 wiz Exp $
+
+Treat EOF as the end of a line. read_1_token reports the end of a line only
+on '\n', so when the last line of a record file (~/.anthy/last-record2_*) has
+no trailing newline, the loop in read_1_row that reads tokens up to the end
+of the line never terminates, and anthy hangs at start-up.
+
+Fedora carries this as anthy-fix-eol.patch (2024), and anthy-unicode has the
+same change in src-worddic/record.c.
+
+--- src-worddic/record.c.orig
++++ src-worddic/record.c
+@@ -1043,7 +1043,7 @@
+ if (s) {
+ s[len] = '\0';
+ }
+- *eol = (c == '\n');
++ *eol = (c == '\n' || c == EOF);
+ return s;
+ }
+
Home |
Main Index |
Thread Index |
Old Index