| 1 |
commit: 9647a5ca1f865b4b5f9332be9d248a64786681ed |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 18 15:24:28 2017 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 18 15:24:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9647a5ca |
| 7 |
|
| 8 |
app-i18n/kinput2: fix build with app-i18n/freewnn |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-i18n/kinput2/files/kinput2-wnn.patch | 51 ++++++++++++++++++++++++++++++++ |
| 13 |
app-i18n/kinput2/kinput2-3.1-r1.ebuild | 1 + |
| 14 |
app-i18n/kinput2/kinput2-3.1-r2.ebuild | 1 + |
| 15 |
3 files changed, 53 insertions(+) |
| 16 |
|
| 17 |
diff --git a/app-i18n/kinput2/files/kinput2-wnn.patch b/app-i18n/kinput2/files/kinput2-wnn.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..4e7001938fb |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-i18n/kinput2/files/kinput2-wnn.patch |
| 22 |
@@ -0,0 +1,51 @@ |
| 23 |
+--- a/lib/cconv.c |
| 24 |
++++ b/lib/cconv.c |
| 25 |
+@@ -790,7 +790,7 @@ |
| 26 |
+ static int parseLine(uchar *, uchar **, int); |
| 27 |
+ static FILE *openfile(char *); |
| 28 |
+ static int doinclude(uchar *, Files *, void (*)()); |
| 29 |
+-static uchar *getline(uchar *, int, Files *, void (*)()); |
| 30 |
++static uchar *getLine(uchar *, int, Files *, void (*)()); |
| 31 |
+ static int readRuleFile(ccRule, char *); |
| 32 |
+ static int registMode(ccRule, int, uchar **); |
| 33 |
+ static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *, |
| 34 |
+@@ -1035,8 +1035,8 @@ |
| 35 |
+ return 0; |
| 36 |
+ } |
| 37 |
+ |
| 38 |
+-/* getline -- 1行読み込む (その際 include の処理を行なう瘢雹) */ |
| 39 |
+-static uchar *getline(line, linesize, files, efunc) |
| 40 |
++/* getLine -- 1行読み込む (その際 include の処理を行なう瘢雹) */ |
| 41 |
++static uchar *getLine(line, linesize, files, efunc) |
| 42 |
+ uchar *line; |
| 43 |
+ int linesize; |
| 44 |
+ Files *files; |
| 45 |
+@@ -1100,7 +1100,7 @@ |
| 46 |
+ rule->nmode = 0; |
| 47 |
+ rule->initialmode = -1; |
| 48 |
+ |
| 49 |
+- while (getline(line, sizeof(line), &files, efunc)) { |
| 50 |
++ while (getLine(line, sizeof(line), &files, efunc)) { |
| 51 |
+ (void)Strcpy(tmp, line); |
| 52 |
+ if ((argc = parseLine(tmp, argv, 20)) == 0) |
| 53 |
+ continue; |
| 54 |
+@@ -1269,7 +1269,7 @@ |
| 55 |
+ cdbuf.cdbuf = NULL; |
| 56 |
+ |
| 57 |
+ /* ル・踉札襪鯑匹鵑妊好肇���する */ |
| 58 |
+- while (getline(line, sizeof(line), files, efunc)) { |
| 59 |
++ while (getLine(line, sizeof(line), files, efunc)) { |
| 60 |
+ /* '#' で始まる行はコメント */ |
| 61 |
+ if (*line == '\0' || *line == '\n' || *line == '#') |
| 62 |
+ continue; |
| 63 |
+--- a/lib/wnnlib.c |
| 64 |
++++ b/lib/wnnlib.c |
| 65 |
+@@ -1367,7 +1367,7 @@ |
| 66 |
+ |
| 67 |
+ /* 変換文字列の長さのチウ３校ック */ |
| 68 |
+ clp = buf->clauseInfo + cl; |
| 69 |
+- len = jl_kanji_len(buf->wnn, cl); |
| 70 |
++ len = jl_kanji_len(buf->wnn, cl, -1); |
| 71 |
+ diff = len - ((clp + 1)->dispp - clp->dispp); |
| 72 |
+ newlen = (buf->displayEnd - buf->displayBuf) + diff; |
| 73 |
+ if (newlen > buf->bufferSize) { |
| 74 |
|
| 75 |
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild |
| 76 |
index caf4b59765b..d18b1cdc75d 100644 |
| 77 |
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild |
| 78 |
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild |
| 79 |
@@ -36,6 +36,7 @@ PATCHES=( |
| 80 |
"${FILESDIR}"/${PN}-headers.patch |
| 81 |
"${FILESDIR}"/${PN}-ppc.patch |
| 82 |
"${FILESDIR}"/${PN}-segfault.patch |
| 83 |
+ "${FILESDIR}"/${PN}-wnn.patch |
| 84 |
) |
| 85 |
DOCS=( README NEWS doc/. ) |
| 86 |
|
| 87 |
|
| 88 |
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild |
| 89 |
index 0f1fc47b2a4..86401101552 100644 |
| 90 |
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild |
| 91 |
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild |
| 92 |
@@ -36,6 +36,7 @@ PATCHES=( |
| 93 |
"${FILESDIR}"/${PN}-headers.patch |
| 94 |
"${FILESDIR}"/${PN}-ppc.patch |
| 95 |
"${FILESDIR}"/${PN}-segfault.patch |
| 96 |
+ "${FILESDIR}"/${PN}-wnn.patch |
| 97 |
) |
| 98 |
DOCS=( README NEWS doc/. ) |
Archives