make it buildable on 4.x.

2 files changed, 58 insertions, 0 deletions

diff --git a/japanese/tomoe/files/patch-lib::tomoe.c b/japanese/tomoe/files/patch-lib::tomoe.c
new file mode 100644
index 000000000000..3d19a4ef2215
--- /dev/null
+++ b/japanese/tomoe/files/patch-lib::tomoe.c
@@ -0,0 +1,41 @@
+Index: lib/tomoe.c
+diff -u -p lib/tomoe.c.orig lib/tomoe.c
+--- lib/tomoe.c.orig	Thu Aug 11 11:34:32 2005
++++ lib/tomoe.c	Mon Dec 19 03:31:30 2005
+@@ -150,9 +150,9 @@ tomoe_get_matched (glyph *input, candida
+   {
+     candidate_private *cand;
+     int_array *adapted;
++    int pj;
+     cand = cands->p[i];
+     adapted = cand->adapted_strokes;
+-    int pj;
+ 
+     pj = match_stroke_num(cand->index, input->stroke_num, adapted);
+ 
+@@ -471,13 +471,14 @@ load_dictionaries (void)
+   stroke *strk = NULL;
+   point *pnt = NULL;
+   char line_buf[LINE_BUF_SIZE];
++  FILE *fp;
+ 
+   if (g_dict) return;
+ 
+   g_dict = calloc (1, sizeof(dictionary));
+   dictionary_alloc_contents (g_dict, DICT_LETTER_INITIAL_SIZE);
+ 
+-  FILE *fp = fopen (TOMOEDATADIR "/all.tdic", "r");
++  fp = fopen (TOMOEDATADIR "/all.tdic", "r");
+   while ((p = fgets (line_buf, LINE_BUF_SIZE, fp)) != NULL)
+   {
+     if (p[0] == '\n')
+@@ -766,8 +767,8 @@ get_candidates(stroke *input_stroke, poi
+   for (cand_index = 0; cand_index < cands->len; cand_index++)
+   {
+     tomoe_bool match_flag;
+-    match_flag = FALSE;
+     int_array *adapted = NULL;
++    match_flag = FALSE;
+     cand = cands->p[cand_index];
+ 
+     adapted = int_array_copy (cand->adapted_strokes);
diff --git a/japanese/tomoe/files/patch-src::match.c b/japanese/tomoe/files/patch-src::match.c
new file mode 100644
index 000000000000..11778ad5a839
--- /dev/null
+++ b/japanese/tomoe/files/patch-src::match.c
@@ -0,0 +1,17 @@
+Index: src/match.c
+diff -u -p src/match.c.orig src/match.c
+--- src/match.c.orig	Mon Dec 27 13:36:00 2004
++++ src/match.c	Mon Dec 19 03:33:58 2005
+@@ -547,10 +547,11 @@ load_data ()
+   letter *lttr = NULL;
+   stroke *strk = NULL;
+   point *pnt = NULL;
++  FILE *fp;
+ 
+   dictionary_alloc_contents(&dict, DICT_LETTER_INITIAL_SIZE);
+ 
+-  FILE *fp = fopen(TOMOEDATADIR "/all.tdic", "r");
++  fp = fopen(TOMOEDATADIR "/all.tdic", "r");
+   while ((p = fgets(line_buf, LINE_BUF_SIZE, fp)) != NULL)
+     {
+       if (p[0] == '\n')