pool/fwnn
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 195772 from home:Mitsutoshi:branches:M17N

Browse Source 
- Modify FreeWnn-prototypes_3.patch .
  I found a bug in make_hinsi_list() at Wnn/jserver/hinsi_list.c,
  then fixed it . 

- Add FreeWnn-prototypes_3.patch .
  Prototype declarations for reducing compilation warnings .

- Add FreeWnn-prototypes_msg.patch .
  Bugfix: In openSUSE 13.1 Milestone 3,
  uum could not get error messages .
  This issue's cause is that we forgot prototype declaration
  of msg_get() in Wnn/include/msg.h .
  Then I added "FreeWnn-prototypes_msg.patch" as %Patch15 .
  http://lists.opensuse.org/opensuse-ja/2013-08/msg00014.html
  http://sourceforge.jp/projects/freewnn/lists/archive/users/2013-August/000140.html
- I added %configure --with-libwrap option .
  The [jctk]server s were linked -lwrap .
  Then we can use /etc/hosts.allow /etc/hosts.deny .
- Degrade fix: In "FreeWnn-prototypes.patch",
  I invalidated the patch of "FreeWnn-sighandler.patch" .
  Then I deleted a wrong patch to "Wnn/jserver/de.c"
  from "FreeWnn-prototypes.patch" .
  http://sourceforge.jp/projects/freewnn/lists/archive/users/2013-August/000141.html
- Change: In "FreeWnn-sighandler.patch",
  I changed from _exit(-1) to _exit(255) .
  This change effects [jctk]server's exit status .

- SLE_11 and openSUSE 12.2 does not provide libwrap0,
  then I could not build FreeWnn on them .
  So, I deleted %configure --with-libwrap option

OBS-URL: https://build.opensuse.org/request/show/195772
OBS-URL: https://build.opensuse.org/package/show/M17N/fwnn?expand=0&rev=11
This commit is contained in:
Fuminobu Takeyama 2013-08-21 14:26:34 +00:00 committed by Git OBS Bridge
parent 96f3035bf7
commit 94c4a3d26d
16 changed files with 4783 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FreeWnn-1.1.1-a021.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:df9523b2eea7cbc94d9d01c19a01394abe3b648c5ec3f1259adac06fc8ecbb86
size 3108905

160
FreeWnn-1.1.1-a021.dif → FreeWnn-1.1.1-a022.dif
View File

@ -1,116 +1,5 @@
--- 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 */
-extern struct wnn_buf *jl_open_lang ();
-extern struct wnn_env *jl_connect_lang ();
-extern struct wnn_env *jl_env_get ();
-extern struct wnn_jdata *jl_word_info_e ();
-extern w_char *jl_hinsi_name_e ();
+extern struct wnn_buf *jl_open_lang (const char *, const char *, const char *, const char *, int (*) (const char *), int (*) (const char *), int);
+extern struct wnn_env *jl_connect_lang (const char *, const char *, const char *, const char *, int (*) (const char *), int (*) (const char *), int);
+extern struct wnn_env *jl_env_get (struct wnn_buf *);
+extern struct wnn_jdata *jl_word_info_e (struct wnn_env *, int, int);
+extern w_char *jl_hinsi_name_e (struct wnn_env *, int);
-extern void jl_close ();
-extern int jl_dic_add_e ();
-extern int jl_dic_comment_set_e ();
-extern int jl_dic_delete_e ();
-extern int jl_dic_list_e ();
-extern int jl_dic_save_all_e ();
-extern int jl_dic_save_e ();
-extern int jl_dic_use_e ();
-extern void jl_disconnect ();
-extern void jl_disconnect_if_server_dead ();
-extern void jl_env_set ();
-extern int jl_fuzokugo_get_e ();
-extern int jl_fuzokugo_set_e ();
-extern void jl_get_zenkouho_kanji ();
-extern int jl_hinsi_dicts_e ();
-extern int jl_hinsi_list_e ();
-extern int jl_hinsi_number_e ();
-extern int jl_isconnect_e ();
-extern int jl_kanji_len ();
-extern int jl_kill ();
-extern int jl_nobi_conv ();
-extern int jl_nobi_conv_e2 ();
-extern int jl_param_get_e ();
-extern int jl_param_set_e ();
-extern int jl_ren_conv ();
-extern int jl_set_env_wnnrc ();
-extern int jl_set_env_wnnrc1 ();
-extern int jl_set_jikouho ();
-extern int jl_set_jikouho_dai ();
-extern int jl_tan_conv ();
-extern int jl_update_hindo ();
-extern int jl_word_add_e ();
-extern int jl_word_comment_set_e ();
-extern int jl_word_delete_e ();
-extern int jl_word_search_by_env_e ();
-extern int jl_word_search_e ();
-extern int jl_word_use_e ();
-extern int jl_yomi_len ();
-extern int jl_zenkouho ();
-extern int jl_zenkouho_dai ();
-extern int wnn_get_area ();
+extern void jl_close (struct wnn_buf *);
+extern int jl_dic_add_e (struct wnn_env *, char *, char *, int, int, int, int, char *, char *, int (*) (const char *), int (*) (const char *));
+extern int jl_dic_comment_set_e (struct wnn_env *, int, w_char *);
+extern int jl_dic_delete_e (struct wnn_env *, int);
+extern int jl_dic_list_e (struct wnn_env *, WNN_DIC_INFO **);
+extern int jl_dic_save_all_e (struct wnn_env *);
+extern int jl_dic_save_e (struct wnn_env *, int);
+extern int jl_dic_use_e (struct wnn_env *, int, int);
+extern void jl_disconnect (struct wnn_env *);
+extern void jl_disconnect_if_server_dead (struct wnn_env *);
+extern void jl_env_set (struct wnn_buf *, struct wnn_env *);
+extern int jl_fuzokugo_get_e (struct wnn_env *, char *);
+extern int jl_fuzokugo_set_e (struct wnn_env *, char *);
+extern void jl_get_zenkouho_kanji (struct wnn_buf *, int, w_char *);
+extern int jl_hinsi_dicts_e (struct wnn_env *, int, int **);
+extern int jl_hinsi_list_e (struct wnn_env *, int, w_char *, w_char ***);
+extern int jl_hinsi_number_e (struct wnn_env *, w_char *);
+extern int jl_isconnect_e (struct wnn_env *);
+extern int jl_kanji_len (struct wnn_buf *, int, int);
+extern int jl_kill (struct wnn_buf *, int, int);
+extern int jl_nobi_conv (struct wnn_buf *, int, int, int, int, int);
+extern int jl_nobi_conv_e2 (struct wnn_buf *, struct wnn_env *, int, int, int, int, int);
+extern int jl_param_get_e (struct wnn_env *, struct wnn_param *);
+extern int jl_param_set_e (struct wnn_env *, struct wnn_param *);
+extern int jl_ren_conv (struct wnn_buf *, w_char *, int, int, int);
+extern int jl_set_env_wnnrc (struct wnn_env *, const char *, int (*) (const char *), int (*) (const char *));
+extern int jl_set_env_wnnrc1 (struct wnn_env *, const char *, int (*) (const char *), int (*) (const char *), int);
+extern int jl_set_jikouho (struct wnn_buf *, int);
+extern int jl_set_jikouho_dai (struct wnn_buf *, int);
+extern int jl_tan_conv (struct wnn_buf *, w_char *, int, int, int, int);
+extern int jl_update_hindo (struct wnn_buf *, int, int);
+extern int jl_word_add_e (struct wnn_env *, int, w_char *, w_char *, w_char *, int, int);
+extern int jl_word_comment_set_e (struct wnn_env *, int, int, w_char *);
+extern int jl_word_delete_e (struct wnn_env *, int, int);
+extern int jl_word_search_by_env_e (struct wnn_env *, w_char *, struct wnn_jdata **);
+extern int jl_word_search_e (struct wnn_env *, int, w_char *, struct wnn_jdata **);
+extern int jl_word_use_e (struct wnn_env *, int, int);
+extern int jl_yomi_len (struct wnn_buf *, int, int);
+extern int jl_zenkouho (struct wnn_buf *, int, int, int);
+extern int jl_zenkouho_dai (struct wnn_buf *, int, int, int, int);
+extern int wnn_get_area (struct wnn_buf *, int, int, w_char *, int);
-extern char *wnn_perror ();
-extern char *wnn_perror_lang ();
+extern char *wnn_perror (void);
+extern char *wnn_perror_lang (char *);
#ifdef CONVERT_by_STROKE
-extern void jl_get_zenkouho_yomi ();
+extern void jl_get_zenkouho_yomi (struct wnn_buf *, int, w_char *);
#endif
#endif /* WNN_JLLIB_H */
--- FreeWnn-1.1.1-a021/Wnn/jlib/jl.c
+++ FreeWnn-1.1.1-a021/Wnn/jlib/jl.c
--- FreeWnn-1.1.1-a022.bak/Wnn/jlib/jl.c 2013-08-06 20:02:27.258462915 +0900
+++ FreeWnn-1.1.1-a022/Wnn/jlib/jl.c 2013-08-06 18:59:37.294514823 +0900
@@ -52,6 +52,7 @@
# include <malloc.h>
# endif
@ -200,7 +89,7 @@
"辞書ファイル \"%s\" が無いよ。作る?(Y/N)",
*/
- if ((int) error_handler == WNN_CREATE || call_error_handler (error_handler, tmp))
+ if (error_handler == (int (*) (const char *)) WNN_CREATE || call_error_handler (error_handler, tmp))
+ if (error_handler == WNN_CREATE || call_error_handler (error_handler, tmp))
{
if (create_file (env, dic_name, JISHO, -1, /* -1 is dummy */
pwd_dic, (hindo_name && *hindo_name) ? "" : pwd_hindo, error_handler, message_handler) == -1)
@ -218,7 +107,7 @@
"頻度ファイル \"%s\" が無いよ。作る?(Y/N)",
*/
- if ((int) error_handler == WNN_CREATE || call_error_handler (error_handler, tmp))
+ if (error_handler == (int (*) (const char *)) WNN_CREATE || call_error_handler (error_handler, tmp))
+ if (error_handler == WNN_CREATE || call_error_handler (error_handler, tmp))
{
if (create_file (env, hindo_name, HINDO, fid, "", pwd_hindo, error_handler, message_handler) == -1)
return (-1);
@ -227,7 +116,7 @@
else if (wnn_errorno == WNN_HINDO_NO_MATCH)
{
- if ((int) error_handler == WNN_NO_CREATE)
+ if (error_handler == (int (*) (const char *)) WNN_NO_CREATE)
+ if (error_handler == (int (*) (const char *)) WNN_NO_CREATE)
{
return (-1);
}
@ -271,27 +160,28 @@
{
confirm_state = NO_CREATE;
}
@@ -2775,8 +2777,8 @@
@@ -2775,9 +2777,8 @@
int
jl_set_env_wnnrc1 (env, wnnrc_n, error_handler, message_handler, level)
register struct wnn_env *env;
- char *wnnrc_n;
- int (*error_handler) (), (*message_handler) ();
- int level;
+ const char *wnnrc_n;
+ int (*error_handler) (const char *), (*message_handler) (const char *);
int level;
+ int (*error_handler) (const char *), (*message_handler) (const char *); int level;
{
register int num;
@@ -2829,7 +2831,7 @@
char s[20][EXPAND_PATH_LENGTH];
@@ -2829,7 +2830,7 @@
{
/* dic_add */
int prio, rdonly, hrdonly, rev;
- int (*error_handler1) () = (int (*)()) 0;
+ int (*error_handler1) (const char *) = (int (*) (const char *)) 0;
+ int (*error_handler1) (const char *) = NULL;
expand_expr_all (s[0], env);
if (num < 3 || !REAL_PARAM (s[1]))
{
@@ -2855,11 +2857,11 @@
@@ -2855,11 +2856,11 @@
else if (confirm_state == CREATE_WITHOUT_CONFIRM)
{
@ -305,7 +195,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)
{
@@ -2990,7 +2992,7 @@
@@ -2990,7 +2991,7 @@
if (*s != '~' && *s != '@')
return (0);
@ -314,7 +204,7 @@
return (-1);
s1 = s;
@@ -3008,12 +3010,12 @@
@@ -3008,12 +3009,12 @@
{
if (*s1)
{
@ -329,7 +219,7 @@
}
}
@@ -3021,13 +3023,13 @@
@@ -3021,13 +3022,13 @@
{ /* then, *s must be '@' */
if (!strcmp (s1, "HOME"))
{
@ -345,7 +235,7 @@
strcpy (buf, p);
strcat (buf, "/");
@@ -3044,15 +3046,15 @@
@@ -3044,15 +3045,15 @@
}
else if (!strcmp (s1, "LIBDIR"))
{
@ -364,7 +254,7 @@
}
else
{ /* @HOME, @LIBDIR @ENV igai ha kaenai */
@@ -3076,7 +3078,7 @@
@@ -3076,7 +3077,7 @@
total = 0;
flag = 0;
@ -373,7 +263,7 @@
{
if (isdigit (*st))
{
@@ -3135,7 +3137,7 @@
@@ -3135,7 +3136,7 @@
int d;
int fid;
char *pwd_dic, *pwd_hindo;
@ -382,7 +272,7 @@
{
char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN];
int rev_dict_type;
@@ -3243,7 +3245,7 @@
@@ -3243,7 +3244,7 @@
make_dir_rec1 (env, path, error_handler, message_handler)
struct wnn_env *env;
register char *path;
@ -391,7 +281,7 @@
{
char gomi[128];
register char *c;
@@ -3266,7 +3268,7 @@
@@ -3266,7 +3267,7 @@
make_dir1 (env, dirname, error_handler, message_handler)
register struct wnn_env *env;
register char *dirname;
@ -400,7 +290,7 @@
{
char gomi[128];
if (dirname[0] == C_LOCAL)
@@ -3287,7 +3289,7 @@
@@ -3287,7 +3288,7 @@
return (0); /* dir already exists */
}
}
@ -409,7 +299,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));
/*
@@ -3324,8 +3326,8 @@
@@ -3324,8 +3325,8 @@
static int
call_error_handler (error_handler, c)
@ -420,7 +310,7 @@
{
register int x;
x = error_handler (c);
@@ -3340,16 +3342,16 @@
@@ -3340,16 +3341,16 @@
}
static void
@ -442,8 +332,8 @@
(*message_handler) (buf);
}
}
--- FreeWnn-1.1.1-a021/Wnn/jlib/js.c
+++ FreeWnn-1.1.1-a021/Wnn/jlib/js.c
--- FreeWnn-1.1.1-a022.bak/Wnn/jlib/js.c 2005-04-11 00:26:37.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/jlib/js.c 2013-08-06 19:12:48.783918101 +0900
@@ -979,7 +979,7 @@
free((char *)env);
*/

3
FreeWnn-1.1.1-a022.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3728352fe9d3352ce16884bd0a517eaf227da0cf7e6f1d09b7a3f38f6bfb6dba
size 3137954

43
FreeWnn-fsstnd.patch
View File

@ -1,51 +1,48 @@
diff -Naur FreeWnn-1.1.1-a013.orig/Xsi/makerule.mk.in FreeWnn-1.1.1-a013/Xsi/makerule.mk.in
--- FreeWnn-1.1.1-a013.orig/Xsi/makerule.mk.in Wed Sep 29 01:56:24 1999
+++ FreeWnn-1.1.1-a013/Xsi/makerule.mk.in Mon Jan 31 13:26:50 2000
@@ -113,7 +113,7 @@
prefix = @prefix@
--- FreeWnn-1.1.1-a022.bak/makerule.mk.in 2013-06-07 03:24:38.000000000 +0900
+++ FreeWnn-1.1.1-a022/makerule.mk.in 2013-08-07 14:15:30.506662233 +0900
@@ -136,7 +136,7 @@
exec_prefix = @exec_prefix@
PREFIX = @prefix@
- WNNWNNDIR = ${PREFIX}/lib/wnn
bindir = @bindir@
sbindir = @sbindir@
- WNNWNNDIR = $(exec_prefix)/lib/wnn
+ WNNWNNDIR = /etc/FreeWnn
WNNBINDIR = ${PREFIX}/bin
WNNBINDIR = $(bindir)
WNNSBINDIR = @WNNSBINDIR@
WNNINCDIR = @includedir@
WNNLIBDIR = @libdir@
@@ -125,9 +125,9 @@
@@ -157,12 +157,12 @@
WNNCONSDICSRC = $(IMTOP)/Wnn-consortium/dic
WNNTOP = $(IMTOP)/Wnn
- JWNNLANG = ja_JP
+ JWNNLANG = ja
JWNNWNNDIR = $(WNNWNNDIR)/$(JWNNLANG)
- JWNNBINDIR = $(WNNBINDIR)/Wnn4
+ JWNNBINDIR = $(WNNBINDIR)
JWNNBINDIR = $(WNNBINDIR)$(JWNNSUBBINDIR)
JWNNSBINDIR = $(WNNSBINDIR)$(JWNNSUBBINDIR)
JWNNINCDIR = $(WNNINCDIR)/wnn
- JWNNDICDIR = $(JWNNWNNDIR)/dic
+ JWNNDICDIR = /var/lib/wnn/$(JWNNLANG)/dic
JWNNPUBDICDIR = $(JWNNDICDIR)/pubdic
JWNNWNNCONSDICDIR = $(JWNNDICDIR)/wnncons
JWNNFZKSRCDIR = $(JWNNDICDIR)/src
@@ -155,8 +155,8 @@
CWNNLANG = zh_CN
CWNNWNNDIR = $(WNNWNNDIR)/$(CWNNLANG)
@@ -193,7 +193,7 @@
CWNNINCDIR = $(WNNINCDIR)/cwnn
- CWNNBINDIR = $(WNNBINDIR)/cWnn4
CWNNBINDIR = $(WNNBINDIR)$(CWNNSUBBINDIR)
CWNNSBINDIR = $(WNNSBINDIR)$(CWNNSUBBINDIR)
- CWNNDICDIR = $(CWNNWNNDIR)/dic
+ CWNNBINDIR = $(WNNBINDIR)
+ CWNNDICDIR = /var/lib/wnn/$(CWNNLANG)/dic
CWNNSYSDICDIR = $(CWNNDICDIR)/sys
CWNNCDSRC = $(CWNNTOP)/cd
CWNNCDICSRC = $(CWNNTOP)/cdic
@@ -178,8 +178,8 @@
KWNNLANG = ko_KR
KWNNWNNDIR = $(WNNWNNDIR)/$(KWNNLANG)
@@ -217,7 +217,7 @@
KWNNINCDIR = $(WNNINCDIR)/kwnn
- KWNNBINDIR = $(WNNBINDIR)/kWnn4
KWNNBINDIR = $(WNNBINDIR)$(KWNNSUBBINDIR)
KWNNSBINDIR = $(WNNSBINDIR)$(KWNNSUBBINDIR)
- KWNNDICDIR = $(KWNNWNNDIR)/dic
+ KWNNBINDIR = $(WNNBINDIR)
+ KWNNDICDIR = /var/lib/wnn/$(KWNNLANG)/dic
KWNNSYSDICDIR = $(KWNNDICDIR)/sys
KWNNKDSRC = $(KWNNTOP)/kd
KWNNKDICSRC = $(KWNNTOP)/kdic
@@ -199,7 +199,7 @@
@@ -237,7 +237,7 @@
TWNNLANG = zh_TW
TWNNWNNDIR = $(WNNWNNDIR)/$(TWNNLANG)

58
FreeWnn-include.patch
View File

@ -1,5 +1,5 @@
--- BUILD/FreeWnn-1.1.1-a021/PubdicPlus/ctopd.c
+++ BUILD/FreeWnn-1.1.1-a021/PubdicPlus/ctopd.c
--- FreeWnn-1.1.1-a022.bak/PubdicPlus/ctopd.c 2001-06-15 03:15:54.000000000 +0900
+++ FreeWnn-1.1.1-a022/PubdicPlus/ctopd.c 2013-08-06 20:30:27.388141217 +0900
@@ -25,6 +25,7 @@
#endif
@ -8,8 +8,8 @@
static char *program;
--- BUILD/FreeWnn-1.1.1-a021/PubdicPlus/wtopd.c
+++ BUILD/FreeWnn-1.1.1-a021/PubdicPlus/wtopd.c
--- FreeWnn-1.1.1-a022.bak/PubdicPlus/wtopd.c 2001-06-15 03:15:54.000000000 +0900
+++ FreeWnn-1.1.1-a022/PubdicPlus/wtopd.c 2013-08-06 20:31:09.300390651 +0900
@@ -25,6 +25,8 @@
#endif
@ -19,53 +19,3 @@
static char *program;
--- 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 <malloc.h>
# endif
#endif /* STDC_HEADERS */
+#include <string.h>
#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 <stdio.h>
+#include <string.h>
#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 @@
*/
#include <stdio.h>
+#include <string.h>
#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 <stdio.h>
+#include <string.h>
#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 <stdio.h>
+#include <string.h>
#include "jllib.h"
#include "commonhd.h"
#include "sdefine.h"

59
FreeWnn-ja.patch
View File

@ -1,6 +1,6 @@
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/etc/msg.c Mon Mar 20 17:31:33 2000
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/etc/msg.c Fri Aug 18 15:20:20 2000
@@ -457,12 +457,12 @@
--- FreeWnn-1.1.1-a022.orig/Wnn/etc/msg.c 2005-04-11 00:26:37.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/etc/msg.c 2013-08-06 12:27:33.133572652 +0900
@@ -412,12 +412,12 @@
{
struct msg_cat *cd;
@ -16,9 +16,9 @@
printf (msg_get (cd, 100, "message not found\n", "zh_CN"), "abc");
}
#endif /* not_use */
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/jd_sock.h Wed Feb 23 16:31:29 2000
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/jd_sock.h Fri Aug 18 15:41:45 2000
@@ -67,7 +67,7 @@
--- FreeWnn-1.1.1-a022.orig/Wnn/include/jd_sock.h 2005-04-11 00:26:37.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/include/jd_sock.h 2013-08-06 11:47:16.078413575 +0900
@@ -57,7 +57,7 @@
#ifdef JAPANESE /* Japanese */
# define WNN_PORT_IN (0x5701)
static char *sockname = "/tmp/jd_sockV4"; /* for jserver */
@ -27,7 +27,7 @@
# define SERVERNAME "wnn4"
# define MESSAGE_FILE "jserver.msg"
#else /* JAPANESE */
@@ -98,7 +98,7 @@
@@ -88,7 +88,7 @@
# define WNN_PORT_IN (0x5701)
static char *sockname = "/tmp/jd_sockV4"; /* for jserver */
@ -36,22 +36,22 @@
# define SERVERNAME "wnn4"
# define MESSAGE_FILE "jserver.msg"
#endif /* KOREAN */
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/jslib.h Wed Feb 23 16:31:30 2000
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/jslib.h Fri Aug 18 15:42:49 2000
@@ -394,8 +394,8 @@
--- FreeWnn-1.1.1-a022.orig/Wnn/include/jslib.h 2008-10-26 19:27:53.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/include/jslib.h 2013-08-06 11:49:04.110854622 +0900
@@ -400,8 +400,8 @@
/*
JSLIB function declaration
*/
-#define js_open(server, timeout) js_open_lang(server, "ja_JP", timeout)
-#define js_connect(server,env_name) js_connect_lang(server, env_name, "ja_JP")
+#define js_open(server, timeout) js_open_lang(server, "ja", timeout)
+#define js_connect(server,env_name) js_connect_lang(server, env_name, "ja")
+#define js_open(server, timeout) js_open_lang((server), "ja", (timeout))
+#define js_connect(server,env_name) js_connect_lang((server), (env_name), "ja")
extern WNN_JSERVER_ID *js_open_lang ();
extern int js_close ();
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/msg.h Wed Feb 23 16:31:30 2000
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/msg.h Fri Aug 18 15:43:29 2000
@@ -50,7 +50,7 @@
#ifndef FRWNN_PARAMS
/*
--- FreeWnn-1.1.1-a022.orig/Wnn/include/msg.h 2005-04-11 00:26:37.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/include/msg.h 2013-08-06 12:12:08.301743383 +0900
@@ -62,7 +62,7 @@
/*
#define DEF_LANG "C"
*/
@ -60,8 +60,8 @@
extern struct msg_cat *msg_open ();
extern char *msg_get ();
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/wnn_config.h Wed Feb 23 16:31:30 2000
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/wnn_config.h Fri Aug 18 15:46:02 2000
--- FreeWnn-1.1.1-a022.orig/Wnn/include/wnn_config.h 2005-04-11 00:26:37.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/include/wnn_config.h 2013-08-06 12:01:00.836647352 +0900
@@ -44,7 +44,7 @@
#define WNN_CSERVER_ENV "CSERVER"
#define WNN_KSERVER_ENV "KSERVER"
@ -98,8 +98,8 @@
#endif /* HINSIDATA_FILE */
#define USR_DIC_DIR_VAR "@USR"
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jd/serverdefs Sun Jan 30 04:40:48 2000
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jd/serverdefs Fri Aug 18 15:46:43 2000
--- FreeWnn-1.1.1-a022.orig/Wnn/jd/serverdefs 2001-06-15 02:55:32.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/jd/serverdefs 2013-08-06 12:01:50.642348650 +0900
@@ -30,7 +30,7 @@
;
@ -109,9 +109,9 @@
japanese jserver /tmp/jd_sockV4 wnn4 22273
nihongo jserver /tmp/jd_sockV4 wnn4 22273
zh_CN cserver /tmp/cd_sockV4 wnn4_Cn 22289
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jlib/jl.c Mon Mar 20 17:21:12 2000
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/jl.c Fri Aug 18 15:47:44 2000
@@ -442,7 +442,7 @@
--- FreeWnn-1.1.1-a022.orig/Wnn/jlib/jl.c 2005-04-11 00:26:37.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/jlib/jl.c 2013-08-06 12:02:48.422128059 +0900
@@ -456,7 +456,7 @@
if (!lang || !*lang)
{
/* Sorry! Default is Japanese. :-) */
@ -120,14 +120,3 @@
}
else
{
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/header.c Wed Feb 23 16:31:42 2000
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/header.c Fri Aug 18 15:48:36 2000
@@ -131,7 +131,7 @@
FuncDataBase function_db[] = {
#ifdef JAPANESE
- {"ja_JP",
+ {"ja",
{NULL, NULL, call_t_redraw_move_normal,
call_t_redraw_move_1_normal, call_t_redraw_move_2_normal,
call_t_print_l_normal, NULL, char_len_normal, char_q_len_normal,

135
FreeWnn-noroot.patch
View File

@ -1,6 +1,6 @@
--- 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 @@
--- FreeWnn-1.1.1-a022.orig/Contrib/dic/gerodic/Makefile.in 2006-05-29 01:37:02.000000000 +0900
+++ FreeWnn-1.1.1-a022/Contrib/dic/gerodic/Makefile.in 2013-08-06 15:15:41.127790480 +0900
@@ -70,9 +70,7 @@
install:: ${OBJ}
@if [ -d $(DESTDIR)$(GERODIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(GERODIR)); fi
@ -11,36 +11,36 @@
clean::
$(RM) ${OBJ}
--- BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/Makefile.in
+++ BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/Makefile.in
--- FreeWnn-1.1.1-a022.orig/Wnn/jserver/Makefile.in 2010-07-11 19:18:17.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/jserver/Makefile.in 2013-08-06 15:18:17.033652766 +0900
@@ -36,7 +36,7 @@
top_builddir = @top_builddir@
INSTALL = @INSTALL@ $(INSTALLFLAGS)
-LOCAL_INSTFLAGS = -o $(WNNOWNER)
+LOCAL_INSTFLAGS =
+LOCAL_INSTFLAGS =
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
--- FreeWnn-1.1.1-a022.orig/Wnn/jutil/Makefile.in 2011-04-18 01:29:50.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/jutil/Makefile.in 2013-08-06 15:20:07.397700941 +0900
@@ -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 =
+LOCAL_INSTFLAGS =
INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir)
INCLUDES = -I$(top_builddir) @EXTWNNJINC@ -I$(WNNINCLUDESRC)
DEFINES = $(WNNDEFINES) $(WNNLANGDEF)
--- BUILD/FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in
+++ BUILD/FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in
--- FreeWnn-1.1.1-a022.orig/Wnn/pubdicplus/Makefile.in 2010-02-23 02:06:54.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/pubdicplus/Makefile.in 2013-08-06 15:24:05.010279338 +0900
@@ -35,7 +35,7 @@
WNNJUTILOBJ = $(top_builddir)/Wnn/jutil
INSTALL = @INSTALL@ $(INSTALLFLAGS)
-LOCAL_INSTFLAGS = -o $(WNNOWNER)
+LOCAL_INSTFLAGS =
+LOCAL_INSTFLAGS =
INCLUDES = -I$(top_builddir)
ATOD = $(WNNJUTILOBJ)/atod
@ -54,25 +54,14 @@
done
install:: $(DIC)
--- 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 =
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
--- FreeWnn-1.1.1-a022.orig/Wnn/wnncons/dic/Makefile.in 2001-08-14 22:43:21.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/wnncons/dic/Makefile.in 2013-08-06 15:36:30.150639065 +0900
@@ -33,7 +33,7 @@
top_builddir = ../../..
INSTALL = @INSTALL@ $(INSTALLFLAGS)
-LOCAL_INSTFLAGS = -o $(WNNOWNER)
+LOCAL_INSTFLAGS =
+LOCAL_INSTFLAGS =
ATOD = $(WNNJUTILSRC)/atod
WNNTOUCH = $(WNNJUTILSRC)/wnntouch
@ -85,40 +74,40 @@
done
depend::
--- BUILD/FreeWnn-1.1.1-a021/Xwnmo/xjutil/Makefile.in
+++ BUILD/FreeWnn-1.1.1-a021/Xwnmo/xjutil/Makefile.in
--- FreeWnn-1.1.1-a022.orig/Xwnmo/xjutil/Makefile.in 2001-08-14 22:43:21.000000000 +0900
+++ FreeWnn-1.1.1-a022/Xwnmo/xjutil/Makefile.in 2013-08-06 15:39:43.115076499 +0900
@@ -26,7 +26,7 @@
top_builddir = ../..
INSTALL = @INSTALL@ $(INSTALLFLAGS)
-LOCAL_INSTFLAGS = -o $(WNNOWNER)
+LOCAL_INSTFLAGS =
+LOCAL_INSTFLAGS =
INCLUDES = -I. $(XWNMOINCLUDES) -I$(XWNMOSRC)
--- BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/Makefile.in
+++ BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/Makefile.in
--- FreeWnn-1.1.1-a022.orig/Xwnmo/xwnmo/Makefile.in 2001-08-14 22:43:21.000000000 +0900
+++ FreeWnn-1.1.1-a022/Xwnmo/xwnmo/Makefile.in 2013-08-06 15:40:43.929300312 +0900
@@ -26,7 +26,7 @@
top_builddir = ../..
INSTALL = @INSTALL@ $(INSTALLFLAGS)
-LOCAL_INSTFLAGS = -o $(WNNOWNER)
+LOCAL_INSTFLAGS =
+LOCAL_INSTFLAGS =
INCLUDES = $(XWNMOINCLUDES)
--- BUILD/FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in
+++ BUILD/FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in
@@ -31,7 +31,7 @@
--- FreeWnn-1.1.1-a022.orig/cWnn/cdic/Makefile.in 2010-02-23 02:06:54.000000000 +0900
+++ FreeWnn-1.1.1-a022/cWnn/cdic/Makefile.in 2013-08-06 15:44:21.202520151 +0900
@@ -32,7 +32,7 @@
CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil
INSTALL = @INSTALL@ $(INSTALLFLAGS)
-LOCAL_INSTFLAGS = -o $(WNNOWNER)
+LOCAL_INSTFLAGS =
+LOCAL_INSTFLAGS =
ATOD = $(CWNNJUTILOBJ)/catod
ATOF = $(CWNNJUTILOBJ)/catof
@@ -85,8 +85,7 @@
@@ -86,8 +86,7 @@
install::
@case '${MFLAGS}' in *[i]*) set +e;; esac;
@for i in $(CWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \
@ -128,40 +117,40 @@
done
install:: $(ALLTGT)
--- BUILD/FreeWnn-1.1.1-a021/cWnn/jserver/Makefile.in
+++ BUILD/FreeWnn-1.1.1-a021/cWnn/jserver/Makefile.in
--- FreeWnn-1.1.1-a022.orig/cWnn/jserver/Makefile.in 2010-07-11 19:18:17.000000000 +0900
+++ FreeWnn-1.1.1-a022/cWnn/jserver/Makefile.in 2013-08-06 15:46:36.258366587 +0900
@@ -38,7 +38,7 @@
JSERVERDEFINES = -DJSERVER -DWRITE_CHECK
INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir)
DEFINES = $(CWNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) $(CWNNLANGDEF)
-LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(WNNOWNER)
+LOCAL_INSTFLAGS =
+LOCAL_INSTFLAGS =
SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(CWNNLANG)/cserverrc\"
HINSIDEFINE = -DHINSIDATA_FILE=\"/$(CWNNLANG)/cixing.data\"
TSERVERINITDEF = -DSERVER_INIT_FILE=\"/$(TWNNLANG)/tserverrc\"
--- BUILD/FreeWnn-1.1.1-a021/cWnn/jutil/Makefile.in
+++ BUILD/FreeWnn-1.1.1-a021/cWnn/jutil/Makefile.in
--- FreeWnn-1.1.1-a022.orig/cWnn/jutil/Makefile.in 2011-04-18 01:29:50.000000000 +0900
+++ FreeWnn-1.1.1-a022/cWnn/jutil/Makefile.in 2013-08-06 15:48:15.404717460 +0900
@@ -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 =
+LOCAL_INSTFLAGS =
INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir)
INCLUDES = -I$(top_builddir) @EXTCWNNJINC@ -I$(CWNNINCLUDESRC)
DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF)
--- BUILD/FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in
+++ BUILD/FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in
@@ -31,7 +31,7 @@
--- FreeWnn-1.1.1-a022.orig/cWnn/tdic/Makefile.in 2010-02-23 02:06:54.000000000 +0900
+++ FreeWnn-1.1.1-a022/cWnn/tdic/Makefile.in 2013-08-06 15:50:08.039375445 +0900
@@ -32,7 +32,7 @@
CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil
INSTALL = @INSTALL@
-INSTALLFLAGS = -o $(WNNOWNER)
+INSTALLFLAGS =
+INSTALLFLAGS =
ATOD = $(CWNNJUTILOBJ)/catod
ATOF = $(CWNNJUTILOBJ)/catof
@@ -85,8 +85,7 @@
@@ -86,8 +86,7 @@
install::
@case '${MFLAGS}' in *[i]*) set +e;; esac;
@for i in $(TWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \
@ -171,19 +160,8 @@
done
install:: $(ALLTGT)
--- 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) -I$(top_builddir)
DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF)
-LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER)
+LOCAL_INSTFLAGS =
LOCAL_LIBRARIES = $(CWNNJLIB) $(CWNNCONVLIB) @LIBS@
HDRS= buffer.h cvtcode.h sdefine.h sheader.h
--- BUILD/FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in
+++ BUILD/FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in
--- FreeWnn-1.1.1-a022.orig/kWnn/jserver/Makefile.in 2010-07-11 19:18:17.000000000 +0900
+++ FreeWnn-1.1.1-a022/kWnn/jserver/Makefile.in 2013-08-06 16:04:30.457591366 +0900
@@ -38,7 +38,7 @@
JSERVERDEFINES = -DJSERVER -DWRITE_CHECK
INCLUDES = -I$(KWNNJSERVERSRC) -I$(KWNNINCLUDESRC) -I$(top_builddir)
@ -193,29 +171,29 @@
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
--- FreeWnn-1.1.1-a022.orig/kWnn/jutil/Makefile.in 2011-04-18 01:29:50.000000000 +0900
+++ FreeWnn-1.1.1-a022/kWnn/jutil/Makefile.in 2013-08-06 16:07:46.321957315 +0900
@@ -39,7 +39,7 @@
INCLUDES = -I$(KWNNINCLUDESRC) -I$(top_builddir)
INCLUDES = -I$(top_builddir) @EXTKWNNJINC@ -I$(KWNNINCLUDESRC)
DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF)
-LOCAL_INSTFLAGS = -o $(WNNOWNER)
+LOCAL_INSTFLAGS =
+LOCAL_INSTFLAGS =
HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\"
CLIENTPROGRAMS = kwnnstat kwnnkill kwddel kwdreg
--- BUILD/FreeWnn-1.1.1-a021/kWnn/kdic/Makefile.in
+++ BUILD/FreeWnn-1.1.1-a021/kWnn/kdic/Makefile.in
@@ -31,7 +31,7 @@
CLIENTPROGRAMS = kwddel kwdreg
--- FreeWnn-1.1.1-a022.orig/kWnn/kdic/Makefile.in 2010-02-23 02:06:55.000000000 +0900
+++ FreeWnn-1.1.1-a022/kWnn/kdic/Makefile.in 2013-08-06 16:34:59.173587868 +0900
@@ -32,7 +32,7 @@
KWNNJUTILOBJ = $(top_builddir)/kWnn/jutil
INSTALL = @INSTALL@
-INSTALLFLAGS = -o $(WNNOWNER)
+INSTALLFLAGS =
+INSTALLFLAGS =
ATOD = $(KWNNJUTILOBJ)/katod
ATOF = $(KWNNJUTILOBJ)/katof
@@ -76,8 +76,7 @@
@@ -77,8 +77,7 @@
install::
@case '${MFLAGS}' in *[i]*) set +e;; esac;
@for i in $(KWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \
@ -225,14 +203,3 @@
done
install:: $(ALLTGT)
--- 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) -I$(top_builddir)
DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF)
-LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER)
+LOCAL_INSTFLAGS =
LOCAL_LIBRARIES = $(KWNNJLIB) $(KWNNCONVLIB) @LIBS@
HDRS= buffer.h cvtcode.h sdefine.h sheader.h

504
FreeWnn-prototypes.patch
View File

@ -1,16 +1,70 @@
--- 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);
--- FreeWnn-1.1.1-a022.bak/Wnn/include/jllib.h 2008-10-26 19:27:53.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/include/jllib.h 2013-08-07 04:36:57.146380820 +0900
@@ -253,8 +253,8 @@
/* extern function defines */
/* Note: FRWNN_PARAMS is defined in jslib.h . */
+extern char* crypt (const char *,const char *);
JS_STATIC void
new_pwd (char* src, char* encd)
-extern struct wnn_buf *jl_open_lang FRWNN_PARAMS((char *env_n, char *server_n, char *lang, char *wnnrc_n, int (*error_handler) (), int (*message_handler) (), int timeout));
-extern struct wnn_env *jl_connect_lang FRWNN_PARAMS((register char *env_n, register char *server_n, register char *lang, register char *wnnrc_n, int (*error_handler) (), int (*message_handler) (), int timeout));
+extern struct wnn_buf *jl_open_lang FRWNN_PARAMS((const char *, const char *, const char *, const char *, int (*) (const char *), int (*) (const char *), int));
+extern struct wnn_env *jl_connect_lang FRWNN_PARAMS((register const char *, register const char *, register const char *, register const char *, int (*) (const char *), int (*) (const char *), int timeout));
extern struct wnn_env *jl_env_get FRWNN_PARAMS((register struct wnn_buf *buf));
extern struct wnn_jdata *jl_word_info_e FRWNN_PARAMS((register struct wnn_env *env, int dic_no, int entry));
extern w_char *jl_hinsi_name_e FRWNN_PARAMS((register struct wnn_env *env, register int no));
@@ -284,8 +284,8 @@
extern int jl_param_get_e FRWNN_PARAMS((struct wnn_env *env, struct wnn_param *para));
extern int jl_param_set_e FRWNN_PARAMS((register struct wnn_env *env, struct wnn_param *para));
extern int jl_ren_conv FRWNN_PARAMS((register struct wnn_buf *buf, register w_char *yomi, int bun_no, int bun_no2, int use_maep));
-extern int jl_set_env_wnnrc FRWNN_PARAMS((register struct wnn_env *env, char *wnnrc_n, int (*error_handler) (), int (*message_handler) () ));
-extern int jl_set_env_wnnrc1 FRWNN_PARAMS((register struct wnn_env *env, char *wnnrc_n, int (*error_handler) (), int (*message_handler) (), int level));
+extern int jl_set_env_wnnrc FRWNN_PARAMS((register struct wnn_env *, const char *, int (*) (const char *), int (*) (const char *)));
+extern int jl_set_env_wnnrc1 FRWNN_PARAMS((register struct wnn_env *, const char *, int (*) (const char *), int (*) (const char *), int));
extern int jl_set_jikouho FRWNN_PARAMS((register struct wnn_buf *buf, register int offset));
extern int jl_set_jikouho_dai FRWNN_PARAMS((register struct wnn_buf *buf, int offset));
extern int jl_tan_conv FRWNN_PARAMS((register struct wnn_buf *buf, w_char *yomi, register int bun_no, register int bun_no2, int use_maep, int ich_shop));
diff -ur FreeWnn-1.1.1-a022.bak/Wnn/include/jslib.h FreeWnn-1.1.1-a022/Wnn/include/jslib.h
--- FreeWnn-1.1.1-a022.bak/Wnn/include/jslib.h 2013-08-07 06:07:20.597599679 +0900
+++ FreeWnn-1.1.1-a022/Wnn/include/jslib.h 2013-08-07 04:59:14.523936167 +0900
@@ -137,6 +137,18 @@
/* js_who */
#define WNN_MAX_ENV_OF_A_CLIENT 32
+#ifndef FRWNN_PARAMS
+/*
+ * I currently think ANSI-C is not sufficient on building your clients
+ * linked with libwnn. (aonoto)
+ */
+#if __STDC__ /* Sufficient? */
+#define FRWNN_PARAMS(paramlist) paramlist
+#else
+#define FRWNN_PARAMS(paramlist) ()
+#endif
+#endif
+
struct wnn_jwho
{
--- Wnn/include/wnn_string.h
+++ Wnn/include/wnn_string.h
@@ -33,26 +33,26 @@
int sd; /* jserver 内のソケットディスクリプタ */
@@ -403,17 +415,6 @@
#define js_open(server, timeout) js_open_lang((server), "ja", (timeout))
#define js_connect(server,env_name) js_connect_lang((server), (env_name), "ja")
-#ifndef FRWNN_PARAMS
-/*
- * I currently think ANSI-C is not sufficiant on building your clients
- * linked with libwnn. (aonoto)
- */
-#if __STDC__ /* Sufficient? */
-#define FRWNN_PARAMS(paramlist) paramlist
-#else
-#define FRWNN_PARAMS(paramlist) ()
-#endif
-#endif
extern WNN_JSERVER_ID *js_open_lang FRWNN_PARAMS((register char *server, register char *lang, register int timeout));
extern int js_close FRWNN_PARAMS((WNN_JSERVER_ID *server));
--- FreeWnn-1.1.1-a022.bak/Wnn/include/wnn_string.h 2005-04-11 00:26:37.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/include/wnn_string.h 2013-08-07 04:46:51.470301270 +0900
@@ -33,26 +33,28 @@
#ifndef WNN_STRING_H
#define WNN_STRING_H
@ -29,56 +83,98 @@
-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);
+#include "jslib.h"
+
+extern int wnn_sStrcpy FRWNN_PARAMS((register char*, register w_char*));
+extern int wnn_Sstrcpy FRWNN_PARAMS((w_char*,unsigned char*));
+extern void wnn_Sreverse FRWNN_PARAMS((w_char*,w_char*));
+extern char *wnn_Stos FRWNN_PARAMS((w_char*));
+extern char *wnn_sStrncpy FRWNN_PARAMS((register char*,register w_char*,int));
+extern w_char *wnn_Strcat FRWNN_PARAMS((register w_char*,register w_char*));
+extern w_char *wnn_Strncat FRWNN_PARAMS((register w_char*,register w_char*,int));
+extern int wnn_Strcmp FRWNN_PARAMS((register w_char*,register w_char*));
+extern int wnn_Substr FRWNN_PARAMS((register w_char*,register w_char*));
+extern int wnn_Strncmp FRWNN_PARAMS((register w_char*,register w_char*,int));
+extern w_char *wnn_Strncpy FRWNN_PARAMS((register w_char*,register w_char*,int));
+extern int wnn_Strlen FRWNN_PARAMS((register w_char*));
+extern w_char *wnn_Strcpy FRWNN_PARAMS((register w_char*,register w_char*));
+extern void wnn_delete_w_ss2 FRWNN_PARAMS((register w_char*,int));
+extern int wnn_byte_count FRWNN_PARAMS((register int));
#ifndef JS
-extern int check_pwd ();
+extern int check_pwd (char*,char*);
+extern int check_pwd FRWNN_PARAMS((char*,char*));
#endif
#ifdef CHINESE
-extern int wnn_Sstrcat ();
+extern int wnn_Sstrcat (w_char*,unsigned char*);
+extern int wnn_Sstrcat FRWNN_PARAMS((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 <unistd.h>
#endif
+#include <stdlib.h>
--- FreeWnn-1.1.1-a022.bak/Wnn/jlib/jl.c 2013-08-07 06:09:46.107457087 +0900
+++ FreeWnn-1.1.1-a022/Wnn/jlib/jl.c 2013-08-07 04:17:54.549210149 +0900
@@ -132,7 +132,7 @@
#include "commonhd.h"
#include "wnn_config.h"
@@ -70,19 +71,24 @@
static void add_down_bnst ();
static int alloc_heap ();
-static int call_error_handler ();
+static int call_error_handler FRWNN_PARAMS((int (*) (const char *), const char *));
static int change_ascii_to_int ();
static int create_file ();
static int dai_end ();
--- FreeWnn-1.1.1-a022.bak/Wnn/jserver/error.c 2013-08-07 06:10:21.510265098 +0900
+++ FreeWnn-1.1.1-a022/Wnn/jserver/error.c 2003-06-08 12:09:51.000000000 +0900
@@ -82,7 +82,7 @@
void
error_exit1 (x, y1, y2, y3, y4, y5)
char *x;
- long y1, y2, y3, y4, y5;
+ int y1, y2, y3, y4, y5;
{
/* 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;
- long y1, y2, y3, y4, y5, y6, y7, y8, y9, y10, y11, y12;
+ int y1, y2, y3, y4, y5, y6, y7, y8, y9, y10, y11, y12;
{
if (!noisy)
return;
--- FreeWnn-1.1.1-a022.bak/Wnn/jutil/atod.c 2004-08-12 18:03:19.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/jutil/atod.c 2013-08-07 00:06:48.611412840 +0900
@@ -70,19 +70,60 @@
#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);
+extern int wnn_loadhinsi FRWNN_PARAMS((unsigned char*)),
+ init_heap FRWNN_PARAMS((int,int,int,int,FILE*)),
+ little_endian FRWNN_PARAMS(()),
+ Sorted FRWNN_PARAMS((register char*,register int,int,int (*sort_fun)(char*,char*))),
+ asshuku FRWNN_PARAMS((int)),
+ revdic FRWNN_PARAMS((struct JT *,int));
+#ifdef CHINESE
+extern void ujis_header (int*);
+extern void ujis_header FRWNN_PARAMS((int*));
+#else
+extern void ujis_header (void);
+extern void ujis_header FRWNN_PARAMS((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 void read_ujis FRWNN_PARAMS((int,int,int)),
+ reverse_yomi FRWNN_PARAMS((void)),
+ create_rev_dict FRWNN_PARAMS((void)),
+ uniq_je FRWNN_PARAMS((int(*func)(char*,char*))),
+ sort_if_not_sorted FRWNN_PARAMS((void)),
+ output_header FRWNN_PARAMS((FILE*,struct JT*,struct wnn_file_head*)),
+ udytoS FRWNN_PARAMS((w_char*,int,char*,struct uind1*)),
+ output_ri FRWNN_PARAMS((FILE*)),
+ exit1 FRWNN_PARAMS((void)),
+ new_pwd FRWNN_PARAMS((char*,char*)),
+ rev_short_fun FRWNN_PARAMS((w_char*)),
+ rev_w_char FRWNN_PARAMS((w_char*,int));
+
+
extern
#ifdef BDIC_WRITE_CHECK
int
@ -89,30 +185,48 @@
-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);
+ put_n_EU_str FRWNN_PARAMS((FILE*,w_char*,int));
+
+extern int sort_func_sdic FRWNN_PARAMS((char*,char*));
+extern int sort_func_je FRWNN_PARAMS((char*,char*));
+extern char *get_cswidth_name FRWNN_PARAMS((register char*));
+extern void set_cswidth FRWNN_PARAMS((register unsigned int));
+
+static void ujistoud FRWNN_PARAMS((void)),
+ output_dic_index FRWNN_PARAMS((void)),
+ usage FRWNN_PARAMS((void)),
+ sdic_sort FRWNN_PARAMS((void)),
+ ujistosd FRWNN_PARAMS((int,int)),
+ not_enough_area FRWNN_PARAMS((void)),
+ get_pwd FRWNN_PARAMS((char*,char*)),
+ output_hindo FRWNN_PARAMS((FILE*)),
+ output_hinsi FRWNN_PARAMS((FILE*)),
+ output_kanji FRWNN_PARAMS((FILE*)),
+ rev_dic_data FRWNN_PARAMS((void)),
+ set_pter1 FRWNN_PARAMS((void)),
+ output_comment FRWNN_PARAMS((FILE*)),
+ output_hinsi_list FRWNN_PARAMS((FILE*));
+void upd_kanjicount FRWNN_PARAMS((int)),
+ output_dic_data FRWNN_PARAMS((void));
/* Switcher variable between UD and SD */
@@ -115,7 +121,7 @@
@@ -115,8 +156,7 @@
int tnum = 0;
struct uind2 *uhopter;
-char *hinsi_file_name = NULL;
-
+unsigned char *hinsi_file_name = NULL;
void
@@ -221,16 +227,16 @@
init (int argc, char **argv)
@@ -221,16 +261,12 @@
}
}
-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
@ -121,20 +235,10 @@
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 @@
@@ -442,7 +478,7 @@
{
if (which_dict == WNN_UD_DICT)
{
@ -143,7 +247,7 @@
jt.maxtable = tnum;
jt.maxhontai = (char *) uhopter - (char *) hostart;
jt.maxri2 = jt.maxri1[D_YOMI] = jt.maxri1[D_KANJI] = 0;
@@ -470,7 +475,7 @@
@@ -470,7 +506,7 @@
}
else
{
@ -152,48 +256,88 @@
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 @@
--- FreeWnn-1.1.1-a022.bak/Wnn/romkan/rk_bltinfn.c 2005-04-11 00:26:38.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/romkan/rk_bltinfn.c 2013-08-06 22:57:34.504818981 +0900
@@ -52,6 +52,7 @@
#include "commonhd.h"
#include "wnn_config.h"
#include "rk_header.h"
+#include "jslib.h"
/* 半角文字のコードのdefine */
#define HKCHOU (HNKAK1 * 0x100 + 0xB0) /* ｰ */
@@ -73,6 +74,10 @@
#define TOUTEN (0xA1A2) /* 、 */
#define NKPOTU (0xA1A6) /* ・ */
+/* This is bad code . It should be declared in the header .
+ * But where should it be declared ? */
+extern letter vtol FRWNN_PARAMS((letter));
+
static char _lang[6];
void
@@ -371,7 +376,7 @@
to_digit (in, base, outp)
letter in, base, **outp;
{
- letter c, vtol ();
+ letter c, vtol (letter);
+ letter c;
if (c = in, c /= base)
to_digit (c, base, outp);
--- Wnn/romkan/rk_fundecl.h
+++ Wnn/romkan/rk_fundecl.h
@@ -39,12 +39,12 @@
diff -ur FreeWnn-1.1.1-a022.bak/Wnn/romkan/rk_fundecl.h FreeWnn-1.1.1-a022/Wnn/romkan/rk_fundecl.h
--- FreeWnn-1.1.1-a022.bak/Wnn/romkan/rk_fundecl.h 2005-04-11 00:26:38.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/romkan/rk_fundecl.h 2013-08-06 23:04:20.136621426 +0900
@@ -39,12 +39,21 @@
***********************************************************************/
/* 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);
+#include "jslib.h"
+
+extern letter *ltrncpy FRWNN_PARAMS((letter*,letter*,int));
+extern int ltrcmp FRWNN_PARAMS((letter*,letter*)),
+ ltrncmp FRWNN_PARAMS((letter*,letter*,int));
+
+extern int romkan_init FRWNN_PARAMS((char*,letter,char,letter(*keyinfn)(),int(*bytcntfn)())),
+ romkan_init2 FRWNN_PARAMS((char*,letter,char,letter(*keyinfn)(),int(*bytcntfn)(),char,char,char)),
+ romkan_init3 FRWNN_PARAMS((char*,letter,letter,letter,letter(*keyinfn)(),int(*bytcntfn)(),int(*kbytcntfn)(),char,int));
+extern letter romkan_getc FRWNN_PARAMS((void)),
+ *romkan_henkan FRWNN_PARAMS((letter)),
+ romkan_next FRWNN_PARAMS((void));
+extern letter romkan_ungetc FRWNN_PARAMS((letter)),
+ romkan_unnext FRWNN_PARAMS((letter));
+extern void romkan_clear FRWNN_PARAMS((void));
+extern char *romkan_dispmode FRWNN_PARAMS((void));
extern char rk_errstat; /* これは関数ではなく変数 */
--- Wnn/romkan/rk_main.c
+++ Wnn/romkan/rk_main.c
@@ -91,23 +91,23 @@
diff -ur FreeWnn-1.1.1-a022.bak/Wnn/romkan/rk_main.c FreeWnn-1.1.1-a022/Wnn/romkan/rk_main.c
--- FreeWnn-1.1.1-a022.bak/Wnn/romkan/rk_main.c 2005-04-11 00:26:38.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/romkan/rk_main.c 2013-08-06 23:19:20.204768004 +0900
@@ -42,6 +42,7 @@
#include "rk_header.h"
#include "rk_extvars.h"
#include "rk_fundecl.h"
+#include "jslib.h"
struct matchpair /* 現在マッチされている変数の番号と、マッチした文字の
組を保持。 */
@@ -91,23 +92,48 @@
letter saishu_out[OUTSIZ];
letter delchr, delchr2 = EOLTTR, nisedl; /* DELのキャラクタは二個まで持てる */
-modetyp chgmod (), incmod (), decmod ();
+modetyp chgmod (int,modetyp), incmod (int,modetyp), decmod (int,modetyp);
-
+modetyp chgmod FRWNN_PARAMS((int,modetyp)),
+ incmod FRWNN_PARAMS((int,modetyp)),
+ decmod FRWNN_PARAMS((int,modetyp));
/* letterを返す関数の定義及び宣言（一部にはcharのものも混じっている） */
@ -201,10 +345,15 @@
-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);
+static letter mchedsrc FRWNN_PARAMS((int));
+letter romkan_next FRWNN_PARAMS((void)),
+ romkan_unnext FRWNN_PARAMS((letter));
+letter romkan_getc FRWNN_PARAMS((void)),
+ romkan_ungetc FRWNN_PARAMS((letter)),
+ *romkan_henkan FRWNN_PARAMS((letter));
+letter to_zenalpha FRWNN_PARAMS((letter)),
+ to_zenhira FRWNN_PARAMS((letter)),
+ to_zenkata FRWNN_PARAMS((letter));
/* to_zenhira;kata は濁点を持つ文字を一まとめにしない。 */
-void BUGreport ();
@ -213,90 +362,181 @@
-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);
+void BUGreport FRWNN_PARAMS((int));
+static void maeato_henkan FRWNN_PARAMS((letter,letter*,int*)),
+ add_at_eof FRWNN_PARAMS((void)),
+ rk_delete FRWNN_PARAMS((letter)),
+ set_rubout FRWNN_PARAMS((letter*,int,letter)),
+ mchevl FRWNN_PARAMS((letter**,letter*)),
+ codeout_chg FRWNN_PARAMS((void)),
+ ltrevlcpy FRWNN_PARAMS((letter*,letter*));
+int match FRWNN_PARAMS((void));
+static int p_eq FRWNN_PARAMS((register letter**,register letter**)),
+ hen_ikisrc FRWNN_PARAMS((int,letter)),
+ henkan_ok FRWNN_PARAMS((void)),
+ rk_rst FRWNN_PARAMS((void)),
+ head_bytecount FRWNN_PARAMS((uns_chr*));
+extern void readdata FRWNN_PARAMS((letter*,struct dat*,letter**,char*)),
+ romkan_reset FRWNN_PARAMS((void)),
+ hank_setup FRWNN_PARAMS((void)),
+ to_hankata FRWNN_PARAMS((letter,letter**)),
+ to_digit FRWNN_PARAMS((letter,letter,letter**)),
+ dakuadd FRWNN_PARAMS((letter,letter**)),
+ handakuadd FRWNN_PARAMS((letter,letter**)),
+ allchgmod FRWNN_PARAMS((modetyp));
+extern int ltov FRWNN_PARAMS((letter));
+int romkan_init2 FRWNN_PARAMS((char*,letter,char,letter(*keyinfn)(),int(*bytcntfn)(),char,char,char));
+int romkan_init3 FRWNN_PARAMS((char*,letter,letter,letter,letter(*keyinfn)(),int(*bytcntfn)(),int(*kbytcntfn)(),char,int));
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 @@
--- FreeWnn-1.1.1-a022.bak/Wnn/romkan/rk_modread.c 2005-04-11 00:26:38.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/romkan/rk_modread.c 2013-08-06 23:35:25.974413286 +0900
@@ -60,20 +60,42 @@
/* マクロLIBDIRの定義（のためだけ）。コンパイル時は、ヘッダファイルの
サーチパスに、Wnnのインクルードファイルのありかを設定しておくこと。 */
#endif
+#include "jslib.h"
#define Terminator 0 /* intの列（naibu[]）の終止コード */
-extern char *chrcat (), *strend (), *ename ();
+extern char *chrcat (char*,char), *strend (char*), *ename (char*);
+extern char *chrcat FRWNN_PARAMS((char*,char)),
+ *strend FRWNN_PARAMS((char*)),
+ *ename FRWNN_PARAMS((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);
+static void cond_evl FRWNN_PARAMS((char*)),
+ mystrcpy FRWNN_PARAMS((char*,char*)),
+ rd_bcksla FRWNN_PARAMS((register FILE*,char**)),
+ rd_ctrl FRWNN_PARAMS((register FILE*,char**)),
+ hyouse FRWNN_PARAMS((int)),
+ look_choose FRWNN_PARAMS((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*);
+static int mystrcmp FRWNN_PARAMS((char*,char*)),
+ read1tm FRWNN_PARAMS((char**,int)),
+ mod_evl FRWNN_PARAMS((char*)),
+ fnmsrc_tourk FRWNN_PARAMS((char*)),
+ dspnamsrc_tourk FRWNN_PARAMS((char*)),
+ scan1tm FRWNN_PARAMS((char**,char*,int)),
+ modsrc_tourk FRWNN_PARAMS((char*,int)),
+ chk_get_int FRWNN_PARAMS((char*,unsigned int*,modetyp)),
+ pathsrc_tourk FRWNN_PARAMS((char*)),
+ modnamchk FRWNN_PARAMS((char*)),
+ ctov FRWNN_PARAMS((char)),
+ look_cond FRWNN_PARAMS((int**,int)),
+ evlcond FRWNN_PARAMS((int**)),
+ chkchar_getc FRWNN_PARAMS((FILE*));
+static char codeeval FRWNN_PARAMS((register char**));
+extern void ERRMOD FRWNN_PARAMS((unsigned int)),
+ ERMOPN FRWNN_PARAMS((unsigned int)),
+ BUGreport FRWNN_PARAMS((int));
+extern int filnamchk FRWNN_PARAMS((char*));
struct kwdpair
{
@@ -122,6 +122,7 @@
@@ -122,6 +144,7 @@
return (i);
ERRMOD (9);
/*NOTREACHED*/
+ return 0;
+ return 0;
}
/** モード表の読み込み */
--- Wnn/romkan/rk_read.c
+++ Wnn/romkan/rk_read.c
@@ -51,16 +51,16 @@
--- FreeWnn-1.1.1-a022.bak/Wnn/romkan/rk_read.c 2005-04-11 00:26:38.000000000 +0900
+++ FreeWnn-1.1.1-a022/Wnn/romkan/rk_read.c 2013-08-06 23:47:10.950793006 +0900
@@ -50,17 +50,48 @@
#include <sys/types.h>
#include "rk_header.h"
#include "rk_extvars.h"
+#include "jslib.h"
-letter onescan (), *rangekettei ();
-char *ename ();
+letter onescan (letter**,letter*), *rangekettei (int,letter*);
+char *ename (char*);
+letter onescan FRWNN_PARAMS((letter**,letter*)),
+ *rangekettei FRWNN_PARAMS((int,letter*));
+char *ename FRWNN_PARAMS((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*);
+extern letter *ltrgrow FRWNN_PARAMS((letter*,letter*)),
+ *ltrend FRWNN_PARAMS((letter*)),
+ letterpick FRWNN_PARAMS((uns_chr**)),
+ *ltr1cut FRWNN_PARAMS((letter*));
+extern char *chrcat FRWNN_PARAMS((char*,char)),
+ *strend FRWNN_PARAMS((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*);
+static int termsscan FRWNN_PARAMS((register letter**,letter*,int)),
+ evalandcpy FRWNN_PARAMS((register letter**,int)),
+ eval1cpy FRWNN_PARAMS((letter**,int,int)),
+ partscan FRWNN_PARAMS((register letter**,register letter*)),
+ evlis FRWNN_PARAMS((int,letter**,int)),
+ atermscan FRWNN_PARAMS((register letter**,register letter*,int)),
+ serfun FRWNN_PARAMS((register letter*)),
+ hensrc_tourk FRWNN_PARAMS((letter*,int)),
+ blankpass FRWNN_PARAMS((register letter**,int)),
+ modsrcL FRWNN_PARAMS((letter*)),
+ chkL_get_int FRWNN_PARAMS((letter*,modetyp*,modetyp));
+static void ERRLIN FRWNN_PARAMS((unsigned int)),
+ ERHOPN FRWNN_PARAMS((unsigned int)),
+ readhyo FRWNN_PARAMS((int)),
+ ltr1tostr FRWNN_PARAMS((letter,char**)),
+ ERRHYO FRWNN_PARAMS((unsigned int)),
+ vchk FRWNN_PARAMS((letter*)),
+ rangeset FRWNN_PARAMS((int,letter*)),
+ de_bcksla FRWNN_PARAMS((char*,char*)),
+ listscan FRWNN_PARAMS((register letter**,register letter*)),
+ singleqscan FRWNN_PARAMS((letter**,letter*)),
+ doubleqscan FRWNN_PARAMS((letter**,letter*));
+extern void BUGreport FRWNN_PARAMS((int)),
+ choosehyo FRWNN_PARAMS((void)),
+ readmode FRWNN_PARAMS((char*));
+extern int ltrcmp FRWNN_PARAMS((letter*,letter*)),
+ ltrstrcmp FRWNN_PARAMS((register letter*,register char*)),
+ readfnm FRWNN_PARAMS((int (*readchar_func) (void),int (*unreadc_func) (int),int (*readstr_func) (char**,int),char**,int*)),
+ fixednamep FRWNN_PARAMS((char*));
#define IHENSU (1 << 24) /* 内部表現の上位１バイトで、変数を表す */
#define IKANSU (2 << 24) /* 〃 関数を表す */
--- FreeWnn-1.1.1-a022.bak/Xwnmo/xwnmo/do_socket.c 2013-08-07 06:10:21.520265048 +0900
+++ FreeWnn-1.1.1-a022/Xwnmo/xwnmo/do_socket.c 2001-06-15 03:16:14.000000000 +0900
@@ -90,9 +90,9 @@
XIMCmblk *cblk;
XIMCmblk *cur_cblk = NULL;
-fd_set *all_socks;
-fd_set *ready_socks;
-static fd_set *dummy1_socks, *dummy2_socks;
+int *all_socks;
+int *ready_socks;
+static int *dummy1_socks, *dummy2_socks;
static int sel_width;
static int nofile;
@@ -114,14 +114,9 @@
static int rc = 0;
#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)
+#define sock_tst(array,pos) (array[pos/BINTSIZE] & (1<<(pos%BINTSIZE)))
extern int read (), write ();

3825
FreeWnn-prototypes_3.patch Normal file
View File

File diff suppressed because it is too large Load Diff

38
FreeWnn-prototypes_msg.patch Normal file
View File

@ -0,0 +1,38 @@
From: Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
Date: 2013-08-09 09:51:15 +0900
Subject: input: prototype declarations for bugs about error messages .
References: http://lists.opensuse.org/opensuse-ja/2013-08/msg00014.html
Upstream: sent
Bugfix: In openSUSE 13.1 Milestone 3,
uum could not get error messages .
This issue's cause is that we forgot prototype declaration
of msg_get() in Wnn/include/msg.h .
Then I added "FreeWnn-prototypes_msg.patch" as %Patch15 .
http://lists.opensuse.org/opensuse-ja/2013-08/msg00014.html
http://sourceforge.jp/projects/freewnn/lists/archive/users/2013-August/000140.html
---
diff -r -u Wnn/include/msg.h /home/mitsutoshi/src/Wnn/include/msg.h
--- Wnn/include/msg.h 2013-08-09 08:34:01.169023491 +0900
+++ /home/mitsutoshi/src/Wnn/include/msg.h 2013-08-09 08:25:29.353137583 +0900
@@ -64,8 +64,14 @@
*/
#define DEF_LANG "ja"
-extern struct msg_cat *msg_open ();
-extern char *msg_get ();
-extern void msg_close ();
+#if __STDC__
+#define FRWNN_PARAMS(paramlist) paramlist
+#else
+#define FRWNN_PARAMS(paramlist) ()
+#endif
+
+extern struct msg_cat *msg_open FRWNN_PARAMS((char *, char *, char *));
+extern char *msg_get FRWNN_PARAMS((struct msg_cat *, int id, char *, register char *lang));
+extern void msg_close FRWNN_PARAMS((register struct msg_cat *));
#endif /* WNN_MSG_H */

11
FreeWnn-returnvalue.diff
View File

@ -1,11 +0,0 @@
--- Wnn/uum/jhlp.c
+++ Wnn/uum/jhlp.c
@@ -402,6 +402,8 @@
#endif /* defined(uniosu) */
do_main ();
+ /* Shouldn't get here */
+ return 42;
}
/*

2
FreeWnn-sighandler.patch
View File

@ -13,7 +13,7 @@
+ if (sig == SIGTERM)
+ _exit(0);
+ else
+ _exit(-1);
+ _exit(255);
+}
+#endif
+

35
FreeWnn-trad_cpp.patch
View File

@ -1,51 +1,52 @@
--- Wnn/pubdicplus/Makefile.in
+++ Wnn/pubdicplus/Makefile.in
--- FreeWnn-1.1.1-a022.bak/Wnn/pubdicplus/Makefile.in 2013-08-07 06:08:05.039178998 +0900
+++ FreeWnn-1.1.1-a022/Wnn/pubdicplus/Makefile.in 2013-08-07 00:37:02.866652685 +0900
@@ -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) $@
- $(FZK_PP) $(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 @@
diff -ur FreeWnn-1.1.1-a022.bak/cWnn/cdic/Makefile.in FreeWnn-1.1.1-a022/cWnn/cdic/Makefile.in
--- FreeWnn-1.1.1-a022.bak/cWnn/cdic/Makefile.in 2013-08-07 06:08:05.110178385 +0900
+++ FreeWnn-1.1.1-a022/cWnn/cdic/Makefile.in 2013-08-07 00:39:21.716718581 +0900
@@ -64,10 +64,10 @@
$(DICS): $(HINSI)
$(FULL):: $(FZK_SRCS) con.master-.c
- $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
- $(FZK_PP) -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) $@
- $(FZK_PP) -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 @@
--- FreeWnn-1.1.1-a022.bak/cWnn/tdic/Makefile.in 2013-08-07 06:08:05.139178134 +0900
+++ FreeWnn-1.1.1-a022/cWnn/tdic/Makefile.in 2013-08-07 00:43:26.207005663 +0900
@@ -64,10 +64,10 @@
$(DICS): $(HINSI)
$(FULL):: $(FZK_SRCS) con.master-.c
- $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
- $(FZK_PP) -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) $@
- $(FZK_PP) -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 @@
--- FreeWnn-1.1.1-a022.bak/kWnn/kdic/Makefile.in 2013-08-07 06:08:05.151178030 +0900
+++ FreeWnn-1.1.1-a022/kWnn/kdic/Makefile.in 2013-08-07 00:44:57.500267277 +0900
@@ -62,7 +62,7 @@
$(DICS): $(HINSI)
$(FULL):: $(FZK_SRCS) fzk.master-.c
- $(CPP) -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
- $(FZK_PP) -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'

31
FreeWnn-uum.patch
View File

@ -1,31 +0,0 @@
--- 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) */
-#ifndef sgi
+#if !defined(sgi) && !defined(linux)
ptyname (nmbuf, ptynm, ptyno);
if (chown (nmbuf, 0, 0) == ERROR)
{
--- 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@libdir@/termcap
#
@@ -112,7 +112,7 @@
WNNBINDIR = ${PREFIX}/bin
WNNINCDIR = @includedir@
WNNLIBDIR = @libdir@
- WNNTERM_LIB = -ltermcap
+ WNNTERM_LIB = -ltermcap -lcrypt
PUBDICPLUSSRC = $(IMTOP)/PubdicPlus
WNNCONSDICSRC = $(IMTOP)/Wnn-consortium/dic

339
fwnn.changes
View File

@ -1,3 +1,342 @@
-------------------------------------------------------------------
Thu Aug 15 15:42:53 UTC 2013 - bkbin005@rinku.zaq.ne.jp
- Modify FreeWnn-prototypes_3.patch .
I found a bug in make_hinsi_list() at Wnn/jserver/hinsi_list.c,
then fixed it .
-------------------------------------------------------------------
Thu Aug 15 15:07:13 UTC 2013 - bkbin005@rinku.zaq.ne.jp
- Add FreeWnn-prototypes_3.patch .
Prototype declarations for reducing compilation warnings .
-------------------------------------------------------------------
Fri Aug 9 00:51:15 UTC 2013 - bkbin005@rinku.zaq.ne.jp
- Add FreeWnn-prototypes_msg.patch .
Bugfix: In openSUSE 13.1 Milestone 3,
uum could not get error messages .
This issue's cause is that we forgot prototype declaration
of msg_get() in Wnn/include/msg.h .
Then I added "FreeWnn-prototypes_msg.patch" as %Patch15 .
http://lists.opensuse.org/opensuse-ja/2013-08/msg00014.html
http://sourceforge.jp/projects/freewnn/lists/archive/users/2013-August/000140.html
- I added %configure --with-libwrap option .
The [jctk]server s were linked -lwrap .
Then we can use /etc/hosts.allow /etc/hosts.deny .
- Degrade fix: In "FreeWnn-prototypes.patch",
I invalidated the patch of "FreeWnn-sighandler.patch" .
Then I deleted a wrong patch to "Wnn/jserver/de.c"
from "FreeWnn-prototypes.patch" .
http://sourceforge.jp/projects/freewnn/lists/archive/users/2013-August/000141.html
- Change: In "FreeWnn-sighandler.patch",
I changed from _exit(-1) to _exit(255) .
This change effects [jctk]server's exit status .
-------------------------------------------------------------------
Thu Aug 8 04:16:47 UTC 2013 - bkbin005@rinku.zaq.ne.jp
- SLE_11 and openSUSE 12.2 does not provide libwrap0,
then I could not build FreeWnn on them .
So, I deleted %configure --with-libwrap option
and "BuildRequires: libwrap0" from fwnn.spec file .
-------------------------------------------------------------------
Wed Aug 7 22:53:49 UTC 2013 - bkbin005@rinku.zaq.ne.jp
- The uum can use UNIX 98 pseudoterminal now . (bnc#830533)
https://bugzilla.novell.com/show_bug.cgi?id=830533
- The kuum is packaged in fkwnn .
- The cuum is packaged in fcwnncom .
- The [jctk]server s were linked -lwrap .
Then we can use /etc/hosts.allow /etc/hosts.deny .
- This release need not link to -ltermcap, but use ncurses,
then fwnn.spec was changed .
- FreeWnn-trad_cpp.patch:
Makefile.in s were changed formats, then remade the patch .
- FreeWnn-prototypes.patch:
Already, many functions were added prototype decraretion
in the tarball, then remade this patch .
- FreeWnn-returnvalue.diff:
Already, the tarball's source was fixed about return value .
Then this patch was removed .
- FreeWnn-include.patch:
Many sources already included proper header files .
Then this patch was remade .
- Freewnn-1.1.1-a21.dif was deleted,
but Freewnn-1.1.1-a22.dif was added:
In Wnn/include/jllib.h, many functions were added
prototype decraretion in the tarball,
then they need not to declare in the patch .
In Wnn/jlib/jlib.c, wrong cast changed .
- FreeWnn-uum.patch, fwnn.spec:
Now, FreeWnn need not to use -ltermcap,
but need to use -lncursess, then this patch was deleted .
And "BuildRequires:" was changed from termcap to ncurses
in fwnn.spec .
- FreeWnn-ja.patch:
FreeWnn-1.1.1-a017/Xsi/Wnn/uum/header.c was changed , then remade it .
- Fwnn-fsstnd-patch:
Changed makerule.mk.in format, then remade it .
- FreeWnn 1.1.1-a-22 released .
* Removed strange word (pronounces as 'Hirokazu', transfers to
'Kobayashi'). Spotted by some poster of FreeWnn thread in
2ch.net
(http://toro.2ch.net/test/read.cgi/unix/1084551838/458)
* uum failed to start on traditional systems because opening
tty fails. Fixed open_pty_traditional()
to set tty_slave correctly.
* Improve libutil detection. Systems that have both ptsname() and
openpty() does not need libutil, this change (probably)
covers these systems. ([freewnn-users 133]).
http://sourceforge.jp/projects/freewnn/lists/archive/users/2013-August/000132.html
* libutil is (may be) used only in uum, so separate this library
(if exists) from normal LIBS.
Patch by 1xx (itsango at gmail.com) ([freewnn-users 126])
http://sourceforge.jp/projects/freewnn/lists/archive/users/2013-July/000125.html
.
* Pass CPPFLAGS and LDFLAGS on configure / make.
Original suggestion by Hideki Yamane, but arranged a bit.
* Wnn/uum/inspect.c:
Fix typo in comment.
* Wnn/: jutil/wddel.c, jutil/wdreg.c, uum/inspect.c,
uum/select_ele.c:
* Quick fix for warning about format-security by gcc.
Based on patch by Hideki Yamane and Makoto Fujiwara
([Freewnn-users 102]).
http://sourceforge.jp/projects/freewnn/lists/archive/users/2012-May/000101.html
Replacing from sprintf() to snprintf() or strncat()
would be better.
* (Wnn/jutil/wddel.c) Change (fix?) type of Com[] to w_char
in code for 'wddel -C' mode. I think I'm doing right,
but not tested.
* Strip old mail address (as usual).
* configure, configure.in, Wnn/jutil/Makefile.in,
Wnn/uum/Makefile.in, cWnn/jutil/Makefile.in,
cWnn/uum/Makefile.in, kWnn/jutil/Makefile.in,
kWnn/uum/Makefile.in:
Fix to work --with-*wnn-includes .
Same as --with-*wnn-libraries , these are enabled
on *Wnn/jutil and *Wnn/uum only.
* Fix to work as expected in case --without-lib*wnn is explicitly
specified.
* Wnn/jserver/renbn_kai.c:
* Explicitly add cast to pointer in tan_syo().
It helps compilers to guess argument type of sbn_kai(),
and fix other jserver crash bug on Linux/amd64 .
* Wnn/jserver/de_header.h:
Added prototype declaration of functions in bnsetu_kai.c
(for safety) .
* configure, configure.in:
We cannot build Xwnmo for now, so we (temporally) disabled
AC_PATH_X .
Probably workaround for systems with modern install layout
of X11.
* Wnn/jserver/de_header.h:
Fix return type mismatch of kanjiaddr()
prototype declaration .
Spotted on
http://twitter.com/pachira23/status/8875168688513024 ,
and reported to freewnn-users by Hideki Yamane. Original
reporter saids it also fixes crash bug of jserver when client
register new word to dictionary.
* Add prototype declaration of functions in bdic.c (and some
source files).
* Wnn/jutil/ujisf.c:
Added prototype declaration of kanjiaddr() and Print_entry() .
* INSTALL, configure, configure.in, makerule.mk.in,
Wnn/jserver/Makefile.in, Wnn/jutil/Makefile.in,
Wnn/man/4.cmd/Makefile.in, Wnn/man/6.jutil/Makefile.in,
Wnn/uum/Makefile.in, cWnn/jserver/Makefile.in,
cWnn/jutil/Makefile.in, cWnn/man/4.cmd/Makefile.in,
cWnn/man/6.jutil/Makefile.in, cWnn/uum/Makefile.in,
kWnn/jserver/Makefile.in, kWnn/jutil/Makefile.in,
kWnn/uum/Makefile.in:
Added (first step of) support for new installation path
layout .
Maybe useful for package managers .
* Makefile.in:
Remove rules that exist on makerule.mk. make install
(for example) runs two times faster :-p
* configure, configure.in, makerule.mk.in,
Wnn/pubdicplus/Makefile.in, cWnn/cdic/Makefile.in,
cWnn/tdic/Makefile.in, kWnn/kdic/Makefile.in:
Recent cpp of gcc (at least 4.4) splits line that has many
characters per line (in C language manner). This is problem
on *.fzk (pubdic etc.) file processing. So adds
-traditional-cpp parameter to cpp
(at least gcc-2.95 passes this parameter).
Simply adding it to CPPFLAGS may break other build,
so split FZK_PP (cpp for text processing) from normal CPP .
Spotted by some posters of FreeWnn thread in 2ch.net .
(Other changes)
* Use AC_SEARCH_LIBS for libnsl checking
(Linux (for example) does not need it) .
* Modified to build correctly if builddir != srcdir (as usual).
* Wnn/: man/2.env/wnn/2b_romkan.man, manual/2.env/wnn/2b_romkana:
* Change '\' to '\e' to correctly format backslash
in man file .
(Also change formatted text file.)
It should reduce Debian lintian warning .
* Added .nf / .fi to pre-formatted table.
* Wnn/uum/setutmp.c:
* Stop checking return value of pututline()
because many systems does not have return value
of this function.
* Change handling of ut_err to work correctly
(especially on systems that have utmp (pututline())
without utmpx) .
* aclocal.m4, config.guess, config.sub, configure, ltmain.sh:
Update libtool to 1.5.26
(last release of 1.5 series - bit old).
* (jhlp.c) Check owner / permission of ttyp (tty_slave / ttypfd)
on open_ttyp(). If check (and chown/chmod) fails,
uum warns it may be insecure (ttyp readable)
from other local users.
(Probably you need proper privileges to uum
(ex. setuid-root) . )
* (jhlp.c) Verbose error message on restoring owner
/ permission of tty_master and ttyp in do_end() .
* (sheader.h) Added Prototype of openTermData() / getTermData() .
* Wnn/jlib/Makefile.in, Wnn/jlib.V3/Makefile.in,
cWnn/jlib/Makefile.in, kWnn/jlib/Makefile.in:
* Tell Libtool to use external libraries needed for libwnn (and
lib[ck]wnn). (ex. libcrypt, libnsl)
You don't need detection of these libraries to use libwnn
itself in configure (I hope).
* Use LT_LD to link libraries.
* (*Wnn/jlib/Makefile.in) Remove definition of LT_{CC,INSTALL}
because we already defined in makerule.mk .
* (Wnn/jlib.V3/Makefile.in) Make use of LT_{CC,INSTALL}
in makerule.mk to reduce libtool warning .
* (Wnn/jlib.V3/Makefile.in) My usual work to build correctly
if builddir != srcdir .
* Wnn/include/: jllib.h, jslib.h:
* Added prototype (and simple macro (FRWNN_PARAMS) around the
parameters for good-old C compilers) or jslib.h / jllib.h .
Parameters are came from js.c / jl.c .
* Added extern "C" { ... } for C++ clients.
* cWnn/man/2.env/ckey.man:
* Added .nf / .fi to pre-formatted table.
* INSTALL, INSTALL.en, configure, configure.in, makerule.mk.in,
Wnn/uum/Makefile.in, cWnn/uum/Makefile.in,
kWnn/uum/Makefile.in:
* Added detection code if your system need to install uum as
set-[ug]id program on configure time.
Recent systems may install uum as normal program
(to reduce security risk) .
You can also specify
--enable-client-setuid / --enable-client-setgid=group
(group must be specified) to control set-[ug]id of uum .
(NOTE: SUSE/openSUSE are using --disable-client-setuid
and --disable-client-setgid . )
* Added uum-related option to INSTALL* file .
* Use modern style AC_INIT. (added pseudo(?) version number and
contact address. comments are welcome.)
* Wnn/uum/epilogue.c:
epilogue_no_close(): Replaced to HAVE_TERMINFO
(maybe it's right) .
* config.h.in, configure, configure.in, Wnn/uum/jhlp.c:
Use posix_openpt() (if it and ptsname() exists)
when opening tty .
Traditional pts system (that doesn't have posix_openpt())
fallback to dummy function opening /dev/ptmx directly.
Getting tty without setting setuid root works in non-pts
systems that have posix-compatible pty functions
(ex. recent FreeBSD) . (bnc#830533)
* Other changes to configure.in:
Commented out useless AC_DEFINE in term library detection
part .
* jhlp.c:
* Mask IEXTEN in j_term_init().
* Use tty_master for systems that has /dev/ptmx and not have
ptsname(). (ex. old Debian (2.1 or so))
* Added comment.
* termio.c:
* Use tparm() as macro for fixed parameter system (ex. SVR4) .
* Wnn/uum/jhlp.c:
More use of USE_LINUX_TERM in exec_cmd()
(as of original canuum patch) .
And window size setting code moved from Linux specific
to generic .
* config.h.in, configure, configure.in:
Added configure test for setsid(). (I forgot it.)
* config.h.in, configure, configure.in, Wnn/uum/jhlp.c,
Wnn/uum/setutmp.c:
More utmp fix:
* Fix build (more) correctly on recent NetBSD (that both have
utmpx & traditional utmp)
* Moved setutmp() call from child to parent proces
(not sure if this is right thing)
* config.h.in, configure, configure.in, Wnn/uum/jhlp.c,
Wnn/uum/setutmp.c, Wnn/uum/sheader.h:
* Rewrote utmp code in uum (without libspt).
* Because it cannot work on gcc with Linux/i386,
temporally remove -fstack-check from CDEBUGFLAGS
if you specify --enable-debug (and you're using gcc) .
* Contrib/dic/gerodic/Makefile.in:
Usual work:
* Some modification in case if builddir != srcdir
(Does not harm normal build.)
* Wnn/uum/setutmp.c:
In current setutmp.c code, saveut / nullut must be struct utmp.
So removed struct utmpx statement.
This will fix compile on systems that both have utmp.h and utmpx.h
(e.g. NetBSD).
* Wnn/uum/jhlp.c: Some minor fix for compiling some platforms:
* crow is declared in header.h, so remove duplicate extern.
* #ifdef-ed I_PUSH ptem / ldterm for platforms that don't have
STREAMS but have ptsname (e.g. Linux, recent NetBSD) .
* Wnn/uum/setutmp.c:
Some minor change to fix compile error on Linux.
UTMP feature is so complex to understand ...
* configure, configure.in, makerule.mk.in:
Modified WNNCNVFILEDIR to install correct cnv_* file
if you're in terminfo environment.
* CONTRIBUTORS, config.h.in, configure, configure.in,
Wnn/conv/cvt_head.h, Wnn/conv/cvt_read.c,
Wnn/include/commonhd.h, Wnn/include/wnn_os.h,
Wnn/uum/Makefile.in, Wnn/uum/header.c,
Wnn/uum/jhlp.c, Wnn/uum/sdefine.h, Wnn/uum/setutmp.c,
Wnn/uum/sheader.h, Wnn/uum/termcap.c, Wnn/uum/termio.c,
cWnn/uum/Makefile.in, kWnn/uum/Makefile.in:
Long awaited merge of uum-related patch (based on hiroo's work
in November, 2003)
* Detect termcap / terminfo, curses etc. automatically
(from canuum)
But, configure support of libspt does not implemented /
does not include Canna support / utmp implementation does not
work correctly.
* pty / pts processing (from Kabe). Auto detection in configure
by hiroo.
* Some modification due to build error in my environment.
* Adding lines in case if builddir != srcdir .
Many thanks to AIDA shinra, Taketo Kabe @ SRA Tohoku, hiroo,
kouji at hiroshima-u.ac.jp (original author of Kabe's patch) .
* makerule.mk.in, Wnn/romkan/Makefile.in,
cWnn/romkan/Makefile.in, kWnn/romkan/Makefile.in:
Some minor changes before large commit:
makerule.mk.in:
* Remove MAKE (if your make does not need this).
You can build with other make command (ex. gmake) .
* Define LT_{CC,LD,INSTALL} globally .
* Wnn/romkan/Makefile.in:
* Use LT_CC to remove warning.
* (Usual work) changed some lines to build correctly
in case builddir != srcdir . (I think this don't break
normal build.)
* Wnn/uum/: hinsi.c, jikouho.c, printf.c, termio.c, touroku.c:
* Include string related header to reduce warning. (more merged
from hiroo's work tree.)
* Stripped old mail address (as usual) .
* Wnn/uum/basic_op.c:
* Include string related header to reduce warning.
(Merged from hiroo's work tree.)
* PubdicPlus/pod.c: Reverse condition of prototype section.
* Wnn/include/commonhd.h: Increment _SERVER_VERSION for next
(alpha?) release.
-------------------------------------------------------------------
Sun Dec 16 21:19:31 UTC 2012 - schwab@linux-m68k.org

113
fwnn.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package fwnn
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 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
@ -16,39 +16,44 @@
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: fwnn
BuildRequires: ncurses-devel
BuildRequires: termcap
BuildRequires: tcpd-devel
#BuildRequires: termcap
%define base_version 1.1.1
%define alpha_version a021
%define alpha_version a022
Requires: fwnncom
Conflicts: wnn6
PreReq: /usr/sbin/useradd %insserv_prereq %fillup_prereq
Version: 1.1.1a021
Release: 0
Url: http://www.freewnn.org
Version: 1.1.1a022
Release: 28.1
Url: http://freewnn.sourceforge.jp/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: FreeWnn Japanese Input System--Server Only
License: GPL-2.0+
Group: System/I18n/Japanese
Source: ftp://ftp.etl.go.jp/pub/FreeWnn/alpha/FreeWnn-%{base_version}-%{alpha_version}.tar.bz2
Source0: ftp://ftp.iij.ad.jp/pub/sourceforge.jp/freewnn/59257/FreeWnn-%{base_version}-%{alpha_version}.tar.bz2
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
Patch5: FreeWnn-1.1.1-a022.dif
Patch7: FreeWnn-s390x.patch
Patch8: FreeWnn-warnings.patch
Patch11: FreeWnn-include.patch
Patch12: FreeWnn-returnvalue.diff
Patch13: FreeWnn-prototypes.patch
Patch14: FreeWnn-trad_cpp.patch
# PATCH-FIX-OPENSUSE bkbin005@rinku.zaq.ne.jp -- fixed a bug in make_hinsi_list()
Patch15: FreeWnn-prototypes_msg.patch
# PATCH-FIX-OPENSUSE bkbin005@rinku.zaq.ne.jp -- fixed uum can't get messages .
Patch16: FreeWnn-prototypes_3.patch
# Summary(ja): FreeWnn 日本語入力システム - サーバのみ
# %description -l ja
#
@ -245,19 +250,20 @@ client programs that use the Korean Input System, Free kWnn.
# 国語の入力環境を提供します。クライアントは、ＸＩＭライブラリを使うことに
# より、xwnmo を使用できます。変換のエンジンには、国際化されたＷｎｎを使用
# します。クライアントのランゲージに応じて、変換サーバを選択します。
%setup -q -n FreeWnn-%{base_version}-%{alpha_version}
%patch0 -p2
%patch1 -p2
%patch2 -p2
%setup -q -n FreeWnn-%{base_version}-%{alpha_version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p2
%patch4 -p2
%patch5 -p1
%patch7 -p2 -b .s390x
%patch8
%patch11 -p2
%patch12
%patch13
%patch14
%patch11 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p0
%__mv Wnn/jserver/kaiseki.h Wnn/include/
%patch16 -p1
#%setup -b 1 -n Xsi # add include-files for Xwnmo
# SuSE setlocale patch, try to set LC_CTYPE if LC_ALL fails (Xwnmo) and
#......................................................................
@ -267,23 +273,28 @@ client programs that use the Korean Input System, Free kWnn.
# %patch3 -p1
%build
./configure --prefix=/usr \
%configure --prefix=/usr \
--libdir=%{_libdir} \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
%{_target_cpu}-suse-linux-gnu
%{_target_cpu}-suse-linux-gnu \
--disable-sub-bindir \
--enable-client --disable-client-setuid --disable-client-setgid \
--with-libwrap
# not -j safe, see Wnn/pubdicplus/Makefile.in
make CCOPTIONS="$RPM_OPT_FLAGS"
pushd Wnn/uum
make CCOPTIONS="$RPM_OPT_FLAGS"
popd
make
#pushd Wnn/uum
#make CCOPTIONS="$RPM_OPT_FLAGS"
#popd
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTPGMFLAGS=
make install.man DESTDIR=$RPM_BUILD_ROOT
pushd Wnn/uum
make install DESTDIR=$RPM_BUILD_ROOT INSTPGMFLAGS=
popd
%makeinstall
#make install DESTDIR=$RPM_BUILD_ROOT INSTPGMFLAGS=
make install.man DESTDIR=$RPM_BUILD_ROOT
#pushd Wnn/uum
#make install DESTDIR=$RPM_BUILD_ROOT INSTPGMFLAGS=
#popd
#----------------------------------------------------------------------
# move Japanese man pages to their correct destination:
# (the above 'make install.man' command installs Japanese AND English
@ -291,49 +302,49 @@ popd
# The Japanese manpages should be in a subdirectory 'ja'
# (or maybe ja_JP.eucJP), therefore I move them here:
for i in 1 2 3 4 5 6 7 8 9 ; do
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/ja/man$i
%__mkdir_p $RPM_BUILD_ROOT/%{_mandir}/ja/man$i
done
for i in atod.1 atof.1 dtoa.1 jserver.1 oldatonewa.1 uum.1 wddel.1 wdreg.1 \
wnnkill.1 wnnstat.1 wnntouch.1
do
mv $RPM_BUILD_ROOT/%{_mandir}/man1/$i $RPM_BUILD_ROOT/%{_mandir}/ja/man1/
%__mv $RPM_BUILD_ROOT/%{_mandir}/man1/$i $RPM_BUILD_ROOT/%{_mandir}/ja/man1/
done
mv $RPM_BUILD_ROOT/%{_mandir}/man3/* $RPM_BUILD_ROOT/%{_mandir}/ja/man3/
%__mv $RPM_BUILD_ROOT/%{_mandir}/man3/* $RPM_BUILD_ROOT/%{_mandir}/ja/man3/
for i in 2a_ctrl.4 2b_romkana.4 cvt_key_tbl.4 fzk.data.4 fzk.u.4 \
hinsi_data.4 jserverrc.4 mode.4 serverdefs.4 ujis_dic.4 \
uumkey.4 uumrc.4 wnnenvrc.4
do
mv $RPM_BUILD_ROOT/%{_mandir}/man4/$i $RPM_BUILD_ROOT/%{_mandir}/ja/man4/
%__mv $RPM_BUILD_ROOT/%{_mandir}/man4/$i $RPM_BUILD_ROOT/%{_mandir}/ja/man4/
done
for i in pubdic.5 usr_dic.5
do
mv $RPM_BUILD_ROOT/%{_mandir}/man5/$i $RPM_BUILD_ROOT/%{_mandir}/ja/man5/
%__mv $RPM_BUILD_ROOT/%{_mandir}/man5/$i $RPM_BUILD_ROOT/%{_mandir}/ja/man5/
done
#----------------------------------------------------------------------
# Make sure directories for of boot script installation exist:
mkdir -p $RPM_BUILD_ROOT/etc/init.d
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
mkdir -p $RPM_BUILD_ROOT/usr/sbin
%__mkdir_p $RPM_BUILD_ROOT/etc/init.d
%__mkdir_p $RPM_BUILD_ROOT/var/adm/fillup-templates
%__mkdir_p $RPM_BUILD_ROOT/usr/sbin
#----------------------------------------------------------------------
# Install boot scripts:
install -m 755 $RPM_SOURCE_DIR/rcfwnn $RPM_BUILD_ROOT/etc/init.d/fwnn
install -m 755 $RPM_SOURCE_DIR/rcfcwnn $RPM_BUILD_ROOT/etc/init.d/fcwnn
install -m 755 $RPM_SOURCE_DIR/rcftwnn $RPM_BUILD_ROOT/etc/init.d/ftwnn
install -m 755 $RPM_SOURCE_DIR/rcfkwnn $RPM_BUILD_ROOT/etc/init.d/fkwnn
%__install -m 755 $RPM_SOURCE_DIR/rcfwnn $RPM_BUILD_ROOT/etc/init.d/fwnn
%__install -m 755 $RPM_SOURCE_DIR/rcfcwnn $RPM_BUILD_ROOT/etc/init.d/fcwnn
%__install -m 755 $RPM_SOURCE_DIR/rcftwnn $RPM_BUILD_ROOT/etc/init.d/ftwnn
%__install -m 755 $RPM_SOURCE_DIR/rcfkwnn $RPM_BUILD_ROOT/etc/init.d/fkwnn
#----------------------------------------------------------------------
# Make symbolic links
for i in fwnn fcwnn ftwnn fkwnn ; do
( cd $RPM_BUILD_ROOT/usr/sbin; ln -sf ../../etc/init.d/$i rc$i )
( cd $RPM_BUILD_ROOT/usr/sbin; %__ln_s -f ../../etc/init.d/$i rc$i )
done
ln -sf /var/lib/wnn/ja/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/ja/dic
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
%__ln_s -f /var/lib/wnn/ja/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/ja/dic
%__ln_s -f /var/lib/wnn/zh_CN/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/zh_CN/dic
%__ln_s -f /var/lib/wnn/zh_TW/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/zh_TW/dic
%__ln_s -f /var/lib/wnn/ko_KR/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/ko_KR/dic
#----------------------------------------------------------------------
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la
%__rm -f ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %__rm -rf $RPM_BUILD_ROOT;
%pre -n fwnn
/usr/sbin/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d /var/lib/wnn wnn 2> /dev/null || :
@ -535,6 +546,7 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.*
/usr/bin/cwnnkill
/usr/bin/cwnnstat
/usr/bin/cwnntouch
/usr/bin/cuum
%files -n fcwnndev
%defattr(-,root,root)
@ -584,6 +596,7 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.*
/usr/bin/kwnnkill
/usr/bin/kwnnstat
/usr/bin/kwnntouch
/usr/bin/kuum
%dir /etc/FreeWnn/
%dir /etc/FreeWnn/ko_KR/
/etc/FreeWnn/ko_KR/dic