app-i18n/kinput2: fix build with app-i18n/freewnn

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/app-i18n/kinput2/files/kinput2-wnn.patch b/app-i18n/kinput2/files/kinput2-wnn.patch
new file mode 100644 (file)
index 0000000..4e70019
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-wnn.patch
@@ -0,0 +1,51 @@
+--- a/lib/cconv.c
++++ b/lib/cconv.c
+@@ -790,7 +790,7 @@
+ static int parseLine(uchar *, uchar **, int);
+ static FILE *openfile(char *);
+ static int doinclude(uchar *, Files *, void (*)());
+-static uchar *getline(uchar *, int, Files *, void (*)());
++static uchar *getLine(uchar *, int, Files *, void (*)());
+ static int readRuleFile(ccRule, char *);
+ static int registMode(ccRule, int, uchar **);
+ static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
+@@ -1035,8 +1035,8 @@
+       return 0;
+ }
+ 
+-/* getline -- 1\e$B9TFI$_9~$`\e(B (\e$B$=$N:]\e(B include \e$B$N=hM}$r9T$J$&\e(B) */
+-static uchar *getline(line, linesize, files, efunc)
++/* getLine -- 1\e$B9TFI$_9~$`\e(B (\e$B$=$N:]\e(B include \e$B$N=hM}$r9T$J$&\e(B) */
++static uchar *getLine(line, linesize, files, efunc)
+ uchar *line;
+ int linesize;
+ Files *files;
+@@ -1100,7 +1100,7 @@
+       rule->nmode = 0;
+       rule->initialmode = -1;
+ 
+-      while (getline(line, sizeof(line), &files, efunc)) {
++      while (getLine(line, sizeof(line), &files, efunc)) {
+               (void)Strcpy(tmp, line);
+               if ((argc = parseLine(tmp, argv, 20)) == 0)
+                       continue;
+@@ -1269,7 +1269,7 @@
+       cdbuf.cdbuf = NULL;
+ 
+       /* \e$B%k!<%k$rFI$s$G%9%H%"$9$k\e(B */
+-      while (getline(line, sizeof(line), files, efunc)) {
++      while (getLine(line, sizeof(line), files, efunc)) {
+               /* '#' \e$B$G;O$^$k9T$O%3%a%s%H\e(B */
+               if (*line == '\0' || *line == '\n' || *line == '#')
+                       continue;
+--- a/lib/wnnlib.c
++++ b/lib/wnnlib.c
+@@ -1367,7 +1367,7 @@
+ 
+       /* \e$BJQ49J8;zNs$ND9$5$N%A%'%C%/\e(B */
+       clp = buf->clauseInfo + cl;
+-      len = jl_kanji_len(buf->wnn, cl);
++      len = jl_kanji_len(buf->wnn, cl, -1);
+       diff = len - ((clp + 1)->dispp - clp->dispp);
+       newlen = (buf->displayEnd - buf->displayBuf) + diff;
+       if (newlen > buf->bufferSize) {

diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index caf4b59765b64b560694565bafe6429d2a02b37c..d18b1cdc75d1c5278e25426d5c5436efa63ccd43 100644 (file)
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-headers.patch
        "${FILESDIR}"/${PN}-ppc.patch
        "${FILESDIR}"/${PN}-segfault.patch
+       "${FILESDIR}"/${PN}-wnn.patch
 )
 DOCS=( README NEWS doc/. )
 

diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index 0f1fc47b2a4fc0d9fe0ac1e99879eec70000a438..864011015526080ba5f5a1609c82dbaa68c281e5 100644 (file)
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-headers.patch
        "${FILESDIR}"/${PN}-ppc.patch
        "${FILESDIR}"/${PN}-segfault.patch
+       "${FILESDIR}"/${PN}-wnn.patch
 )
 DOCS=( README NEWS doc/. )