diff --git a/FreeWnn-1.1.1-a017.tar.bz2 b/FreeWnn-1.1.1-a017.tar.bz2 deleted file mode 100644 index 2005c0d..0000000 --- a/FreeWnn-1.1.1-a017.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aab3bdf1e78e1ad4cd25dced0a13ecf0af8e556c49f875a7e3bbf3f99de16afa -size 2906933 diff --git a/FreeWnn-1.1.1-a017.dif b/FreeWnn-1.1.1-a021.dif similarity index 84% rename from FreeWnn-1.1.1-a017.dif rename to FreeWnn-1.1.1-a021.dif index 476736e..6c202c2 100644 --- a/FreeWnn-1.1.1-a017.dif +++ b/FreeWnn-1.1.1-a021.dif @@ -1,26 +1,6 @@ ---- Xsi/PubdicPlus/pod.c -+++ Xsi/PubdicPlus/pod.c 2001/09/04 16:59:45 -@@ -26,13 +26,15 @@ - - #include - --#define bzero(a, c) memset(a, 0, c) -- - #if __STDC__ - #include -+#include -+#include - #else - extern char *malloc (); - #endif -+ -+#define bzero(a, c) memset(a, 0, c) - - #define POD_WCHAR - ---- Xsi/Wnn/include/jllib.h -+++ Xsi/Wnn/include/jllib.h 2001/09/04 18:55:55 -@@ -248,58 +248,58 @@ +--- FreeWnn-1.1.1-a021/Wnn/include/jllib.h ++++ FreeWnn-1.1.1-a021/Wnn/include/jllib.h +@@ -248,59 +248,59 @@ #define jl_set_lang(buf, lang) js_set_lang((buf)->env, lang) /* extern function defines */ @@ -127,19 +107,19 @@ -extern void jl_get_zenkouho_yomi (); +extern void jl_get_zenkouho_yomi (struct wnn_buf *, int, w_char *); #endif - #endif /* JLLIB */ ---- Xsi/Wnn/jlib/jl.c -+++ Xsi/Wnn/jlib/jl.c 2001/09/04 19:06:21 -@@ -38,6 +38,8 @@ - #include "commonhd.h" - #include "wnn_config.h" - #include -+#include + + #endif /* WNN_JLLIB_H */ +--- FreeWnn-1.1.1-a021/Wnn/jlib/jl.c ++++ FreeWnn-1.1.1-a021/Wnn/jlib/jl.c +@@ -52,6 +52,7 @@ + # include + # endif + #endif /* STDC_HEADERS */ +#include #include - #ifdef SYSVR2 - # include -@@ -145,7 +147,7 @@ + #include + #include +@@ -159,7 +160,7 @@ static void make_space_for (); static void make_space_for_bun (); static void make_space_for_zenkouho (); @@ -148,7 +128,7 @@ static int ren_conv1 (); static void set_dai (); static void set_sho (); -@@ -261,7 +263,7 @@ +@@ -275,7 +276,7 @@ static struct wnn_env * find_same_env (js, env_n, lang) register WNN_JSERVER_ID *js; @@ -157,7 +137,7 @@ char *lang; { register int k; -@@ -300,7 +302,7 @@ +@@ -314,7 +315,7 @@ add_new_env (js, env, env_n, server_n, lang) register WNN_JSERVER_ID *js; register struct wnn_env *env; @@ -166,7 +146,7 @@ { register int k; -@@ -421,15 +423,16 @@ +@@ -435,15 +436,16 @@ struct wnn_env * jl_connect_lang (env_n, server_n, lang, wnnrc_n, error_handler, message_handler, timeout) @@ -186,7 +166,7 @@ extern char *getenv (); extern char *_wnn_get_machine_of_serv_defs (); -@@ -562,8 +565,8 @@ +@@ -576,8 +578,8 @@ struct wnn_buf * jl_open_lang (env_n, server_n, lang, wnnrc_n, error_handler, message_handler, timeout) @@ -197,7 +177,7 @@ int timeout; { register int k, dmy; -@@ -1490,7 +1493,7 @@ +@@ -1504,7 +1506,7 @@ int prio; int rw, hrw, rev; char *pwd_dic, *pwd_hindo; @@ -206,7 +186,7 @@ { char tmp[256]; char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN]; -@@ -1505,7 +1508,7 @@ +@@ -1519,7 +1521,7 @@ jl_disconnect (env); return (-1); } @@ -215,7 +195,7 @@ { sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 200, NULL, env->lang), dic_name, msg_get (wnn_msg_cat, 201, NULL, env->lang)); /* -@@ -1519,7 +1522,7 @@ +@@ -1533,7 +1535,7 @@ /* "辞書ファイル \"%s\" が無いよ。作る?(Y/N)", */ @@ -224,7 +204,7 @@ { if (create_file (env, dic_name, JISHO, -1, /* -1 is dummy */ pwd_dic, (hindo_name && *hindo_name) ? "" : pwd_hindo, error_handler, message_handler) == -1) -@@ -1544,7 +1547,7 @@ +@@ -1558,7 +1560,7 @@ jl_disconnect (env); return (-1); } @@ -233,7 +213,7 @@ { sprintf (tmp, "%s \"%s\" %s", msg_get (wnn_msg_cat, 203, NULL, env->lang), hindo_name, msg_get (wnn_msg_cat, 201, NULL, env->lang)); /* -@@ -1558,7 +1561,7 @@ +@@ -1572,7 +1574,7 @@ /* "頻度ファイル \"%s\" が無いよ。作る?(Y/N)", */ @@ -242,7 +222,7 @@ { if (create_file (env, hindo_name, HINDO, fid, "", pwd_hindo, error_handler, message_handler) == -1) return (-1); -@@ -1587,7 +1590,7 @@ +@@ -1601,7 +1603,7 @@ } else if (wnn_errorno == WNN_HINDO_NO_MATCH) { @@ -251,7 +231,7 @@ { return (-1); } -@@ -1595,7 +1598,7 @@ +@@ -1609,7 +1611,7 @@ /* "辞書と頻度 \"%s\" の整合性が無いよ。作り直す?(Y/N)", */ @@ -260,7 +240,7 @@ { return (-1); } -@@ -1671,7 +1674,7 @@ +@@ -1685,7 +1687,7 @@ create_pwd_file (env, pwd_file, error_handler, message_handler) register struct wnn_env *env; char *pwd_file; @@ -269,7 +249,7 @@ { FILE *fp; char gomi[256]; -@@ -2731,17 +2734,17 @@ +@@ -2749,17 +2751,17 @@ int jl_set_env_wnnrc (env, wnnrc_n, error_handler, message_handler) register struct wnn_env *env; @@ -291,7 +271,7 @@ { confirm_state = NO_CREATE; } -@@ -2757,8 +2760,8 @@ +@@ -2775,8 +2777,8 @@ int jl_set_env_wnnrc1 (env, wnnrc_n, error_handler, message_handler, level) register struct wnn_env *env; @@ -302,7 +282,7 @@ int level; { register int num; -@@ -2811,7 +2814,7 @@ +@@ -2829,7 +2831,7 @@ { /* dic_add */ int prio, rdonly, hrdonly, rev; @@ -311,7 +291,7 @@ expand_expr_all (s[0], env); if (num < 3 || !REAL_PARAM (s[1])) { -@@ -2837,11 +2840,11 @@ +@@ -2855,11 +2857,11 @@ else if (confirm_state == CREATE_WITHOUT_CONFIRM) { @@ -325,7 +305,7 @@ } if (jl_dic_add_e (env, s[0], s[1], rev, prio, rdonly, hrdonly, s[5], s[6], error_handler1, message_handler) == -1 && wnn_errorno != 0) { -@@ -2972,7 +2975,7 @@ +@@ -2990,7 +2992,7 @@ if (*s != '~' && *s != '@') return (0); @@ -334,7 +314,7 @@ return (-1); s1 = s; -@@ -2995,12 +2998,12 @@ +@@ -3008,12 +3010,12 @@ { if (*s1) { @@ -349,7 +329,7 @@ } } -@@ -3008,13 +3011,13 @@ +@@ -3021,13 +3023,13 @@ { /* then, *s must be '@' */ if (!strcmp (s1, "HOME")) { @@ -365,7 +345,7 @@ strcpy (buf, p); strcat (buf, "/"); -@@ -3031,15 +3034,15 @@ +@@ -3044,15 +3046,15 @@ } else if (!strcmp (s1, "LIBDIR")) { @@ -384,7 +364,7 @@ } else { /* @HOME, @LIBDIR @ENV igai ha kaenai */ -@@ -3063,7 +3066,7 @@ +@@ -3076,7 +3078,7 @@ total = 0; flag = 0; @@ -393,7 +373,7 @@ { if (isdigit (*st)) { -@@ -3122,7 +3125,7 @@ +@@ -3135,7 +3137,7 @@ int d; int fid; char *pwd_dic, *pwd_hindo; @@ -402,7 +382,7 @@ { char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN]; int rev_dict_type; -@@ -3230,7 +3233,7 @@ +@@ -3243,7 +3245,7 @@ make_dir_rec1 (env, path, error_handler, message_handler) struct wnn_env *env; register char *path; @@ -411,7 +391,7 @@ { char gomi[128]; register char *c; -@@ -3253,7 +3256,7 @@ +@@ -3266,7 +3268,7 @@ make_dir1 (env, dirname, error_handler, message_handler) register struct wnn_env *env; register char *dirname; @@ -420,7 +400,7 @@ { char gomi[128]; if (dirname[0] == C_LOCAL) -@@ -3274,7 +3277,7 @@ +@@ -3287,7 +3289,7 @@ return (0); /* dir already exists */ } } @@ -429,7 +409,7 @@ { sprintf (gomi, "%s \"%s\" %s%s", msg_get (wnn_msg_cat, 210, NULL, env->lang), dirname, msg_get (wnn_msg_cat, 201, NULL, env->lang), msg_get (wnn_msg_cat, 202, NULL, env->lang)); /* -@@ -3311,8 +3314,8 @@ +@@ -3324,8 +3326,8 @@ static int call_error_handler (error_handler, c) @@ -440,7 +420,7 @@ { register int x; x = error_handler (c); -@@ -3327,16 +3330,16 @@ +@@ -3340,16 +3342,16 @@ } static void @@ -462,9 +442,9 @@ (*message_handler) (buf); } } ---- Xsi/Wnn/jlib/js.c -+++ Xsi/Wnn/jlib/js.c 2001/09/04 17:34:48 -@@ -900,7 +900,7 @@ +--- FreeWnn-1.1.1-a021/Wnn/jlib/js.c ++++ FreeWnn-1.1.1-a021/Wnn/jlib/js.c +@@ -979,7 +979,7 @@ free((char *)env); */ set_current_js (env->js_id); @@ -473,75 +453,3 @@ snd_env_head (&tmp_env, JS_DISCONNECT); snd_flush (); x = get4com (); ---- Xsi/Wnn/jutil/atod.c -+++ Xsi/Wnn/jutil/atod.c 2001/09/04 16:59:45 -@@ -39,6 +39,8 @@ - - #include - #include -+#include -+#include - #include "commonhd.h" - #include "wnn_config.h" - #include "jslib.h" ---- Xsi/Wnn/jutil/atorev.c -+++ Xsi/Wnn/jutil/atorev.c 2001/09/04 16:59:45 -@@ -35,6 +35,7 @@ - - #include - #include -+#include - #include "commonhd.h" - #include "jslib.h" - #include "jh.h" ---- Xsi/Wnn/jutil/dtoa.c -+++ Xsi/Wnn/jutil/dtoa.c 2001/09/04 16:59:45 -@@ -38,6 +38,8 @@ - #endif /* lint */ - - #include -+#include -+#include - #include "commonhd.h" - #include "wnn_config.h" - #include "jslib.h" ---- Xsi/Wnn/jutil/wddel.c -+++ Xsi/Wnn/jutil/wddel.c 2001/09/04 16:59:45 -@@ -38,6 +38,7 @@ - #endif /* lint */ - - #include -+#include - #include "commonhd.h" - #include "wnn_config.h" - #include "jllib.h" ---- Xsi/Wnn/jutil/wdreg.c -+++ Xsi/Wnn/jutil/wdreg.c 2001/09/04 16:59:45 -@@ -38,6 +38,7 @@ - #endif /* lint */ - - #include -+#include - #include - #include - #include "commonhd.h" ---- Xsi/Wnn/uum/history.c -+++ Xsi/Wnn/uum/history.c 2001/09/04 16:59:45 -@@ -30,6 +30,7 @@ - */ - - #include -+#include - #include "commonhd.h" - #include "sdefine.h" - #include "sheader.h" ---- Xsi/Wnn/uum/sheader.h -+++ Xsi/Wnn/uum/sheader.h 2001/09/04 16:59:45 -@@ -320,6 +320,7 @@ - extern void set_keypad_on (); - extern void set_keypad_off (); - extern void set_scroll_region (); -+#define setenv fwnn_setenv - extern void setenv (); - extern int setutmp (); - extern int st_colum (); diff --git a/FreeWnn-1.1.1-a021.tar.bz2 b/FreeWnn-1.1.1-a021.tar.bz2 new file mode 100644 index 0000000..be62713 --- /dev/null +++ b/FreeWnn-1.1.1-a021.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df9523b2eea7cbc94d9d01c19a01394abe3b648c5ec3f1259adac06fc8ecbb86 +size 3108905 diff --git a/FreeWnn-fixes.patch b/FreeWnn-fixes.patch deleted file mode 100644 index e51c1f8..0000000 --- a/FreeWnn-fixes.patch +++ /dev/null @@ -1,480 +0,0 @@ ---- FreeWnn-1.1.1-a017/Xsi/Wnn/etc/pwd.c.xx 2005-06-15 15:42:17.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/etc/pwd.c 2005-06-15 15:42:22.000000000 +0200 -@@ -34,6 +34,7 @@ - */ - #ifndef JS - #include -+#include - #include "commonhd.h" - #include "jslib.h" - #include "wnn_os.h" ---- FreeWnn-1.1.1-a017/Xsi/Wnn/etc/msg.c.xx 2005-06-15 15:42:31.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/etc/msg.c 2005-06-15 15:50:20.000000000 +0200 -@@ -48,71 +48,11 @@ - */ - - #include -+#include - #include "commonhd.h" - #include "wnn_os.h" - #include "msg.h" - --extern char *getenv (); -- --#ifdef hpux --void * --bsearch (ky, bs, nel, width, compar) -- const void *ky; -- const void *bs; -- size_t nel; -- size_t width; -- int (*compar) (const void *, const void *); --#else --static char * --bsearch (ky, bs, nel, width, compar) -- char *ky; -- char *bs; -- unsigned long nel; -- unsigned long width; -- int (*compar) (); --#endif /* hpux */ --{ -- char *key = ky; -- char *base = bs; -- int two_width = width + width; -- char *last = base + width * (nel - 1); -- -- register char *p; -- register int ret; --#ifdef hpux -- register int tmp; --#endif -- -- while (last >= base) -- { -- p = base + width * ((last - base) / two_width); -- ret = (*compar) ((void *) key, (void *) p); -- -- if (ret == 0) -- return ((char *) p); /* found */ --#ifdef hpux -- if (ret < 0) -- { -- tmp = p; -- tmp -= width; -- last = tmp; -- } -- else -- { -- tmp = p; -- tmp += width; -- base = tmp; -- } --#else /* hpux */ -- if (ret < 0) -- last = p - width; -- else -- base = p + width; --#endif /* hpux */ -- } -- return ((char *) 0); /* not found */ --} -- - static char * - getlang (lang) - char *lang; ---- FreeWnn-1.1.1-a017/Xsi/Wnn/etc/xutoj.c.xx 2005-06-15 15:58:39.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/etc/xutoj.c 2005-06-15 15:58:46.000000000 +0200 -@@ -31,6 +31,7 @@ - - #define NEED_CR - -+#include - #include "commonhd.h" - #include "wnn_config.h" - #include "wnn_os.h" ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/getopt.c.xx 2005-06-15 15:41:17.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/getopt.c 2005-06-15 15:49:17.000000000 +0200 -@@ -29,6 +29,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include -+#include -+#include -+ - /*LINTLIBRARY*/ - /*********************************************************************** - getopt.c -@@ -40,8 +44,6 @@ - 加えて下さい。 - - ***********************************************************************/ --#define NULL 0 --#define EOF (-1) - #define ERR_PRINT(s, c) \ - if(opterr){ \ - char errbuf[2]; \ -@@ -55,8 +57,6 @@ - #ifdef BSD42 - #define strchr index - #endif --extern int strcmp (); --extern char *strchr (); - - int opterr = 1; - int optind = 1; ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/Makefile.in.xx 2005-06-15 15:52:36.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/Makefile.in 2005-06-15 15:52:48.000000000 +0200 -@@ -46,8 +46,8 @@ - OBJ0= de.o - OBJ1= de_vars.o dispatch.o do_dic_env.o do_dic_no.o do_filecom.o error.o jbiki.o jbiki_b.o jishoop.o jserver_id.o rd_jishoop.o readfile.o b_index.o jishosub.o jmt0.o malloc.o kai_area.o mknode0.o mknode1.o mknode2.o renbn_kai.o bnsetu_kai.o daibn_kai.o jikouho.o jikouho_d.o fzk.o atojis.o get_kaiarea.o snd_rcv.o do_henkan.o do_henkan1.o do_env.o do_hindo_s.o initjserv.o hinsi_list.o sisheng.o w_string.o - --SRC2= $(WNNJLIBSRC)/getopt.c --OBJ2= getopt.o -+SRC2= -+OBJ2= - SRC3= $(WNNJLIBSRC)/wnnerrmsg.c - OBJ3= wnnerrmsg.o - ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c.xx 2005-06-15 15:38:43.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c 2005-06-15 15:56:03.000000000 +0200 -@@ -320,6 +320,7 @@ - demon_main (); - - demon_fin (); -+ return 0; - } - - static void ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c.xx 2005-06-15 15:38:43.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c 2005-06-15 15:39:45.000000000 +0200 -@@ -35,6 +35,8 @@ - #include - #include - #include -+#include -+#include - #include "commonhd.h" - #include "de_header.h" - #include ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/initjserv.c.xx 2005-06-15 15:38:43.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/initjserv.c 2005-06-15 15:40:51.000000000 +0200 -@@ -32,6 +32,7 @@ - #include - - #include -+#include - #include - - #if defined(HAVE_SYS_TYPES_H) ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/jikouho.c.xx 2005-06-15 15:38:43.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/jikouho.c 2005-06-15 15:40:30.000000000 +0200 -@@ -34,6 +34,7 @@ - ************************************************/ - #include - #include -+#include - #include "commonhd.h" - #include "de_header.h" - #include "jdata.h" ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/jikouho_d.c.xx 2005-06-15 15:38:43.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/jikouho_d.c 2005-06-15 15:56:33.000000000 +0200 -@@ -34,6 +34,7 @@ - ************************************************/ - #include - #include -+#include - #include "commonhd.h" - #include "de_header.h" - #include "jdata.h" ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/malloc.c.xx 2005-06-15 15:38:43.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/malloc.c 2005-06-15 15:47:12.000000000 +0200 -@@ -48,10 +46,6 @@ - extern void *realloc (void *, size_t); - extern void *calloc (size_t, size_t); - #else --extern char *malloc (); --extern void free (); --extern char *realloc (); --extern char *calloc (); - #endif /* hpux */ - - #ifdef hpux ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/wnnstat.c.xx 2005-06-15 15:57:00.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/wnnstat.c 2005-06-15 15:58:06.000000000 +0200 -@@ -34,6 +34,7 @@ - #endif /* lint */ - - #include -+#include - #include "jslib.h" - #include "jllib.h" - #include "jd_sock.h" ---- FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jikouho.c.xx 2005-06-15 15:59:10.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jikouho.c 2005-06-15 16:01:08.000000000 +0200 -@@ -30,6 +30,7 @@ - */ - - #include -+#include - #include "jllib.h" - #include "commonhd.h" - #include "sdefine.h" ---- FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jutil.c.xx 2005-06-15 15:59:10.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jutil.c 2005-06-15 16:01:19.000000000 +0200 -@@ -33,6 +33,7 @@ - /* 活辞書とはカレントユーザ辞書のことだよ */ - - #include -+#include - #include "commonhd.h" - #include "jslib.h" - #include "jllib.h" ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/Makefile.in.xx 2005-06-15 16:08:06.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/Makefile.in 2005-06-15 16:08:54.000000000 +0200 -@@ -49,8 +49,8 @@ - - OBJ1= js.o wnnerrmsg.o jl.o - --SRC2= getopt.c --OBJ2= getopt.o -+SRC2= -+OBJ2= - SRC3= $(WNNETCSRC)/msg.c - OBJ3= msg.o - SRC4= $(WNNETCSRC)/yincoding.c -@@ -87,19 +87,6 @@ - - all:: $(OBJS) libwnn.a - --all:: libgetopt.a -- --libgetopt.a: $(OBJ2) $(EXTRALIBRARYDEPS) -- $(RM) $@ -- $(AR) $@ $(OBJ2) -- $(RANLIB) $@ -- --lintlib:: llib-lgetopt.ln -- --llib-lgetopt.ln: $(SRC2) $(EXTRALIBRARYDEPS) -- $(RM) $@ -- $(LINT) $(LINTLIBFLAG)getopt $(LINTFLAGS) $(SRC2) -- - js.o : js.c $(WNNETCSRC)/bdic.c $(WNNETCSRC)/pwd.c $(WNNETCSRC)/gethinsi.c - - lint: ---- FreeWnn-1.1.1-a017/Xsi/cWnn/jlib/Makefile.in.xx 2005-06-15 16:13:51.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/jlib/Makefile.in 2005-06-15 16:14:09.000000000 +0200 -@@ -37,7 +37,7 @@ - - LIB_MT_DEFINES = LibraryMTDefines - --LINKS = getopt.c jl.c js.c kankana.c wnnerrmsg.c -+LINKS = jl.c js.c kankana.c wnnerrmsg.c - JLIBDEFINES = -DWRITE_CHECK - INCLUDES = -I$(CWNNINCLUDESRC) -I$(TOP) - DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) $(JLIBDEFINES) -@@ -50,8 +50,8 @@ - - OBJ1= js.o wnnerrmsg.o jl.o - --SRC2= getopt.c --OBJ2= getopt.o -+SRC2= -+OBJ2= - SRC3= $(CWNNETCSRC)/msg.c - OBJ3= msg.o - SRC4= $(CWNNETCSRC)/yincoding.c -@@ -90,17 +90,6 @@ - - includes:: $(LINKS) - --getopt.c: $(WNNJLIBSRC)/getopt.c -- $(RM) $@ -- $(LN) $? $@ -- --includes:: getopt.c -- --depend:: getopt.c -- --clean:: -- $(RM) getopt.c -- - jl.c: $(WNNJLIBSRC)/jl.c - $(RM) $@ - $(LN) $? $@ -@@ -145,19 +134,6 @@ - clean:: - $(RM) wnnerrmsg.c - --all:: libgetopt.a -- --libgetopt.a: $(OBJ2) $(EXTRALIBRARYDEPS) -- $(RM) $@ -- $(AR) $@ $(OBJ2) -- $(RANLIB) $@ -- --lintlib:: llib-lgetopt.ln -- --llib-lgetopt.ln: $(SRC2) $(EXTRALIBRARYDEPS) -- $(RM) $@ -- $(LINT) $(LINTLIBFLAG)getopt $(LINTFLAGS) $(SRC2) -- - js.o : js.c $(CWNNETCSRC)/bdic.c $(CWNNETCSRC)/pwd.c $(CWNNETCSRC)/gethinsi.c - - lint: ---- FreeWnn-1.1.1-a017/Xsi/cWnn/jserver/Makefile.in.xx 2005-06-15 16:19:54.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/jserver/Makefile.in 2005-06-15 16:20:03.000000000 +0200 -@@ -50,8 +50,8 @@ - OBJ0= de.o - OBJ1= de_vars.o dispatch.o do_dic_env.o do_dic_no.o do_filecom.o error.o jbiki.o jbiki_b.o jishoop.o rd_jishoop.o readfile.o b_index.o jishosub.o jmt0.o malloc.o kai_area.o mknode0.o mknode1.o mknode2.o renbn_kai.o bnsetu_kai.o daibn_kai.o jikouho.o jikouho_d.o fzk.o atojis.o get_kaiarea.o snd_rcv.o do_henkan.o do_henkan1.o do_env.o do_hindo_s.o initjserv.o hinsi_list.o sisheng.o w_string.o - --SRC2= $(CWNNJLIBSRC)/getopt.c --OBJ2= getopt.o -+SRC2= -+OBJ2= - SRC3= $(CWNNJLIBSRC)/wnnerrmsg.c - OBJ3= wnnerrmsg.o - ---- FreeWnn-1.1.1-a017/Xsi/kWnn/jlib/Makefile.in.xx 2005-06-15 16:24:30.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/kWnn/jlib/Makefile.in 2005-06-15 16:24:46.000000000 +0200 -@@ -38,7 +38,7 @@ - - LIB_MT_DEFINES = LibraryMTDefines - --LINKS = getopt.c jl.c js.c wnnerrmsg.c -+LINKS = jl.c js.c wnnerrmsg.c - JLIBDEFINES = -DWRITE_CHECK - INCLUDES = -I$(KWNNINCLUDESRC) -I$(TOP) - DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) $(CWNNLANGDEF) $(JLIBDEFINES) -@@ -52,8 +52,8 @@ - - OBJ1= js.o wnnerrmsg.o jl.o - --SRC2= getopt.c --OBJ2= getopt.o -+SRC2= -+OBJ2= - SRC3= $(KWNNETCSRC)/msg.c - OBJ3= msg.o - SRC4= $(KWNNETCSRC)/strings.c -@@ -94,17 +94,6 @@ - - includes:: $(LINKS) - --getopt.c: $(WNNJLIBSRC)/getopt.c -- $(RM) $@ -- $(LN) $? $@ -- --includes:: getopt.c -- --depend:: getopt.c -- --clean:: -- $(RM) getopt.c -- - jl.c: $(WNNJLIBSRC)/jl.c - $(RM) $@ - $(LN) $? $@ -@@ -138,19 +127,6 @@ - clean:: - $(RM) wnnerrmsg.c - --all:: libgetopt.a -- --libgetopt.a: $(OBJ2) $(EXTRALIBRARYDEPS) -- $(RM) $@ -- $(AR) $@ $(OBJ2) -- $(RANLIB) $@ -- --lintlib:: llib-lgetopt.ln -- --llib-lgetopt.ln: $(SRC2) $(EXTRALIBRARYDEPS) -- $(RM) $@ -- $(LINT) $(LINTLIBFLAG)getopt $(LINTFLAGS) $(SRC2) -- - js.o : js.c $(KWNNETCSRC)/bdic.c $(KWNNETCSRC)/pwd.c $(KWNNETCSRC)/gethinsi.c - - lint: ---- FreeWnn-1.1.1-a017/Xsi/kWnn/jserver/Makefile.in.xx 2005-06-15 16:28:10.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/kWnn/jserver/Makefile.in 2005-06-15 16:28:19.000000000 +0200 -@@ -48,8 +48,8 @@ - OBJ0= de.o - OBJ1= de_vars.o dispatch.o do_dic_env.o do_dic_no.o do_filecom.o error.o jbiki.o jbiki_b.o jishoop.o rd_jishoop.o readfile.o b_index.o jishosub.o jmt0.o malloc.o kai_area.o mknode0.o mknode1.o mknode2.o renbn_kai.o bnsetu_kai.o daibn_kai.o jikouho.o jikouho_d.o fzk.o atojis.o get_kaiarea.o snd_rcv.o do_henkan.o do_henkan1.o do_env.o do_hindo_s.o initjserv.o hinsi_list.o sisheng.o w_string.o - --SRC2= $(KWNNJLIBSRC)/getopt.c --OBJ2= getopt.o -+SRC2= -+OBJ2= - SRC3= $(KWNNJLIBSRC)/wnnerrmsg.c - OBJ3= wnnerrmsg.o - ---- FreeWnn-1.1.1-a017/Xsi/Wnn/romkan/rk_modread.c.xx 2005-06-15 16:36:32.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/romkan/rk_modread.c 2005-06-15 16:37:09.000000000 +0200 -@@ -37,6 +37,7 @@ - ***********************************************************************/ - /* Version 3.0 - */ -+#include - #include "rk_header.h" - #include "rk_extvars.h" - #ifdef WNNDEFAULT -@@ -110,6 +111,7 @@ - if (!mystrcmp (hyo[i].name, wd)) - return (i); - ERRMOD (9); -+ exit(1); - /*NOTREACHED*/} - - /** モード表の読み込み */ ---- FreeWnn-1.1.1-a017/Xsi/PubdicPlus/pod.c.xx 2005-06-15 16:35:54.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/PubdicPlus/pod.c 2005-06-15 16:36:02.000000000 +0200 -@@ -1361,6 +1361,7 @@ - } - } - -+void - shrinkargs (argv, n, count) - char **argv; - int n, count; ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/initjserv.c.xx 2005-06-15 16:54:09.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/initjserv.c 2005-06-15 16:55:02.000000000 +0200 -@@ -428,7 +428,7 @@ - return (num); - case 'd': - case 'D': -- return (atoi (*(st + 1))); -+ return atoi (st + 1); - case 'o': - case 'O': - sscanf (st + 1, "%o", &num); ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/malloc.c.xx 2005-06-15 16:55:19.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/malloc.c 2005-06-15 16:56:24.000000000 +0200 -@@ -42,13 +42,7 @@ - #undef realloc - #undef free - --#ifdef hpux --extern void *malloc (size_t); --extern void free (void *); --extern void *realloc (void *, size_t); --extern void *calloc (size_t, size_t); --#else --#endif /* hpux */ -+#include - - #ifdef hpux - void * ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jlib.V3/jlv3.c.xx 2005-06-15 17:02:52.000000000 +0200 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib.V3/jlv3.c 2005-06-15 17:03:22.000000000 +0200 -@@ -52,6 +52,9 @@ - - - #include -+#include -+#include -+#include - #include - #include - #include diff --git a/FreeWnn-include.patch b/FreeWnn-include.patch index 5137639..a74c837 100644 --- a/FreeWnn-include.patch +++ b/FreeWnn-include.patch @@ -1,7 +1,6 @@ -diff -pur FreeWnn-1.1.1-a017-547/Xsi/PubdicPlus/ctopd.c FreeWnn-1.1.1-a017/Xsi/PubdicPlus/ctopd.c ---- FreeWnn-1.1.1-a017-547/Xsi/PubdicPlus/ctopd.c 2000-02-23 16:32:03.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/PubdicPlus/ctopd.c 2005-09-22 14:14:02.000000000 +0200 -@@ -25,6 +25,7 @@ static char rcsid[] = "$Id: ctopd.c,v 1. +--- BUILD/FreeWnn-1.1.1-a021/PubdicPlus/ctopd.c ++++ BUILD/FreeWnn-1.1.1-a021/PubdicPlus/ctopd.c +@@ -25,6 +25,7 @@ #endif #include @@ -9,10 +8,9 @@ diff -pur FreeWnn-1.1.1-a017-547/Xsi/PubdicPlus/ctopd.c FreeWnn-1.1.1-a017/Xsi/P static char *program; -diff -pur FreeWnn-1.1.1-a017-547/Xsi/PubdicPlus/wtopd.c FreeWnn-1.1.1-a017/Xsi/PubdicPlus/wtopd.c ---- FreeWnn-1.1.1-a017-547/Xsi/PubdicPlus/wtopd.c 2000-02-23 16:32:03.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/PubdicPlus/wtopd.c 2005-09-22 14:12:49.000000000 +0200 -@@ -25,6 +25,8 @@ static char rcsid[] = "$Id: wtopd.c,v 1. +--- BUILD/FreeWnn-1.1.1-a021/PubdicPlus/wtopd.c ++++ BUILD/FreeWnn-1.1.1-a021/PubdicPlus/wtopd.c +@@ -25,6 +25,8 @@ #endif #include @@ -21,15 +19,53 @@ diff -pur FreeWnn-1.1.1-a017-547/Xsi/PubdicPlus/wtopd.c FreeWnn-1.1.1-a017/Xsi/P static char *program; -diff -pur FreeWnn-1.1.1-a017-547/Xsi/Wnn/uum/ttyfdslot.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/ttyfdslot.c ---- FreeWnn-1.1.1-a017-547/Xsi/Wnn/uum/ttyfdslot.c 2000-02-23 16:31:45.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/ttyfdslot.c 2005-09-22 14:22:49.000000000 +0200 -@@ -37,6 +37,8 @@ - #if defined(BSD42) && (! defined(BSD43)) || defined(linux) +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/basic_op.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/basic_op.c +@@ -48,6 +48,7 @@ + # include + # endif + #endif /* STDC_HEADERS */ ++#include + #include "jllib.h" + #include "commonhd.h" + #include "sdefine.h" +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/hinsi.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/hinsi.c +@@ -30,6 +30,7 @@ + */ #include +#include -+#include - #define SLOTSIZ 32 + #include "commonhd.h" + #include "sdefine.h" + #include "sheader.h" +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/jikouho.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/jikouho.c +@@ -30,6 +30,7 @@ + */ - char *ttyname (); + #include ++#include + #include "jllib.h" + #include "commonhd.h" + #include "sdefine.h" +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/printf.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/printf.c +@@ -30,6 +30,7 @@ + */ + + #include ++#include + #include "commonhd.h" + #include "sdefine.h" + #include "sheader.h" +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/touroku.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/touroku.c +@@ -32,6 +32,7 @@ + /* 登録のためのルーチン */ + + #include ++#include + #include "jllib.h" + #include "commonhd.h" + #include "sdefine.h" diff --git a/FreeWnn-lib64.patch b/FreeWnn-lib64.patch deleted file mode 100644 index 4dd5543..0000000 --- a/FreeWnn-lib64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- FreeWnn-1.1.1-a017/Xsi/makerule.mk.in 2002/03/15 11:10:47 1.1 -+++ FreeWnn-1.1.1-a017/Xsi/makerule.mk.in 2002/03/15 11:11:14 -@@ -90,7 +90,7 @@ - ALLDEFINES = $(INCLUDES) -DFUNCPROTO=15 -DNARROWPROTO $(DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) --LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) -L/usr/lib/termcap -+LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) -L@libdir@/termcap - - CCLINK = $(CC) - diff --git a/FreeWnn-noroot.patch b/FreeWnn-noroot.patch index 1c208a1..6886adb 100644 --- a/FreeWnn-noroot.patch +++ b/FreeWnn-noroot.patch @@ -1,50 +1,50 @@ ---- FreeWnn-1.1.1-a017/Xsi/Contrib/dic/gerodic/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Contrib/dic/gerodic/Makefile.in -@@ -62,9 +62,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/Contrib/dic/gerodic/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Contrib/dic/gerodic/Makefile.in +@@ -67,9 +67,7 @@ install:: ${OBJ} @if [ -d $(DESTDIR)$(GERODIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(GERODIR)); fi - chown ${WNNOWNER} $(DESTDIR)$(GERODIR) -- @INSTALL@ $(INSTALLFLAGS) $(INSTDATFLAGS) -o ${WNNOWNER} ${OBJ} $(DESTDIR)$(GERODIR) +- $(INSTALL) $(INSTDATFLAGS) $(LOCAL_INSTFLAGS) ${OBJ} $(DESTDIR)$(GERODIR) - ${WNNTOUCH} $(DESTDIR)$(GERODIR)/${OBJ} -+ @INSTALL@ $(INSTALLFLAGS) $(INSTDATFLAGS) ${OBJ} $(DESTDIR)$(GERODIR) ++ $(INSTALL) $(INSTDATFLAGS) ${OBJ} $(DESTDIR)$(GERODIR) clean:: $(RM) ${OBJ} ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/Makefile.in +--- BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/Makefile.in @@ -36,7 +36,7 @@ - JSERVERDEFINES = -DJSERVER -DWRITE_CHECK - INCLUDES = -I$(WNNINCLUDESRC) -I$(TOP) - DEFINES = $(WNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) --LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(WNNOWNER) + top_builddir = @top_builddir@ + + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) +LOCAL_INSTFLAGS = - SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(JWNNLANG)/jserverrc\" - HINSIDEFINES = -DHINSIDATA_FILE=\"/$(JWNNLANG)/hinsi.data\" ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/Makefile.in -@@ -35,7 +35,7 @@ + JSERVERDEFINES = -DJSERVER -DWRITE_CHECK + INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) -I$(srcdir) +--- BUILD/FreeWnn-1.1.1-a021/Wnn/jutil/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/jutil/Makefile.in +@@ -37,7 +37,7 @@ + INSTALL = @INSTALL@ $(INSTALLFLAGS) + LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + LT_LD = $(LIBTOOL) --mode=link $(CCLINK) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = - INCLUDES = -I$(WNNINCLUDESRC) + INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) DEFINES = $(WNNDEFINES) $(WNNLANGDEF) -- INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) -o $(WNNOWNER) -+ INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) - HINSIDEFINE = -DHINSIDATA_FILE=\"/$(JWNNLANG)/hinsi.data\" +--- BUILD/FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in +@@ -35,7 +35,7 @@ + WNNJUTILOBJ = $(top_builddir)/Wnn/jutil - CLIENTPROGRAMS = wnnstat wnnkill wddel wdreg ---- FreeWnn-1.1.1-a017/Xsi/Wnn/pubdicplus/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/pubdicplus/Makefile.in -@@ -33,7 +33,7 @@ + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = - INSTALL = @INSTALL@ - -- INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER) -+ INSTALLFLAGS = $(INSTLIBFLAGS) - ATOD = $(WNNJUTILSRC)/atod - ATOF = $(WNNJUTILSRC)/atof - WNNTOUCH = $(WNNJUTILSRC)/wnntouch -@@ -371,8 +371,7 @@ + INCLUDES = -I$(top_builddir) + ATOD = $(WNNJUTILOBJ)/atod +@@ -377,8 +377,7 @@ install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(JWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -54,71 +54,71 @@ done install:: $(DIC) ---- FreeWnn-1.1.1-a017/Xsi/Wnn/uum/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/Makefile.in -@@ -36,7 +36,7 @@ - UUMOWNER = root - INCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANSRC) - DEFINES = $(SIGNAL_DEFINES) $(WNNDEFINES) $(WNNLANGDEF) +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/Makefile.in +@@ -35,7 +35,7 @@ + VPATH = @srcdir@ + + INSTALL = @INSTALL@ $(INSTALLFLAGS) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) +LOCAL_INSTFLAGS = - LOCAL_LIBRARIES = $(WNNJLIB) $(WNNCONVLIB) - SRC1= epilogue.c header.c kensaku.c kuten.c jis_in.c prologue.c touroku.c jikouho.c jutil.c w_string.c printf.c termio.c hinsi.c termcap.c ttyfdslot.c setutmp.c redraw.c history.c key_bind.c screen.c basic_op.c uif.c cursor.c jhlp.c select_ele.c inspect.c wnnrc_op.c functions.c ---- FreeWnn-1.1.1-a017/Xsi/Wnn/wnncons/dic/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/wnncons/dic/Makefile.in + UUMOWNER = root + INCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANSRC) -I$(top_builddir) +--- BUILD/FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in @@ -33,7 +33,7 @@ + top_builddir = ../../.. - INSTALL = @INSTALL@ + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = -- INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER) -+ INSTALLFLAGS = $(INSTLIBFLAGS) ATOD = $(WNNJUTILSRC)/atod WNNTOUCH = $(WNNJUTILSRC)/wnntouch - HINSI = $(WNNJDSRC)/hinsi.data ---- FreeWnn-1.1.1-a017/Xsi/Xwnmo/xjutil/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Xwnmo/xjutil/Makefile.in -@@ -22,7 +22,7 @@ +@@ -86,7 +86,7 @@ + set +x; \ + else (set -x; \ + $(INSTALL) $(INSTDATFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNWNNCONSDICDIR); \ +- $(WNNTOUCH) $(DESTDIR)$(JWNNWNNCONSDICDIR)/$$i); fi \ ++ ); fi \ + done - include @top_srcdir@/makerule.mk + depend:: +--- BUILD/FreeWnn-1.1.1-a021/Xwnmo/xjutil/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Xwnmo/xjutil/Makefile.in +@@ -26,7 +26,7 @@ + top_builddir = ../.. + + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = --LOCAL_INSTFLAGS = $(INSTBINFLAGS) -o $(WNNOWNER) -+LOCAL_INSTFLAGS = INCLUDES = -I. $(XWNMOINCLUDES) -I$(XWNMOSRC) - DEPLIBS = $(XWNMOJLIB) ---- FreeWnn-1.1.1-a017/Xsi/Xwnmo/xwnmo/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/Xwnmo/xwnmo/Makefile.in -@@ -22,7 +22,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/Makefile.in +@@ -26,7 +26,7 @@ + top_builddir = ../.. - include @top_srcdir@/makerule.mk + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = --LOCAL_INSTFLAGS = $(INSTBINFLAGS) -o $(WNNOWNER) -+LOCAL_INSTFLAGS = INCLUDES = $(XWNMOINCLUDES) - DEPLIBS = $(XWNMOJLIB) ---- FreeWnn-1.1.1-a017/Xsi/cWnn/cdic/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/cdic/Makefile.in -@@ -25,7 +25,7 @@ - include @top_srcdir@/makerule.mk +--- BUILD/FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in +@@ -31,7 +31,7 @@ + CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil - INSTALL = @INSTALL@ --INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER) -+INSTALLFLAGS = $(INSTLIBFLAGS) + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = - ATOD = $(CWNNJUTILSRC)/catod - ATOF = $(CWNNJUTILSRC)/catof -@@ -34,7 +34,7 @@ - # HINSI = ./cixing.data - FZK_FLAG = - -- INSTALLFLAGS = -m 644 -o $(WNNOWNER) -+ INSTALLFLAGS = -m 644 - - FULL = full.con - FULLR = full.conR -@@ -69,8 +69,7 @@ + ATOD = $(CWNNJUTILOBJ)/catod + ATOF = $(CWNNJUTILOBJ)/catof +@@ -85,8 +85,7 @@ install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(CWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -128,49 +128,40 @@ done install:: $(ALLTGT) ---- FreeWnn-1.1.1-a017/Xsi/cWnn/jserver/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/jserver/Makefile.in -@@ -36,7 +36,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/cWnn/jserver/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/cWnn/jserver/Makefile.in +@@ -38,7 +38,7 @@ JSERVERDEFINES = -DJSERVER -DWRITE_CHECK - INCLUDES = -I$(CWNNINCLUDESRC) -I$(TOP) + INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir) DEFINES = $(CWNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) $(CWNNLANGDEF) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(WNNOWNER) +LOCAL_INSTFLAGS = SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(CWNNLANG)/cserverrc\" HINSIDEFINE = -DHINSIDATA_FILE=\"/$(CWNNLANG)/cixing.data\" TSERVERINITDEF = -DSERVER_INIT_FILE=\"/$(TWNNLANG)/tserverrc\" ---- FreeWnn-1.1.1-a017/Xsi/cWnn/jutil/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/jutil/Makefile.in -@@ -32,7 +32,7 @@ - include @top_srcdir@/makerule.mk +--- BUILD/FreeWnn-1.1.1-a021/cWnn/jutil/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/cWnn/jutil/Makefile.in +@@ -36,7 +36,7 @@ + INSTALL = @INSTALL@ $(INSTALLFLAGS) + LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + LT_LD = $(LIBTOOL) --mode=link $(CCLINK) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = - INSTALL = @INSTALL@ --INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) -o $(WNNOWNER) -+INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) - - INCLUDES = -I$(CWNNINCLUDESRC) + INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir) DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) ---- FreeWnn-1.1.1-a017/Xsi/cWnn/tdic/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/tdic/Makefile.in -@@ -25,7 +25,7 @@ - include @top_srcdir@/makerule.mk +--- BUILD/FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in +@@ -31,7 +31,7 @@ + CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil INSTALL = @INSTALL@ --INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER) -+INSTALLFLAGS = $(INSTLIBFLAGS) +-INSTALLFLAGS = -o $(WNNOWNER) ++INSTALLFLAGS = - ATOD = $(CWNNJUTILSRC)/catod - ATOF = $(CWNNJUTILSRC)/catof -@@ -34,7 +34,7 @@ - # HINSI = ./cixing.data - FZK_FLAG = - -- INSTALLFLAGS = -m 644 -o $(WNNOWNER) -+ INSTALLFLAGS = -m 644 - - FULL = full.con - FULLR = full.conR -@@ -69,8 +69,7 @@ + ATOD = $(CWNNJUTILOBJ)/catod + ATOF = $(CWNNJUTILOBJ)/catof +@@ -85,8 +85,7 @@ install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(TWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -180,59 +171,51 @@ done install:: $(ALLTGT) ---- FreeWnn-1.1.1-a017/Xsi/cWnn/uum/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/cWnn/uum/Makefile.in -@@ -36,7 +36,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/cWnn/uum/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/cWnn/uum/Makefile.in +@@ -37,7 +37,7 @@ UUMOWNER = root - INCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANSRC) + INCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANSRC) -I$(top_builddir) DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) -+LOCAL_INSTFLAGS = - LOCAL_LIBRARIES = $(CWNNJLIB) $(CWNNCONVLIB) ++LOCAL_INSTFLAGS = + LOCAL_LIBRARIES = $(CWNNJLIB) $(CWNNCONVLIB) @LIBS@ HDRS= buffer.h cvtcode.h sdefine.h sheader.h ---- FreeWnn-1.1.1-a017/Xsi/kWnn/jserver/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/kWnn/jserver/Makefile.in -@@ -36,7 +36,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in +@@ -38,7 +38,7 @@ JSERVERDEFINES = -DJSERVER -DWRITE_CHECK - INCLUDES = -I$(KWNNJSERVERSRC) -I$(KWNNINCLUDESRC) -I$(TOP) + INCLUDES = -I$(KWNNJSERVERSRC) -I$(KWNNINCLUDESRC) -I$(top_builddir) DEFINES = $(KWNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) $(KWNNLANGDEF) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(WNNOWNER) +LOCAL_INSTFLAGS = SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(KWNNLANG)/kserverrc\" HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\" + WRAPLIB = @WRAPLIB@ +--- BUILD/FreeWnn-1.1.1-a021/kWnn/jutil/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/kWnn/jutil/Makefile.in +@@ -39,7 +39,7 @@ ---- FreeWnn-1.1.1-a017/Xsi/kWnn/jutil/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/kWnn/jutil/Makefile.in -@@ -35,7 +35,7 @@ - - INCLUDES = -I$(KWNNINCLUDESRC) + INCLUDES = -I$(KWNNINCLUDESRC) -I$(top_builddir) DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) -- INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) -o $(WNNOWNER) -+ INSTALLFLAGS = $(INSTBINFLAGS) $(INSTPGMFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\" CLIENTPROGRAMS = kwnnstat kwnnkill kwddel kwdreg ---- FreeWnn-1.1.1-a017/Xsi/kWnn/kdic/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/kWnn/kdic/Makefile.in -@@ -25,14 +25,14 @@ - include @top_srcdir@/makerule.mk +--- BUILD/FreeWnn-1.1.1-a021/kWnn/kdic/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/kWnn/kdic/Makefile.in +@@ -31,7 +31,7 @@ + KWNNJUTILOBJ = $(top_builddir)/kWnn/jutil INSTALL = @INSTALL@ --INSTALLFLAGS = $(INSTLIBFLAGS) -o $(WNNOWNER) -+INSTALLFLAGS = $(INSTLIBFLAGS) - ATOD = $(KWNNJUTILSRC)/katod - ATOF = $(KWNNJUTILSRC)/katof - WNNTOUCH = $(KWNNJUTILSRC)/kwnntouch - HINSI = $(KWNNKDSRC)/hinsi.data - FZK_FLAG = +-INSTALLFLAGS = -o $(WNNOWNER) ++INSTALLFLAGS = -- INSTALLFLAGS = -m 644 -o $(WNNOWNER) -+ INSTALLFLAGS = -m 644 - - FULL = full.fzk - -@@ -63,8 +63,7 @@ + ATOD = $(KWNNJUTILOBJ)/katod + ATOF = $(KWNNJUTILOBJ)/katof +@@ -76,8 +76,7 @@ install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(KWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -242,14 +225,14 @@ done install:: $(ALLTGT) ---- FreeWnn-1.1.1-a017/Xsi/kWnn/uum/Makefile.in -+++ FreeWnn-1.1.1-a017/Xsi/kWnn/uum/Makefile.in -@@ -36,7 +36,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/kWnn/uum/Makefile.in ++++ BUILD/FreeWnn-1.1.1-a021/kWnn/uum/Makefile.in +@@ -37,7 +37,7 @@ UUMOWNER = root - INCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANSRC) + INCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANSRC) -I$(top_builddir) DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) +LOCAL_INSTFLAGS = - LOCAL_LIBRARIES = $(KWNNJLIB) $(KWNNCONVLIB) + LOCAL_LIBRARIES = $(KWNNJLIB) $(KWNNCONVLIB) @LIBS@ HDRS= buffer.h cvtcode.h sdefine.h sheader.h diff --git a/FreeWnn-prototypes.patch b/FreeWnn-prototypes.patch new file mode 100644 index 0000000..ce9c95d --- /dev/null +++ b/FreeWnn-prototypes.patch @@ -0,0 +1,302 @@ +--- Wnn/etc/pwd.c ++++ Wnn/etc/pwd.c +@@ -61,6 +61,7 @@ + JS_STATIC void new_pwd (char* src, char* encd); + JS_STATIC int check_pwd (char* src, char* encd); + ++extern char* crypt (const char *,const char *); + JS_STATIC void + new_pwd (char* src, char* encd) + { +--- Wnn/include/wnn_string.h ++++ Wnn/include/wnn_string.h +@@ -33,26 +33,26 @@ + #ifndef WNN_STRING_H + #define WNN_STRING_H + +-extern int wnn_sStrcpy (); +-extern int wnn_Sstrcpy (); +-extern void wnn_Sreverse (); +-extern char *wnn_Stos (); +-extern char *wnn_sStrncpy (); +-extern w_char *wnn_Strcat (); +-extern w_char *wnn_Strncat (); +-extern int wnn_Strcmp (); +-extern int wnn_Substr (); +-extern int wnn_Strncmp (); +-extern w_char *wnn_Strncpy (); +-extern int wnn_Strlen (); +-extern w_char *wnn_Strcpy (); +-extern void wnn_delete_w_ss2 (); +-extern int wnn_byte_count (); ++extern int wnn_sStrcpy (register char*,register w_char*); ++extern int wnn_Sstrcpy (w_char*,unsigned char*); ++extern void wnn_Sreverse (w_char*,w_char*); ++extern char *wnn_Stos (w_char*); ++extern char *wnn_sStrncpy (register char*,register w_char*,int); ++extern w_char *wnn_Strcat (register w_char*,register w_char*); ++extern w_char *wnn_Strncat (register w_char*,register w_char*,int); ++extern int wnn_Strcmp (register w_char*,register w_char*); ++extern int wnn_Substr (register w_char*,register w_char*); ++extern int wnn_Strncmp (register w_char*,register w_char*,int); ++extern w_char *wnn_Strncpy (register w_char*,register w_char*,int); ++extern int wnn_Strlen (register w_char*); ++extern w_char *wnn_Strcpy (register w_char*,register w_char*); ++extern void wnn_delete_w_ss2 (register w_char*,int); ++extern int wnn_byte_count (register int); + #ifndef JS +-extern int check_pwd (); ++extern int check_pwd (char*,char*); + #endif + #ifdef CHINESE +-extern int wnn_Sstrcat (); ++extern int wnn_Sstrcat (w_char*,unsigned char*); + #endif + + #endif /* WNN_STRING_H */ +--- Wnn/jutil/atod.c ++++ Wnn/jutil/atod.c +@@ -57,6 +57,7 @@ + #if HAVE_UNISTD_H + # include + #endif ++#include + + #include "commonhd.h" + #include "wnn_config.h" +@@ -70,19 +71,24 @@ + #include "wnn_string.h" + #include "wnn_os.h" + +-extern int wnn_loadhinsi (), init_heap (), little_endian (), Sorted (), asshuku (), revdic (); +-extern void ujis_header (), read_ujis (), reverse_yomi (), create_rev_dict (), +-uniq_je (), sort_if_not_sorted (), output_header (), udytoS (), output_ri (), exit1 (), new_pwd (), rev_short_fun (), rev_w_char (); ++extern int wnn_loadhinsi (unsigned char*), init_heap (int,int,int,int,FILE*), little_endian (), Sorted (register char*,register int,int,int (*sort_fun)(char*,char*)), asshuku (int), revdic (struct JT *,int); ++#ifdef CHINESE ++extern void ujis_header (int*); ++#else ++extern void ujis_header (void); ++#endif ++extern void read_ujis (int,int,int), reverse_yomi (void), create_rev_dict (void), ++uniq_je (int(*func)(char*,char*)), sort_if_not_sorted (void), output_header (FILE*,struct JT*,struct wnn_file_head*), udytoS (w_char*,int,char*,struct uind1*), output_ri (FILE*), exit1 (void), new_pwd (char*,char*), rev_short_fun (w_char*), rev_w_char (w_char*,int); + extern + #ifdef BDIC_WRITE_CHECK + int + #else + void + #endif +- put_n_EU_str (); +-static void ujistoud (), output_dic_index (), usage (), sdic_sort (), +-ujistosd (), not_enough_area (), get_pwd (), output_hindo (), output_hinsi (), output_kanji (), rev_dic_data (), set_pter1 (), output_comment (), output_hinsi_list (); +-void upd_kanjicount (), output_dic_data (); ++ put_n_EU_str (FILE*,w_char*,int); ++static void ujistoud (void), output_dic_index (void), usage (void), sdic_sort (void), ++ujistosd (int,int), not_enough_area (void), get_pwd (char*,char*), output_hindo (FILE*), output_hinsi (FILE*), output_kanji (FILE*), rev_dic_data (void), set_pter1 (void), output_comment (FILE*), output_hinsi_list (FILE*); ++void upd_kanjicount (int), output_dic_data (void); + + /* Switcher variable between UD and SD */ + +@@ -115,7 +121,7 @@ + int tnum = 0; + struct uind2 *uhopter; + +-char *hinsi_file_name = NULL; ++unsigned char *hinsi_file_name = NULL; + + + void +@@ -221,16 +227,16 @@ + } + } + +-extern int sort_func_sdic (); +-extern int sort_func_je (); ++extern int sort_func_sdic (char*,char*); ++extern int sort_func_je (char*,char*); + FILE *ofpter; + + int + main (int argc, char** argv) + { + char *cswidth_name; +- extern char *get_cswidth_name (); +- extern void set_cswidth (); ++ extern char *get_cswidth_name (register char*); ++ extern void set_cswidth (register unsigned int); + + com_name = argv[0]; + init (argc, argv); +@@ -301,7 +307,6 @@ + exit (0); + } + +- + w_char * + addyomient (int tn, w_char* yomi) + { +@@ -442,7 +447,7 @@ + { + if (which_dict == WNN_UD_DICT) + { +- fprintf (stderr, " tnum = %d\n ind2= %d\n kanji = %d\n", tnum, (char *) uhopter - (char *) hostart, kanjicount); ++ fprintf (stderr, " tnum = %d\n ind2= %d\n kanji = %d\n", tnum, (int)((char *) uhopter - (char *) hostart), kanjicount); + jt.maxtable = tnum; + jt.maxhontai = (char *) uhopter - (char *) hostart; + jt.maxri2 = jt.maxri1[D_YOMI] = jt.maxri1[D_KANJI] = 0; +@@ -470,7 +475,7 @@ + } + else + { +- fprintf (stderr, "node_count = %d ind= %d\n kanji = %d\n", node_count, (char *) hopter - (char *) hostart, kanjicount); ++ fprintf (stderr, "node_count = %d ind= %d\n kanji = %d\n", node_count, (int)((char *) hopter - (char *) hostart), kanjicount); + jt.maxtable = 0; + jt.maxhontai = (char *) hopter - (char *) hostart; + jt.maxri2 = jt.maxri1[D_YOMI] = jt.maxri1[D_KANJI] = 0; +--- Wnn/romkan/rk_bltinfn.c ++++ Wnn/romkan/rk_bltinfn.c +@@ -371,7 +371,7 @@ + to_digit (in, base, outp) + letter in, base, **outp; + { +- letter c, vtol (); ++ letter c, vtol (letter); + + if (c = in, c /= base) + to_digit (c, base, outp); +--- Wnn/romkan/rk_fundecl.h ++++ Wnn/romkan/rk_fundecl.h +@@ -39,12 +39,12 @@ + ***********************************************************************/ + /* Version 3.0 + */ +-extern letter *ltrncpy (); +-extern int ltrcmp (), ltrncmp (); ++extern letter *ltrncpy (letter*,letter*,int); ++extern int ltrcmp (letter*,letter*), ltrncmp (letter*,letter*,int); + +-extern int romkan_init (), romkan_init2 (), romkan_init3 (); +-extern letter romkan_getc (), *romkan_henkan (), romkan_next (); +-extern letter romkan_ungetc (), romkan_unnext (); +-extern void romkan_clear (); +-extern char *romkan_dispmode (); ++extern int romkan_init (char*,letter,char,letter(*keyinfn)(),int(*bytcntfn)()), romkan_init2 (char*,letter,char,letter(*keyinfn)(),int(*bytcntfn)(),char,char,char), romkan_init3 (char*,letter,letter,letter,letter(*keyinfn)(),int(*bytcntfn)(),int(*kbytcntfn)(),char,int); ++extern letter romkan_getc (void), *romkan_henkan (letter), romkan_next (void); ++extern letter romkan_ungetc (letter), romkan_unnext (letter); ++extern void romkan_clear (void); ++extern char *romkan_dispmode (void); + extern char rk_errstat; /* これは関数ではなく変数 */ +--- Wnn/romkan/rk_main.c ++++ Wnn/romkan/rk_main.c +@@ -91,23 +91,23 @@ + letter saishu_out[OUTSIZ]; + letter delchr, delchr2 = EOLTTR, nisedl; /* DELのキャラクタは二個まで持てる */ + +-modetyp chgmod (), incmod (), decmod (); ++modetyp chgmod (int,modetyp), incmod (int,modetyp), decmod (int,modetyp); + + + /* letterを返す関数の定義及び宣言（一部にはcharのものも混じっている） */ + +-static letter mchedsrc (); +-letter romkan_next (), romkan_unnext (); +-letter romkan_getc (), romkan_ungetc (), *romkan_henkan (); +-letter to_zenalpha (), to_zenhira (), to_zenkata (); ++static letter mchedsrc (int); ++letter romkan_next (void), romkan_unnext (letter); ++letter romkan_getc (void), romkan_ungetc (letter), *romkan_henkan (letter); ++letter to_zenalpha (letter), to_zenhira (letter), to_zenkata (letter); + /* to_zenhira;kata は濁点を持つ文字を一まとめにしない。 */ + +-void BUGreport (); +-static void maeato_henkan (), add_at_eof (), rk_delete (), set_rubout (), mchevl (), codeout_chg (), ltrevlcpy (); +-int match (); +-static int p_eq (), hen_ikisrc (), henkan_ok (), rk_rst (), head_bytecount (); +-extern void readdata (), romkan_reset (), hank_setup (), to_hankata (), to_digit (), dakuadd (), handakuadd (), allchgmod (); +-extern int ltov (); ++void BUGreport (int); ++static void maeato_henkan (letter,letter*,int*), add_at_eof (void), rk_delete (letter), set_rubout (letter*,int,letter), mchevl (letter**,letter*), codeout_chg (void), ltrevlcpy (letter*,letter*); ++int match (void); ++static int p_eq (register letter**,register letter**), hen_ikisrc (int,letter), henkan_ok (void), rk_rst (void), head_bytecount (uns_chr*); ++extern void readdata (letter*,struct dat*,letter**,char*), romkan_reset (void), hank_setup (void), to_hankata (letter,letter**), to_digit (letter,letter,letter**), dakuadd (letter,letter**), handakuadd (letter,letter**), allchgmod (modetyp); ++extern int ltov (letter); + + static letter * + ltrcpy (lp1, lp2) +@@ -426,6 +426,7 @@ + lastoutlen = lastkbflen = 0; + } + ++int romkan_init2 (char*,letter,char,letter(*keyinfn)(),int(*bytcntfn)(),char,char,char); + /** 表を読み込んで変換の初期設定をする。（part 1）*/ + int + romkan_init (modhyo, delchr_, chmoutf, keyinfn, bytcntfn) +@@ -439,6 +440,7 @@ + + #define ifflg(a, b) ((a) ? (b) : 0) + ++int romkan_init3 (char*,letter,letter,letter,letter(*keyinfn)(),int(*bytcntfn)(),int(*kbytcntfn)(),char,int); + /** 表を読み込んで変換の初期設定をする。（part 2: キー入力に対し必ず何か + 返すようにするか、キーバッファをクリアするかどうかなども指定可）*/ + int +--- Wnn/romkan/rk_modread.c ++++ Wnn/romkan/rk_modread.c +@@ -63,17 +63,17 @@ + + #define Terminator 0 /* intの列（naibu[]）の終止コード */ + +-extern char *chrcat (), *strend (), *ename (); ++extern char *chrcat (char*,char), *strend (char*), *ename (char*); + extern void romkan_clear (); + char *modhyopath; + +-static void cond_evl (), mystrcpy (), rd_bcksla (), rd_ctrl (), hyouse (), look_choose (); ++static void cond_evl (char*), mystrcpy (char*,char*), rd_bcksla (register FILE*,char**), rd_ctrl (register FILE*,char**), hyouse (int), look_choose (int**,int); + void choosehyo (); +-static int mystrcmp (), read1tm (), mod_evl (), fnmsrc_tourk (), dspnamsrc_tourk (), +-scan1tm (), modsrc_tourk (), chk_get_int (), pathsrc_tourk (), modnamchk (), ctov (), look_cond (), evlcond (), chkchar_getc (); +-static char codeeval (); +-extern void ERRMOD (), ERMOPN (), BUGreport (); +-extern int filnamchk (); ++static int mystrcmp (char*,char*), read1tm (char**,int), mod_evl (char*), fnmsrc_tourk (char*), dspnamsrc_tourk (char*), ++scan1tm (char**,char*,int), modsrc_tourk (char*,int), chk_get_int (char*,unsigned int*,modetyp), pathsrc_tourk (char*), modnamchk (char*), ctov (char), look_cond (int**,int), evlcond (int**), chkchar_getc (FILE*); ++static char codeeval (register char**); ++extern void ERRMOD (unsigned int), ERMOPN (unsigned int), BUGreport (int); ++extern int filnamchk (char*); + + struct kwdpair + { +@@ -122,6 +122,7 @@ + return (i); + ERRMOD (9); + /*NOTREACHED*/ ++ return 0; + } + + /** モード表の読み込み */ +--- Wnn/romkan/rk_read.c ++++ Wnn/romkan/rk_read.c +@@ -51,16 +51,16 @@ + #include "rk_header.h" + #include "rk_extvars.h" + +-letter onescan (), *rangekettei (); +-char *ename (); ++letter onescan (letter**,letter*), *rangekettei (int,letter*); ++char *ename (char*); + +-extern letter *ltrgrow (), *ltrend (), letterpick (), *ltr1cut (); +-extern char *chrcat (), *strend (); ++extern letter *ltrgrow (letter*,letter*), *ltrend (letter*), letterpick (uns_chr**), *ltr1cut (letter*); ++extern char *chrcat (char*,char), *strend (char*); + +-static int termsscan (), evalandcpy (), eval1cpy (), partscan (), evlis (), atermscan (), serfun (), hensrc_tourk (), blankpass (), modsrcL (), chkL_get_int (); +-static void ERRLIN (), ERHOPN (), readhyo (), ltr1tostr (), ERRHYO (), vchk (), rangeset (), de_bcksla (), listscan (), singleqscan (), doubleqscan (); +-extern void BUGreport (), choosehyo (), readmode (); +-extern int ltrcmp (), ltrstrcmp (), readfnm (), fixednamep (); ++static int termsscan (register letter**,letter*,int), evalandcpy (register letter**,int), eval1cpy (letter**,int,int), partscan (register letter**,register letter*), evlis (int,letter**,int), atermscan (register letter**,register letter*,int), serfun (register letter*), hensrc_tourk (letter*,int), blankpass (register letter**,int), modsrcL (letter*), chkL_get_int (letter*,modetyp*,modetyp); ++static void ERRLIN (unsigned int), ERHOPN (unsigned int), readhyo (int), ltr1tostr (letter,char**), ERRHYO (unsigned int), vchk (letter*), rangeset (int,letter*), de_bcksla (char*,char*), listscan (register letter**,register letter*), singleqscan (letter**,letter*), doubleqscan (letter**,letter*); ++extern void BUGreport (int), choosehyo (void), readmode (char*); ++extern int ltrcmp (letter*,letter*), ltrstrcmp (register letter*,register char*), readfnm (int (*readchar_func) (void),int (*unreadc_func) (int),int (*readstr_func) (char**,int),char**,int*), fixednamep (char*); + + #define IHENSU (1 << 24) /* 内部表現の上位１バイトで、変数を表す */ + #define IKANSU (2 << 24) /* 〃 関数を表す */ diff --git a/FreeWnn-s390x.patch b/FreeWnn-s390x.patch index 625ce3a..298a2dd 100644 --- a/FreeWnn-s390x.patch +++ b/FreeWnn-s390x.patch @@ -1,172 +1,25 @@ -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de.c FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de.c 2000-03-20 17:31:43.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c 2002-11-03 20:25:27.000000000 +0100 -@@ -158,11 +158,11 @@ - - int cur_clp; /** 現在のクライアントの番号 **/ - --static int *all_socks; /** ビットパターン -+static fd_set *all_socks; /** ビットパターン - which jserver to select を保持 **/ --static int *ready_socks; /** データのきているソケットの -+static fd_set *ready_socks; /** データのきているソケットの - ビットパターンを保持 **/ --static int *dummy1_socks, *dummy2_socks; -+static fd_set *dummy1_socks, *dummy2_socks; - - static int no_of_ready_socks; - static int sel_bwidth, /** bit width of all_socks **/ -@@ -171,9 +171,14 @@ - static int nofile; /** No. of files **/ - - #define BINTSIZE (sizeof(int)*8) -+/* - #define sock_set(array,pos) (array[pos/BINTSIZE] |= (1<<(pos%BINTSIZE))) - #define sock_clr(array,pos) (array[pos/BINTSIZE] &= ~(1<<(pos%BINTSIZE))) - #define sock_tst(array,pos) (array[pos/BINTSIZE] & (1<<(pos%BINTSIZE))) -+*/ -+#define sock_set(array,pos) FD_SET(pos,array) -+#define sock_clr(array,pos) FD_CLR(pos,array) -+#define sock_tst(array,pos) FD_ISSET(pos,array) - - struct msg_cat *wnn_msg_cat; - struct msg_cat *js_msg_cat; -@@ -312,7 +317,7 @@ - for (;;) - { - #ifdef DEBUG -- error1 ("main loop: ready_socks = %02X\n", ready_socks); -+ error1 ("main loop: ready_socks = %02lX\n", ready_socks[0]); - #endif - if (get_client () == -1) - break; -@@ -341,11 +346,11 @@ - - nofile = NOFILE; - sel_w = (nofile - 1) / BINTSIZE + 1; -- all_socks = (int *) calloc (sel_w, (sizeof (int))); -- ready_socks = (int *) malloc (sel_w * (sizeof (int))); -- dummy1_socks = (int *) malloc (sel_w * (sizeof (int))); -- dummy2_socks = (int *) malloc (sel_w * (sizeof (int))); -- sel_width = sel_w * sizeof (int); /* byte width */ -+ all_socks = (fd_set *) calloc (sel_w, (sizeof (fd_set))); -+ ready_socks = (fd_set *) malloc (sel_w * (sizeof (fd_set))); -+ dummy1_socks = (fd_set *) malloc (sel_w * (sizeof (fd_set))); -+ dummy2_socks = (fd_set *) malloc (sel_w * (sizeof (fd_set))); -+ sel_width = sel_w * sizeof (fd_set); /* byte width */ - sel_bwidth = sel_width * 8; /* bit width */ - } - -@@ -366,7 +371,7 @@ - xerror ("select error"); - } - #ifdef DEBUG -- error1 ("select OK, ready_socks[0]=%02X, n-r-s=%x\n", ready_socks[0], no_of_ready_socks); -+ error1 ("select OK, ready_socks[0]=%02lX, n-r-s=%x\n", ready_socks[0], no_of_ready_socks); - #endif - } - -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c 2000-02-23 17:08:49.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c 2002-11-03 22:25:09.000000000 +0100 -@@ -134,7 +134,7 @@ - static void do_end (), open_pty (), open_ttyp (), do_main (), exec_cmd (), parse_options (), setsize (), get_rubout (), usage (), change_size (), default_usage (); - - /** メイン */ --void -+int - main (argc, argv) - int argc; - char **argv; -@@ -923,7 +923,7 @@ - - /** メインループ */ - --int sel_ptn; -+fd_set sel_ptn; - int pty_bit; - int tty_bit; - int ptyfd; -@@ -947,7 +947,8 @@ - - pty_bit = 1 << ptyfd; - tty_bit = 1 << ttyfd; -- sel_ptn = pty_bit | tty_bit; -+ FD_SET (ptyfd, &sel_ptn); -+ FD_SET (ttyfd, &sel_ptn); - - if (henkan_off_flag == 0) - { -@@ -1020,8 +1021,9 @@ - static unsigned char *bufend = outbuf; - static unsigned char *bufstart = outbuf; - int n; -- int rfds; -- int i, j, mask; -+ fd_set rfds; -+ int i, j; -+ fd_set mask; - unsigned char *p; - extern int henkan_off_flag; - struct timeval time_out; /* If your OS's select was implemented as -@@ -1063,9 +1065,9 @@ - time_out.tv_usec = 200 * 1000; /* 200 msec 間待つのだゾ! */ - for (rfds = sel_ptn; - #ifdef linux -- (sel_ret = select (20, &rfds, 0, 0, NULL)) < 0 && errno == EINTR; -+ (sel_ret = select (20, &rfds, NULL, NULL, NULL)) < 0 && errno == EINTR; - #else -- (sel_ret = select (20, &rfds, 0, 0, &time_out)) < 0 && errno == EINTR; -+ (sel_ret = select (20, &rfds, NULL, NULL, &time_out)) < 0 && errno == EINTR; - #endif - rfds = sel_ptn) - ; -@@ -1084,7 +1086,7 @@ - */ - } - -- if (rfds & pty_bit) -+ if (FD_ISSET(ptyfd, &rfds)) - { - if ((n = read (ptyfd, buf, BUFSIZ)) <= 0) - { -@@ -1116,13 +1118,13 @@ - p += j; - i -= j; - } -- mask = 1 << ttyfd; -+ FD_SET(ttyfd, &mask); - select (32, 0, &mask, 0, 0); - } - pop_cursor (); - } - } -- if (rfds & tty_bit) -+ if (FD_ISSET(ttyfd, &rfds)) - { - if ((n = read (ttyfd, buf, BUFSIZ)) > 0) - { -@@ -1778,7 +1780,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/error.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/error.c +@@ -82,7 +82,7 @@ + void + error_exit1 (x, y1, y2, y3, y4, y5) + char *x; +- int y1, y2, y3, y4, y5; ++ long y1, y2, y3, y4, y5; { - static unsigned char buf[BUFSIZ]; - int n; -- int rfds; -+ fd_set rfds; - - kk_restore_cursor (); - clr_line_all (); -@@ -1791,7 +1793,7 @@ - write (ptyfd, buf, n); - } - rfds = sel_ptn; -- select (20, &rfds, 0, 0, NULL); -+ select (20, &rfds, NULL, NULL, NULL); - if (rfds & pty_bit) - { - if ((n = read (ptyfd, buf, BUFSIZ)) <= 0) -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Xwnmo/xwnmo/do_socket.c FreeWnn-1.1.1-a017/Xsi/Xwnmo/xwnmo/do_socket.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Xwnmo/xwnmo/do_socket.c 2000-02-23 18:03:22.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Xwnmo/xwnmo/do_socket.c 2002-11-03 20:25:17.000000000 +0100 + /* Need care with buffer size */ + char buf[512]; +@@ -270,7 +270,7 @@ + void + out (x, y1, y2, y3, y4, y5, y6, y7, y8, y9, y10, y11, y12) + char *x; +- int y1, y2, y3, y4, y5, y6, y7, y8, y9, y10, y11, y12; ++ long y1, y2, y3, y4, y5, y6, y7, y8, y9, y10, y11, y12; + { + if (!noisy) + return; +--- BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/do_socket.c ++++ BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/do_socket.c @@ -90,9 +90,9 @@ XIMCmblk *cblk; XIMCmblk *cur_cblk = NULL; @@ -196,22 +49,3 @@ diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Xwnmo/xwnmo/do_socket.c FreeWnn-1.1.1-a017/ extern int read (), write (); ---- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c 2002/11/05 14:57:21 1.1 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c 2002/11/05 14:58:12 -@@ -47,7 +47,7 @@ - void - error_exit1 (x, y1, y2, y3, y4, y5) - char *x; -- int y1, y2, y3, y4, y5; -+ long y1, y2, y3, y4, y5; - { - char buf[512]; - -@@ -112,7 +112,7 @@ - void - error1 (x, y1, y2, y3, y4, y5) - register char *x; -- int y1, y2, y3, y4, y5; -+ long y1, y2, y3, y4, y5; - { - char buf[512]; diff --git a/FreeWnn-sighandler.patch b/FreeWnn-sighandler.patch index eb618b3..8916bf6 100644 --- a/FreeWnn-sighandler.patch +++ b/FreeWnn-sighandler.patch @@ -1,8 +1,8 @@ ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jserver/de.c Mon Mar 20 17:31:43 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c Tue Aug 29 12:06:47 2000 -@@ -185,6 +185,19 @@ - - char cmd_name[80]; +--- BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/de.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/de.c +@@ -212,6 +212,19 @@ + # include + #endif /* HAVE_LIBWRAP */ +#ifndef NOTFORK +static void father_sighandler (const int sig) @@ -19,21 +19,21 @@ + /* No arguments are used. Only options. */ int - main (argc, argv) -@@ -228,14 +241,14 @@ - #ifndef NOTFORK - if (fork ()) + main (int argc, char *argv[]) +@@ -248,14 +261,14 @@ { -- signal (SIGCHLD, _exit); -+ signal (SIGCHLD, father_sighandler); - signal (SIGHUP, SIG_IGN); - signal (SIGINT, SIG_IGN); - signal (SIGQUIT, SIG_IGN); + if (fork ()) + { +- signal (SIGCHLD, _exit); ++ signal (SIGCHLD, father_sighandler); + signal (SIGHUP, SIG_IGN); + signal (SIGINT, SIG_IGN); + signal (SIGQUIT, SIG_IGN); #ifdef SIGTSTP - signal (SIGTSTP, SIG_IGN); + signal (SIGTSTP, SIG_IGN); #endif -- signal (SIGTERM, _exit); -+ signal (SIGTERM, father_sighandler); - pause (); +- signal (SIGTERM, _exit); ++ signal (SIGTERM, father_sighandler); + pause (); + } } - #endif /* !NOTFORK */ diff --git a/FreeWnn-trad_cpp.patch b/FreeWnn-trad_cpp.patch new file mode 100644 index 0000000..e5d4105 --- /dev/null +++ b/FreeWnn-trad_cpp.patch @@ -0,0 +1,52 @@ +--- Wnn/pubdicplus/Makefile.in ++++ Wnn/pubdicplus/Makefile.in +@@ -421,7 +421,7 @@ + $(LN) $? $@ + + std.fzk: fzk.master-.c $(FZK_SRC) +- $(CPP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ ++ $(CPP) -traditional-cpp $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + + full.fzk: $(FZK_SRC) + $(MAKE) FZK_FLAG=-DKANSAI std.fzk +--- cWnn/cdic/Makefile.in ++++ cWnn/cdic/Makefile.in +@@ -63,10 +63,10 @@ + $(DICS): $(HINSI) + + $(FULL):: $(FZK_SRCS) con.master-.c +- $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ ++ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + + $(FULLR):: $(FZK_SRCS) con.masterR-.c +- $(CPP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ ++ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + + # To avoid circular dependency, we don't use 'con.master?.c' + con.master-.c: con.master +--- cWnn/tdic/Makefile.in ++++ cWnn/tdic/Makefile.in +@@ -63,10 +63,10 @@ + $(DICS): $(HINSI) + + $(FULL):: $(FZK_SRCS) con.master-.c +- $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ ++ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + + $(FULLR):: $(FZK_SRCS) con.masterR-.c +- $(CPP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ ++ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + + # To avoid circular dependency, we don't use 'con.master?.c' + con.master-.c: con.master +--- kWnn/kdic/Makefile.in ++++ kWnn/kdic/Makefile.in +@@ -61,7 +61,7 @@ + $(DICS): $(HINSI) + + $(FULL):: $(FZK_SRCS) fzk.master-.c +- $(CPP) -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ ++ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ + + # To avoid circular dependency, we don't use 'fzk.master.c' + fzk.master-.c: fzk.master diff --git a/FreeWnn-uum.patch b/FreeWnn-uum.patch index ab90e6b..ea49bbb 100644 --- a/FreeWnn-uum.patch +++ b/FreeWnn-uum.patch @@ -1,16 +1,6 @@ -diff -ur FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c Wed Feb 23 17:08:49 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c Wed Nov 1 19:33:54 2000 -@@ -638,7 +638,7 @@ - #ifdef SYSVR2 - #define index strchr - #endif /* SYSVR2 */ -- extern char *index (); -+/* extern char *index ();*/ - - strcpy (ostr, default_getoptstr); - strcat (ostr, lang_db->getoptstr); -@@ -1720,7 +1720,7 @@ +--- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/jhlp.c ++++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/jhlp.c +@@ -1755,7 +1755,7 @@ } #endif /* defined(uniosu) */ @@ -19,31 +9,18 @@ diff -ur FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c FreeWnn-1.1.1-a017/Xsi/Wnn/u ptyname (nmbuf, ptynm, ptyno); if (chown (nmbuf, 0, 0) == ERROR) { -diff -ur FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/wnnrc_op.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/wnnrc_op.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/wnnrc_op.c Wed Feb 23 16:31:45 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/wnnrc_op.c Mon Oct 30 23:42:17 2000 -@@ -133,7 +133,7 @@ - struct passwd *u; - extern struct passwd *getpwnam (); - #if defined(SYSVR2) && !defined(AIXV3) -- extern char *strchr (); -+/* extern char *strchr (); */ - #endif /* defined(SYSVR2) && !defined(AIXV3) */ - - if (*s != '~' && *s != '@') -diff -u FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in.~1~ FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in ---- FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in.~1~ Sun Feb 13 10:15:54 2000 -+++ FreeWnn-1.1.1-a017.orig/Xsi/makerule.mk.in Wed Nov 1 19:49:39 2000 -@@ -90,7 +90,7 @@ - ALLDEFINES = $(INCLUDES) -DFUNCPROTO=15 -DNARROWPROTO $(DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) +--- BUILD/FreeWnn-1.1.1-a021/makerule.mk.in ++++ BUILD/FreeWnn-1.1.1-a021/makerule.mk.in +@@ -94,7 +94,7 @@ + CFLAGS = @CFLAGS@ @CDEBUGFLAGS@ $(CCOPTIONS) @ipv6@ @DEFS@ $(ALLDEFINES) + LIBS = @LIBS@ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) --LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) -+LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) -L/usr/lib/termcap +-LDOPTIONS = @CDEBUGFLAGS@ $(CCOPTIONS) ++LDOPTIONS = @CDEBUGFLAGS@ $(CCOPTIONS) -L@libdir@/termcap - CCLINK = $(CC) -@@ -114,7 +114,7 @@ + # +@@ -112,7 +112,7 @@ WNNBINDIR = ${PREFIX}/bin WNNINCDIR = @includedir@ WNNLIBDIR = @libdir@ diff --git a/FreeWnn-warnings.patch b/FreeWnn-warnings.patch index ff7d222..877167d 100644 --- a/FreeWnn-warnings.patch +++ b/FreeWnn-warnings.patch @@ -1,17 +1,6 @@ ---- Wnn/etc/msg.c -+++ Wnn/etc/msg.c -@@ -228,7 +228,7 @@ - register struct msg_bd *bd; - if (cd->msg_bd == 0 || cd->msg_cnt == 0) - return (NULL); -- bd = (struct msg_bd *) bsearch (id, cd->msg_bd, cd->msg_cnt, sizeof (struct msg_bd), _search); -+ bd = (struct msg_bd *) bsearch ((void*)id, cd->msg_bd, cd->msg_cnt, sizeof (struct msg_bd), _search); - if (bd == NULL) - return (NULL); - return (bd->msg); --- Wnn/jlib.V3/jlv3.c +++ Wnn/jlib.V3/jlv3.c -@@ -341,7 +341,7 @@ +@@ -355,7 +355,7 @@ /* READ ONLY SD && hind file is none */ (js_access (jl_env (buf), fn, 4) != -1) && (js_access (jl_env (buf), fn1, 4) == -1)) { @@ -20,7 +9,7 @@ return (-1); if (jl_dic_delete (buf, dic_no) < 0) return (-1); -@@ -351,7 +351,7 @@ +@@ -365,7 +365,7 @@ { rdonly = WNN_DIC_RDONLY; } diff --git a/conflicting-prototypes.patch b/conflicting-prototypes.patch deleted file mode 100644 index 713e718..0000000 --- a/conflicting-prototypes.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jlib/js.c FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/js.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jlib/js.c 2000-03-02 16:32:39.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/js.c 2005-04-13 14:31:12.000000000 +0200 -@@ -86,7 +86,7 @@ - #ifdef hpux - void *malloc (size_t); - #else --char *malloc (); -+void *malloc (size_t); - #endif /* hpux */ - - #ifdef SYSVR2 -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jlib.V3/jlv3.c FreeWnn-1.1.1-a017/Xsi/Wnn/jlib.V3/jlv3.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jlib.V3/jlv3.c 2000-02-23 16:55:40.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib.V3/jlv3.c 2005-04-13 14:31:12.000000000 +0200 -@@ -58,7 +58,7 @@ - #ifdef SYSVR2 - #include - #else --extern char *malloc (); -+extern void *malloc (size_t); - #endif - - #include "jllib.h" -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jutil/atod.c FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/atod.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jutil/atod.c 2000-02-23 16:31:39.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/atod.c 2005-04-13 14:31:12.000000000 +0200 -@@ -94,7 +94,7 @@ - int tnum = 0; - struct uind2 *uhopter; - --char *malloc (); -+void *malloc (size_t); - char *hinsi_file_name = NULL; - - -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/history.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/history.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/history.c 2000-02-23 16:31:43.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/history.c 2005-04-13 14:34:00.000000000 +0200 -@@ -55,7 +55,7 @@ - int - init_history () - { -- char *malloc (); -+ void *malloc (size_t); - int size1; - char *area_pter; - -@@ -93,7 +93,7 @@ - register w_char *wstr; - register int n; - { -- extern char *malloc (); -+ extern void *malloc (size_t); - - if (!history_cunt) - return (0); -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c 2000-02-23 17:08:49.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c 2005-04-13 15:05:29.000000000 +0200 -@@ -125,7 +125,8 @@ - extern char *optarg; - extern int optind; - --extern char *ttyname (), *malloc (), *getenv (); -+extern char *ttyname (), *getenv (); -+extern void *malloc (size_t); - - static void save_signals (); - static void restore_signals (); -@@ -1351,7 +1352,7 @@ - char *value; - { - extern char **environ; -- char *malloc (); -+ void *malloc (size_t); - char **newenv; - register int i, j; - -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/prologue.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/prologue.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/prologue.c 2000-02-23 16:31:44.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/prologue.c 2005-04-13 14:31:12.000000000 +0200 -@@ -122,7 +122,7 @@ - int - allocate_areas () - { -- char *malloc (); -+ void *malloc (size_t); - char *area_start; - char *area_pter; - -@@ -267,7 +267,7 @@ - WnnEnv *save_cur_normal_env = NULL, *save_cur_reverse_env = NULL; - int (*yes_no_func) (); - void (*puts_func) (); -- extern char *malloc (); -+ extern void *malloc (size_t); - - if (first == 0) - { -diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/termcap.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/termcap.c ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/termcap.c 2000-02-23 16:31:44.000000000 +0100 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/termcap.c 2005-04-13 14:31:31.000000000 +0200 -@@ -261,7 +261,7 @@ - { - char *name1; - char *c; -- extern char *malloc (); -+ extern void *malloc (size_t); - - if ((name1 = malloc (strlen (name) + 1024)) == NULL) - { diff --git a/fwnn-rpmlintrc b/fwnn-rpmlintrc new file mode 100644 index 0000000..a170d66 --- /dev/null +++ b/fwnn-rpmlintrc @@ -0,0 +1,5 @@ +# This line is mandatory to access the configuration functions +from Config import * + +addFilter(".*shlib-policy-name-error.*") +addFilter(".*devel-file-in-non-devel-package.*") diff --git a/fwnn.changes b/fwnn.changes index 35aa500..2c0fe74 100644 --- a/fwnn.changes +++ b/fwnn.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 15 17:35:59 CET 2010 - ro@suse.de + +- update to FreeWnn-1.1.1-a021 +- disable parallel building again (not solid) +- fix build by using "-traditional-cpp" for "gcc -E" + ------------------------------------------------------------------- Fri Dec 18 15:47:12 CET 2009 - jengelh@medozas.de diff --git a/fwnn.spec b/fwnn.spec index 4a68165..49277df 100644 --- a/fwnn.spec +++ b/fwnn.spec @@ -1,7 +1,7 @@ # -# spec file for package fwnn (Version 1.1.1a017) +# spec file for package fwnn (Version 1.1.1a021) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,15 +21,15 @@ Name: fwnn BuildRequires: ncurses-devel termcap %define base_version 1.1.1 -%define alpha_version a017 +%define alpha_version a021 License: GPLv2+ Group: System/I18n/Japanese Requires: fwnncom Conflicts: wnn6 PreReq: /usr/sbin/useradd %insserv_prereq %fillup_prereq AutoReqProv: on -Version: 1.1.1a017 -Release: 680 +Version: 1.1.1a021 +Release: 1 Url: http://www.freewnn.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: FreeWnn Japanese Input System--Server Only @@ -38,19 +38,19 @@ Source1: rcfwnn Source2: rcfcwnn Source3: rcftwnn Source4: rcfkwnn +Source99: fwnn-rpmlintrc Patch0: FreeWnn-fsstnd.patch Patch1: FreeWnn-ja.patch Patch2: FreeWnn-noroot.patch Patch3: FreeWnn-sighandler.patch Patch4: FreeWnn-uum.patch Patch5: FreeWnn-%{base_version}-%{alpha_version}.dif -Patch6: FreeWnn-lib64.patch Patch7: FreeWnn-s390x.patch Patch8: FreeWnn-warnings.patch -Patch9: conflicting-prototypes.patch -Patch10: FreeWnn-fixes.patch Patch11: FreeWnn-include.patch Patch12: FreeWnn-returnvalue.diff +Patch13: FreeWnn-prototypes.patch +Patch14: FreeWnn-trad_cpp.patch # Summary(ja): FreeWnn ユ茯ュ激鴻 - 泣若 # %description -l ja # @@ -250,20 +250,19 @@ client programs that use the Korean Input System, Free kWnn. # 処ュ医箴障ゃ≪潟鐚醐而鐚ゃ篏帥 # xwnmo 篏睡с障紊潟吾潟初鐚件鐔篏睡 # 障ゃ≪潟潟蚊若吾綽紊泣若御障 -%setup -q -n FreeWnn-%{base_version}-%{alpha_version}/Xsi +%setup -q -n FreeWnn-%{base_version}-%{alpha_version} %patch0 -p2 %patch1 -p2 %patch2 -p2 %patch3 -p2 %patch4 -p2 %patch5 -p1 -%patch6 -p2 %patch7 -p2 -b .s390x %patch8 -%patch9 -p2 -%patch10 -p2 %patch11 -p2 %patch12 +%patch13 +%patch14 #%setup -b 1 -n Xsi # add include-files for Xwnmo # SuSE setlocale patch, try to set LC_CTYPE if LC_ALL fails (Xwnmo) and #...................................................................... @@ -280,9 +279,10 @@ client programs that use the Korean Input System, Free kWnn. --mandir=%{_mandir} \ --infodir=%{_infodir} \ %{_target_cpu}-suse-linux-gnu -make %{?jobs:-j%jobs} CCOPTIONS="$RPM_OPT_FLAGS" +# not -j safe, see Wnn/pubdicplus/Makefile.in +make CCOPTIONS="$RPM_OPT_FLAGS" pushd Wnn/uum -make %{?jobs:-j%jobs} CCOPTIONS="$RPM_OPT_FLAGS" +make CCOPTIONS="$RPM_OPT_FLAGS" popd %install @@ -337,6 +337,7 @@ ln -sf /var/lib/wnn/zh_CN/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/zh_CN/dic ln -sf /var/lib/wnn/zh_TW/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/zh_TW/dic ln -sf /var/lib/wnn/ko_KR/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/ko_KR/dic #---------------------------------------------------------------------- +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la %clean [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; @@ -466,13 +467,17 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* %config /etc/FreeWnn/lt_LN/uumkey %config /etc/FreeWnn/lt_LN/uumkey_e %config /etc/FreeWnn/lt_LN/uumrc +%{_libdir}/libjd.so.0* +%{_libdir}/libwnn.so.0* %files -n fwnn-devel %defattr(-,root,root) %dir /usr/include/wnn/ /usr/include/wnn/* %{_libdir}/libjd.a +%{_libdir}/libjd.so %{_libdir}/libwnn.a +%{_libdir}/libwnn.so %files -n fwnncom %defattr(-,root,root) @@ -525,6 +530,7 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* %config /etc/FreeWnn/zh_CN/wnnenvrc_Wu %config /etc/FreeWnn/zh_CN/wnnenvrc_WuR %config /etc/FreeWnn/zh_CN/wnnstat.msg +%{_libdir}/libcwnn.so.0* %files -n fcwnncom %defattr(-,root,root) @@ -542,6 +548,7 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* %dir /usr/include/cwnn/ /usr/include/cwnn/* %{_libdir}/libcwnn.a +%{_libdir}/libcwnn.so %files -n ftwnn %defattr(-,root,root) @@ -600,12 +607,14 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.* %config /etc/FreeWnn/ko_KR/wnnenvrc %config /etc/FreeWnn/ko_KR/wnnenvrc_R %config /etc/FreeWnn/ko_KR/wnnstat.msg +%{_libdir}/libkwnn.so.0* %files -n fkwnndev %defattr(-,root,root) %dir /usr/include/kwnn/ /usr/include/kwnn/* %{_libdir}/libkwnn.a +%{_libdir}/libkwnn.so # I don't know how to build xwnmo. Will try that later ... # %files -n xwnmo # %doc Xwnmo/manual Xwnmo/manual.en Xwnmo/README Xwnmo/README.j