rpm/fwnn
SHA256
1
0
Fork 0
forked from pool/fwnn
Code Pull Requests Activity

Accepting request 331403 from M17N

Browse Source 
- Some cleanups like
  + use the same owner for /var/lib/wnn as the package canna does
  + mark configuration files as configuration files
  + avoid warning due missed header files

- update to 1.1.1-a023
  * Merge modificaion used in OpenSUSE packages by new member,
    Mitsutoshi NAKANO. Added explicit function prototype and 
    cast in many places, so we reduced unpredictable effect 
    on 64bit environment.
  * As a consequence of this change, #define of WNN_CREATE /
    WNN_NO_CREATE in jl_dic_create() is also changed. We 
    believe no change is needed for client build, but please
    report if you have problems.
  * Exit status of jserver changed on receiving some signals
    (ex. SIGTERM). (Not well documented.)
  * Fixed problem for parallel build (ex. make -jXX) on pubdic+. 
- drop patch: FreeWnn-sighandler.patch, upstreamed
- drop patch: FreeWnn-include.patch, upstreamed
- drop patch: FreeWnn-prototypes.patch, upstreamed
- drop patch: FreeWnn-prototypes_msg.patch, upstreamed
- drop patch: FreeWnn-1.1.1-a022.dif, upstreamed
- drop patch: FreeWnn-prototypes_3.patch, upstreamed

OBS-URL: https://build.opensuse.org/request/show/331403
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fwnn?expand=0&rev=21
This commit is contained in:
Stephan Kulow 2015-09-19 04:54:59 +00:00 committed by Git OBS Bridge
commit f35ae90659
18 changed files with 457 additions and 5234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

345
FreeWnn-1.1.1-a022.dif
View File

@ -1,345 +0,0 @@
--- 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
#endif /* STDC_HEADERS */
+#include <stdarg.h>
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
@@ -159,7 +160,7 @@
static void make_space_for ();
static void make_space_for_bun ();
static void make_space_for_zenkouho ();
-static void message_out ();
+static void message_out (int (*) (const char *), const char *, ...);
static int ren_conv1 ();
static void set_dai ();
static void set_sho ();
@@ -275,7 +276,7 @@
static struct wnn_env *
find_same_env (js, env_n, lang)
register WNN_JSERVER_ID *js;
- register char *env_n;
+ register const char *env_n;
char *lang;
{
register int k;
@@ -314,7 +315,7 @@
add_new_env (js, env, env_n, server_n, lang)
register WNN_JSERVER_ID *js;
register struct wnn_env *env;
- char *env_n, *server_n, *lang;
+ const char *env_n, *server_n, *lang;
{
register int k;
@@ -435,15 +436,16 @@
struct wnn_env *
jl_connect_lang (env_n, server_n, lang, wnnrc_n, error_handler, message_handler, timeout)
- register char *env_n, *server_n, *wnnrc_n, *lang;
- int (*error_handler) (), (*message_handler) ();
+ register const char *env_n, *server_n, *wnnrc_n, *lang;
+ int (*error_handler) (const char *), (*message_handler) (const char *);
int timeout;
{
register WNN_JSERVER_ID *js = NULL;
struct wnn_env *env;
int env_exist;
char p_lang[16];
- register char *p, *l;
+ register char *p;
+ const char *l;
extern char *getenv ();
extern char *_wnn_get_machine_of_serv_defs ();
@@ -576,8 +578,8 @@
struct wnn_buf *
jl_open_lang (env_n, server_n, lang, wnnrc_n, error_handler, message_handler, timeout)
- char *env_n, *server_n, *wnnrc_n, *lang;
- int (*error_handler) (), (*message_handler) ();
+ const char *env_n, *server_n, *wnnrc_n, *lang;
+ int (*error_handler) (const char *), (*message_handler) (const char *);
int timeout;
{
register int k, dmy;
@@ -1504,7 +1506,7 @@
int prio;
int rw, hrw, rev;
char *pwd_dic, *pwd_hindo;
- int (*error_handler) (), (*message_handler) ();
+ int (*error_handler) (const char *), (*message_handler) (const char *);
{
char tmp[256];
char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN];
@@ -1519,7 +1521,7 @@
jl_disconnect (env);
return (-1);
}
- if ((int) error_handler == WNN_NO_CREATE || (rw == WNN_DIC_RDONLY))
+ if (error_handler == (int (*) (const char *)) WNN_NO_CREATE || (rw == WNN_DIC_RDONLY))
{
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));
/*
@@ -1533,7 +1535,7 @@
/*
"辞書ファイル \"%s\" が無いよ。作る?(Y/N)",
*/
- if ((int) error_handler == 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)
@@ -1558,7 +1560,7 @@
jl_disconnect (env);
return (-1);
}
- if ((int) error_handler == WNN_NO_CREATE || (hrw == WNN_DIC_RDONLY))
+ if (error_handler == (int (*) (const char *)) WNN_NO_CREATE || (hrw == WNN_DIC_RDONLY))
{
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));
/*
@@ -1572,7 +1574,7 @@
/*
"頻度ファイル \"%s\" が無いよ。作る?(Y/N)",
*/
- if ((int) error_handler == 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);
@@ -1601,7 +1603,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)
{
return (-1);
}
@@ -1609,7 +1611,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)))
{
return (-1);
}
@@ -1685,7 +1687,7 @@
create_pwd_file (env, pwd_file, error_handler, message_handler)
register struct wnn_env *env;
char *pwd_file;
- int (*error_handler) (), (*message_handler) ();
+ int (*error_handler) (const char *), (*message_handler) (const char *);
{
FILE *fp;
char gomi[256];
@@ -2749,17 +2751,17 @@
int
jl_set_env_wnnrc (env, wnnrc_n, error_handler, message_handler)
register struct wnn_env *env;
- char *wnnrc_n;
- int (*error_handler) (), (*message_handler) ();
+ const char *wnnrc_n;
+ int (*error_handler) (const char *), (*message_handler) (const char *);
{
int level = 0;
int x;
wnn_errorno = 0;
- if ((int) error_handler == WNN_CREATE)
+ if (error_handler == (int (*) (const char *)) WNN_CREATE)
{
confirm_state = CREATE_WITHOUT_CONFIRM;
}
- else if ((int) error_handler == WNN_NO_CREATE)
+ else if (error_handler == (int (*) (const char *)) WNN_NO_CREATE)
{
confirm_state = NO_CREATE;
}
@@ -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;
{
register int num;
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 *) = NULL;
expand_expr_all (s[0], env);
if (num < 3 || !REAL_PARAM (s[1]))
{
@@ -2855,11 +2856,11 @@
else if (confirm_state == CREATE_WITHOUT_CONFIRM)
{
- error_handler1 = (int (*)()) WNN_CREATE;
+ error_handler1 = (int (*) (const char *)) WNN_CREATE;
}
else if (confirm_state == NO_CREATE)
{
- error_handler1 = (int (*)()) WNN_NO_CREATE;
+ error_handler1 = (int (*) (const char *)) WNN_NO_CREATE;
}
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 +2991,7 @@
if (*s != '~' && *s != '@')
return (0);
- if ((int) strlen (s) >= EXPAND_PATH_LENGTH)
+ if (strlen (s) >= EXPAND_PATH_LENGTH)
return (-1);
s1 = s;
@@ -3008,12 +3009,12 @@
{
if (*s1)
{
- noerr = expandsuc = (NULL != (u = getpwnam (s1)) && (int) strlen (p = u->pw_dir) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
+ noerr = expandsuc = (NULL != (u = getpwnam (s1)) && strlen (p = u->pw_dir) + strlen (tmp) < EXPAND_PATH_LENGTH);
}
else
{
- noerr = expandsuc = (NULL != (p = getenv ("HOME")) && (int) strlen (p) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
+ noerr = expandsuc = (NULL != (p = getenv ("HOME")) && strlen (p) + strlen (tmp) < EXPAND_PATH_LENGTH);
}
}
@@ -3021,13 +3022,13 @@
{ /* then, *s must be '@' */
if (!strcmp (s1, "HOME"))
{
- noerr = expandsuc = (NULL != (p = getenv ("HOME")) && (int) strlen (p) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
+ noerr = expandsuc = (NULL != (p = getenv ("HOME")) && strlen (p) + strlen (tmp) < EXPAND_PATH_LENGTH);
}
else if (!strcmp (s1, "WNN_DIC_DIR"))
{
char buf[EXPAND_PATH_LENGTH];
expandsuc = 1;
- noerr = (NULL != (p = getenv ("HOME")) && (int) strlen (p) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
+ noerr = (NULL != (p = getenv ("HOME")) && strlen (p) + strlen (tmp) < EXPAND_PATH_LENGTH);
strcpy (buf, p);
strcat (buf, "/");
@@ -3044,15 +3045,15 @@
}
else if (!strcmp (s1, "LIBDIR"))
{
- noerr = expandsuc = ((int) strlen (p = LIBDIR) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
+ noerr = expandsuc = (strlen (p = LIBDIR) + strlen (tmp) < EXPAND_PATH_LENGTH);
}
else if (!strcmp (s1, "ENV"))
{ /* Added */
- noerr = expandsuc = (NULL != (p = env_name (env)) && (int) strlen (p) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
+ noerr = expandsuc = (NULL != (p = env_name (env)) && strlen (p) + strlen (tmp) < EXPAND_PATH_LENGTH);
}
else if (!strcmp (s1, "USR"))
{
- noerr = expandsuc = (NULL != (p = getlogname ()) && (int) strlen (p) + (int) strlen (tmp) < EXPAND_PATH_LENGTH);
+ noerr = expandsuc = (NULL != (p = getlogname ()) && strlen (p) + strlen (tmp) < EXPAND_PATH_LENGTH);
}
else
{ /* @HOME, @LIBDIR @ENV igai ha kaenai */
@@ -3076,7 +3077,7 @@
total = 0;
flag = 0;
- while (*st != NULL)
+ while (*st != 0)
{
if (isdigit (*st))
{
@@ -3135,7 +3136,7 @@
int d;
int fid;
char *pwd_dic, *pwd_hindo;
- int (*error_handler) (), (*message_handler) ();
+ int (*error_handler) (const char *), (*message_handler) (const char *);
{
char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN];
int rev_dict_type;
@@ -3243,7 +3244,7 @@
make_dir_rec1 (env, path, error_handler, message_handler)
struct wnn_env *env;
register char *path;
- int (*error_handler) (), (*message_handler) ();
+ int (*error_handler) (const char *), (*message_handler) (const char *);
{
char gomi[128];
register char *c;
@@ -3266,7 +3267,7 @@
make_dir1 (env, dirname, error_handler, message_handler)
register struct wnn_env *env;
register char *dirname;
- int (*error_handler) (), (*message_handler) ();
+ int (*error_handler) (const char *), (*message_handler) (const char *);
{
char gomi[128];
if (dirname[0] == C_LOCAL)
@@ -3287,7 +3288,7 @@
return (0); /* dir already exists */
}
}
- if ((int) error_handler != WNN_CREATE)
+ if (error_handler != (int (*) (const char *)) WNN_CREATE)
{
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 +3325,8 @@
static int
call_error_handler (error_handler, c)
- int (*error_handler) ();
- char *c;
+ int (*error_handler) (const char *);
+ const char *c;
{
register int x;
x = error_handler (c);
@@ -3340,16 +3341,16 @@
}
static void
-message_out (message_handler, format, s1, s2, s3, s4, s5, s6, s7, s8)
- int (*message_handler) ();
- char *format;
- int s1, s2, s3, s4, s5, s6, s7, s8;
+message_out (int (*message_handler) (const char *), const char *format, ...)
{
char buf[256];
+ va_list args;
if (message_handler)
{
- sprintf (buf, format, s1, s2, s3, s4, s5, s6, s7, s8);
+ va_start (args, format);
+ vsprintf (buf, format, args);
+ va_end (args);
(*message_handler) (buf);
}
}
--- 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);
*/
set_current_js (env->js_id);
- handler_of_jserver_dead (NULL);
+ handler_of_jserver_dead (-1);
snd_env_head (&tmp_env, JS_DISCONNECT);
snd_flush ();
x = get4com ();

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

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

3
FreeWnn-1.1.1-a023.tar.gz Normal file
View File

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

21
FreeWnn-include.patch
View File

@ -1,21 +0,0 @@
--- 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
#include <stdio.h>
+#include <string.h>
static char *program;
--- 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
#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
static char *program;

64
FreeWnn-ja.patch
View File

@ -1,6 +1,8 @@
--- 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 @@
Index: FreeWnn-1.1.1-a023/Wnn/etc/msg.c
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/etc/msg.c
+++ FreeWnn-1.1.1-a023/Wnn/etc/msg.c
@@ -412,12 +412,12 @@ main ()
{
struct msg_cat *cd;
@ -16,8 +18,10 @@
printf (msg_get (cd, 100, "message not found\n", "zh_CN"), "abc");
}
#endif /* not_use */
--- 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
Index: FreeWnn-1.1.1-a023/Wnn/include/jd_sock.h
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/include/jd_sock.h
+++ FreeWnn-1.1.1-a023/Wnn/include/jd_sock.h
@@ -57,7 +57,7 @@
#ifdef JAPANESE /* Japanese */
# define WNN_PORT_IN (0x5701)
@ -27,7 +31,7 @@
# define SERVERNAME "wnn4"
# define MESSAGE_FILE "jserver.msg"
#else /* JAPANESE */
@@ -88,7 +88,7 @@
@@ -88,7 +88,7 @@ static char *sockname = "/tmp/kd_sockV4"
# define WNN_PORT_IN (0x5701)
static char *sockname = "/tmp/jd_sockV4"; /* for jserver */
@ -36,32 +40,38 @@
# define SERVERNAME "wnn4"
# define MESSAGE_FILE "jserver.msg"
#endif /* KOREAN */
--- 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 @@
Index: FreeWnn-1.1.1-a023/Wnn/include/jslib.h
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/include/jslib.h
+++ FreeWnn-1.1.1-a023/Wnn/include/jslib.h
@@ -412,8 +412,8 @@ struct wnn_file_head
/*
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")
#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 @@
extern WNN_JSERVER_ID *js_open_lang FRWNN_PARAMS((const register char *server, const register char *lang, register int timeout));
Index: FreeWnn-1.1.1-a023/Wnn/include/msg.h
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/include/msg.h
+++ FreeWnn-1.1.1-a023/Wnn/include/msg.h
@@ -62,7 +62,7 @@ struct msg_cat
/*
#define DEF_LANG "C"
*/
-#define DEF_LANG "ja_JP"
+#define DEF_LANG "ja"
extern struct msg_cat *msg_open ();
extern char *msg_get ();
--- 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
#if __STDC__
#define FRWNN_PARAMS(paramlist) paramlist
Index: FreeWnn-1.1.1-a023/Wnn/include/wnn_config.h
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/include/wnn_config.h
+++ FreeWnn-1.1.1-a023/Wnn/include/wnn_config.h
@@ -44,7 +44,7 @@
#define WNN_CSERVER_ENV "CSERVER"
#define WNN_KSERVER_ENV "KSERVER"
@ -98,8 +108,10 @@
#endif /* HINSIDATA_FILE */
#define USR_DIC_DIR_VAR "@USR"
--- 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
Index: FreeWnn-1.1.1-a023/Wnn/jd/serverdefs
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/jd/serverdefs
+++ FreeWnn-1.1.1-a023/Wnn/jd/serverdefs
@@ -30,7 +30,7 @@
;
@ -109,9 +121,11 @@
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-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 @@
Index: FreeWnn-1.1.1-a023/Wnn/jlib/jl.c
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/jlib/jl.c
+++ FreeWnn-1.1.1-a023/Wnn/jlib/jl.c
@@ -460,7 +460,7 @@ jl_connect_lang (env_n, server_n, lang,
if (!lang || !*lang)
{
/* Sorry! Default is Japanese. :-) */

158
FreeWnn-noroot.patch
View File

@ -1,6 +1,8 @@
--- 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 @@
Index: FreeWnn-1.1.1-a023/Contrib/dic/gerodic/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/Contrib/dic/gerodic/Makefile.in
+++ FreeWnn-1.1.1-a023/Contrib/dic/gerodic/Makefile.in
@@ -70,9 +70,7 @@ $(OBJ): $(SRC)
install:: ${OBJ}
@if [ -d $(DESTDIR)$(GERODIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(GERODIR)); fi
@ -11,9 +13,11 @@
clean::
$(RM) ${OBJ}
--- 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 @@
Index: FreeWnn-1.1.1-a023/Wnn/jserver/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/jserver/Makefile.in
+++ FreeWnn-1.1.1-a023/Wnn/jserver/Makefile.in
@@ -36,7 +36,7 @@ include @top_builddir@/makerule.mk
top_builddir = @top_builddir@
INSTALL = @INSTALL@ $(INSTALLFLAGS)
@ -22,9 +26,20 @@
JSERVERDEFINES = -DJSERVER -DWRITE_CHECK
INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) -I$(srcdir)
--- 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 @@
@@ -104,7 +104,7 @@ instserver:: install
install:: jserver
@if [ -d $(DESTDIR)$(JWNNSBINDIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNSBINDIR)); fi
- $(LT_INSTALL) $(INSTPGMFLAGS) $(INSTUIDFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNSBINDIR)/`echo jserver | sed '$(transform)'`
+ $(LT_INSTALL) $(INSTPGMFLAGS) $(INSTBINFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNSBINDIR)/`echo jserver | sed '$(transform)'`
$(OBJ0) : $(SRC0)
$(CC) -c $(CFLAGS) $(SERVERINITDEF) $(SOLINGERDEFS) $(srcdir)/`basename $@ .o`.c
Index: FreeWnn-1.1.1-a023/Wnn/jutil/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/jutil/Makefile.in
+++ FreeWnn-1.1.1-a023/Wnn/jutil/Makefile.in
@@ -37,7 +37,7 @@ top_builddir = @top_builddir@
INSTALL = @INSTALL@ $(INSTALLFLAGS)
LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
LT_LD = $(LIBTOOL) --mode=link $(CCLINK)
@ -33,9 +48,11 @@
INCLUDES = -I$(top_builddir) @EXTWNNJINC@ -I$(WNNINCLUDESRC)
DEFINES = $(WNNDEFINES) $(WNNLANGDEF)
--- 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 @@
Index: FreeWnn-1.1.1-a023/Wnn/pubdicplus/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/pubdicplus/Makefile.in
+++ FreeWnn-1.1.1-a023/Wnn/pubdicplus/Makefile.in
@@ -35,7 +35,7 @@ top_builddir = @top_builddir@
WNNJUTILOBJ = $(top_builddir)/Wnn/jutil
INSTALL = @INSTALL@ $(INSTALLFLAGS)
@ -44,7 +61,7 @@
INCLUDES = -I$(top_builddir)
ATOD = $(WNNJUTILOBJ)/atod
@@ -377,8 +377,7 @@
@@ -281,8 +281,7 @@ instserver:: install
install::
@case '${MFLAGS}' in *[i]*) set +e;; esac;
@for i in $(JWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \
@ -54,9 +71,11 @@
done
install:: $(DIC)
--- 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 @@
Index: FreeWnn-1.1.1-a023/Wnn/wnncons/dic/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/wnncons/dic/Makefile.in
+++ FreeWnn-1.1.1-a023/Wnn/wnncons/dic/Makefile.in
@@ -33,7 +33,7 @@ include @top_srcdir@/makerule.mk
top_builddir = ../../..
INSTALL = @INSTALL@ $(INSTALLFLAGS)
@ -65,7 +84,16 @@
ATOD = $(WNNJUTILSRC)/atod
WNNTOUCH = $(WNNJUTILSRC)/wnntouch
@@ -86,7 +86,7 @@
@@ -75,7 +75,7 @@ install::
@case '${MFLAGS}' in *[i]*) set +e;; esac;
@for i in $(JWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \
set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i; \
- chown $(WNNOWNER) $(DESTDIR)$$i); fi \
+ ); fi \
done
install:: $(DICS)
@@ -86,7 +86,7 @@ install:: $(DICS)
set +x; \
else (set -x; \
$(INSTALL) $(INSTDATFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNWNNCONSDICDIR); \
@ -74,9 +102,11 @@
done
depend::
--- 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 @@
Index: FreeWnn-1.1.1-a023/Xwnmo/xjutil/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/Xwnmo/xjutil/Makefile.in
+++ FreeWnn-1.1.1-a023/Xwnmo/xjutil/Makefile.in
@@ -26,7 +26,7 @@ include @top_srcdir@/makerule.mk
top_builddir = ../..
INSTALL = @INSTALL@ $(INSTALLFLAGS)
@ -85,9 +115,11 @@
INCLUDES = -I. $(XWNMOINCLUDES) -I$(XWNMOSRC)
--- 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 @@
Index: FreeWnn-1.1.1-a023/Xwnmo/xwnmo/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/Xwnmo/xwnmo/Makefile.in
+++ FreeWnn-1.1.1-a023/Xwnmo/xwnmo/Makefile.in
@@ -26,7 +26,7 @@ include @top_srcdir@/makerule.mk
top_builddir = ../..
INSTALL = @INSTALL@ $(INSTALLFLAGS)
@ -96,9 +128,11 @@
INCLUDES = $(XWNMOINCLUDES)
--- 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 @@
Index: FreeWnn-1.1.1-a023/cWnn/cdic/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/cWnn/cdic/Makefile.in
+++ FreeWnn-1.1.1-a023/cWnn/cdic/Makefile.in
@@ -32,7 +32,7 @@ top_builddir = @top_builddir@
CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil
INSTALL = @INSTALL@ $(INSTALLFLAGS)
@ -107,7 +141,7 @@
ATOD = $(CWNNJUTILOBJ)/catod
ATOF = $(CWNNJUTILOBJ)/catof
@@ -86,8 +86,7 @@
@@ -86,8 +86,7 @@ instserver:: install
install::
@case '${MFLAGS}' in *[i]*) set +e;; esac;
@for i in $(CWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \
@ -117,20 +151,24 @@
done
install:: $(ALLTGT)
--- 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 @@
Index: FreeWnn-1.1.1-a023/cWnn/jserver/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/cWnn/jserver/Makefile.in
+++ FreeWnn-1.1.1-a023/cWnn/jserver/Makefile.in
@@ -39,7 +39,7 @@ INSTALL = @INSTALL@ $(INSTALLFLAGS)
JSERVERDEFINES = -DJSERVER -DWRITE_CHECK
INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir)
INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir) -I$(srcdir)
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-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 @@
Index: FreeWnn-1.1.1-a023/cWnn/jutil/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/cWnn/jutil/Makefile.in
+++ FreeWnn-1.1.1-a023/cWnn/jutil/Makefile.in
@@ -36,7 +36,7 @@ top_builddir = @top_builddir@
INSTALL = @INSTALL@ $(INSTALLFLAGS)
LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL)
LT_LD = $(LIBTOOL) --mode=link $(CCLINK)
@ -139,9 +177,11 @@
INCLUDES = -I$(top_builddir) @EXTCWNNJINC@ -I$(CWNNINCLUDESRC)
DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF)
--- 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 @@
Index: FreeWnn-1.1.1-a023/cWnn/tdic/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/cWnn/tdic/Makefile.in
+++ FreeWnn-1.1.1-a023/cWnn/tdic/Makefile.in
@@ -32,7 +32,7 @@ top_builddir = @top_builddir@
CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil
INSTALL = @INSTALL@
@ -150,7 +190,7 @@
ATOD = $(CWNNJUTILOBJ)/catod
ATOF = $(CWNNJUTILOBJ)/catof
@@ -86,8 +86,7 @@
@@ -86,8 +86,7 @@ instserver:: install
install::
@case '${MFLAGS}' in *[i]*) set +e;; esac;
@for i in $(TWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \
@ -160,9 +200,11 @@
done
install:: $(ALLTGT)
--- 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 @@
Index: FreeWnn-1.1.1-a023/kWnn/jserver/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/kWnn/jserver/Makefile.in
+++ FreeWnn-1.1.1-a023/kWnn/jserver/Makefile.in
@@ -38,7 +38,7 @@ INSTALL = @INSTALL@
JSERVERDEFINES = -DJSERVER -DWRITE_CHECK
INCLUDES = -I$(KWNNJSERVERSRC) -I$(KWNNINCLUDESRC) -I$(top_builddir)
DEFINES = $(KWNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) $(KWNNLANGDEF)
@ -171,20 +213,11 @@
SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(KWNNLANG)/kserverrc\"
HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\"
WRAPLIB = @WRAPLIB@
--- 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$(top_builddir) @EXTKWNNJINC@ -I$(KWNNINCLUDESRC)
DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF)
-LOCAL_INSTFLAGS = -o $(WNNOWNER)
+LOCAL_INSTFLAGS =
HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\"
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 @@
Index: FreeWnn-1.1.1-a023/kWnn/kdic/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/kWnn/kdic/Makefile.in
+++ FreeWnn-1.1.1-a023/kWnn/kdic/Makefile.in
@@ -32,7 +32,7 @@ top_builddir = @top_builddir@
KWNNJUTILOBJ = $(top_builddir)/kWnn/jutil
INSTALL = @INSTALL@
@ -193,7 +226,7 @@
ATOD = $(KWNNJUTILOBJ)/katod
ATOF = $(KWNNJUTILOBJ)/katof
@@ -77,8 +77,7 @@
@@ -77,8 +77,7 @@ instserver:: install
install::
@case '${MFLAGS}' in *[i]*) set +e;; esac;
@for i in $(KWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \
@ -203,3 +236,16 @@
done
install:: $(ALLTGT)
Index: FreeWnn-1.1.1-a023/kWnn/jutil/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/kWnn/jutil/Makefile.in
+++ FreeWnn-1.1.1-a023/kWnn/jutil/Makefile.in
@@ -39,7 +39,7 @@ LT_LD = $(LIBTOOL) --mode=link
INCLUDES = -I$(top_builddir) @EXTKWNNJINC@ -I$(KWNNINCLUDESRC)
DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF)
-LOCAL_INSTFLAGS = -o $(WNNOWNER)
+LOCAL_INSTFLAGS =
HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\"
CLIENTPROGRAMS = kwddel kwdreg

542
FreeWnn-prototypes.patch
View File

@ -1,542 +0,0 @@
--- 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 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
{
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
-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 ();
+#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 FRWNN_PARAMS((char*,char*));
#endif
#ifdef CHINESE
-extern int wnn_Sstrcat ();
+extern int wnn_Sstrcat FRWNN_PARAMS((w_char*,unsigned char*));
#endif
#endif /* WNN_STRING_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 @@
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 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 FRWNN_PARAMS((int*));
+#else
+extern void ujis_header FRWNN_PARAMS((void));
+#endif
+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
#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 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,8 +156,7 @@
int tnum = 0;
struct uind2 *uhopter;
-char *hinsi_file_name = NULL;
-
+unsigned char *hinsi_file_name = NULL;
void
init (int argc, char **argv)
@@ -221,16 +261,12 @@
}
}
-extern int sort_func_sdic ();
-extern int sort_func_je ();
FILE *ofpter;
int
main (int argc, char** argv)
{
char *cswidth_name;
- extern char *get_cswidth_name ();
- extern void set_cswidth ();
com_name = argv[0];
init (argc, argv);
@@ -442,7 +478,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 +506,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;
--- 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;
if (c = in, c /= base)
to_digit (c, base, outp);
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 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 ();
+#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; /* これは関数ではなく変数 */
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 FRWNN_PARAMS((int,modetyp)),
+ incmod FRWNN_PARAMS((int,modetyp)),
+ decmod FRWNN_PARAMS((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 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 ();
-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 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)
--- 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 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 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 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 +144,7 @@
return (i);
ERRMOD (9);
/*NOTREACHED*/
+ return 0;
}
/** モード表の読み込み */
--- 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 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 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 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
View File

File diff suppressed because it is too large Load Diff

38
FreeWnn-prototypes_msg.patch
View File

@ -1,38 +0,0 @@
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 */

39
FreeWnn-sighandler.patch
View File

@ -1,39 +0,0 @@
--- 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 <tcpd.h>
#endif /* HAVE_LIBWRAP */
+#ifndef NOTFORK
+static void father_sighandler (const int sig)
+{
+ if (signal(sig, SIG_DFL) == SIG_ERR)
+ _exit (2);
+
+ if (sig == SIGTERM)
+ _exit(0);
+ else
+ _exit(255);
+}
+#endif
+
/* No arguments are used. Only options. */
int
main (int argc, char *argv[])
@@ -248,14 +261,14 @@
{
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);
#endif
- signal (SIGTERM, _exit);
+ signal (SIGTERM, father_sighandler);
pause ();
}
}

43
FreeWnn-trad_cpp.patch
View File

@ -1,18 +1,21 @@
--- 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 @@
Index: FreeWnn-1.1.1-a023/Wnn/pubdicplus/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/pubdicplus/Makefile.in
+++ FreeWnn-1.1.1-a023/Wnn/pubdicplus/Makefile.in
@@ -325,7 +325,7 @@ fzk.master-.c: fzk.master
$(LN) $? $@
std.fzk: fzk.master-.c $(FZK_SRC)
- $(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) $@
std.fsrc: fzk.master-.c $(FZK_SRC)
- $(FZK_PP) fzk.master-.c > $@
+ $(CPP) -traditional-cpp $(FZK_FLAGS) fzk.master-.c > $@
full.fzk: $(FZK_SRC)
$(MAKE) FZK_FLAG=-DKANSAI std.fzk
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 @@
full.fsrc: fzk.master-.c $(FZK_SRC)
$(FZK_PP) -DKANSAI fzk.master-.c > $@
Index: FreeWnn-1.1.1-a023/cWnn/cdic/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/cWnn/cdic/Makefile.in
+++ FreeWnn-1.1.1-a023/cWnn/cdic/Makefile.in
@@ -64,10 +64,10 @@ all:: $(ALLTGT)
$(DICS): $(HINSI)
$(FULL):: $(FZK_SRCS) con.master-.c
@ -25,9 +28,11 @@ diff -ur FreeWnn-1.1.1-a022.bak/cWnn/cdic/Makefile.in FreeWnn-1.1.1-a022/cWnn/cd
# To avoid circular dependency, we don't use 'con.master?.c'
con.master-.c: con.master
--- 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 @@
Index: FreeWnn-1.1.1-a023/cWnn/tdic/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/cWnn/tdic/Makefile.in
+++ FreeWnn-1.1.1-a023/cWnn/tdic/Makefile.in
@@ -64,10 +64,10 @@ all:: $(ALLTGT)
$(DICS): $(HINSI)
$(FULL):: $(FZK_SRCS) con.master-.c
@ -40,9 +45,11 @@ diff -ur FreeWnn-1.1.1-a022.bak/cWnn/cdic/Makefile.in FreeWnn-1.1.1-a022/cWnn/cd
# To avoid circular dependency, we don't use 'con.master?.c'
con.master-.c: con.master
--- 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 @@
Index: FreeWnn-1.1.1-a023/kWnn/kdic/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/kWnn/kdic/Makefile.in
+++ FreeWnn-1.1.1-a023/kWnn/kdic/Makefile.in
@@ -62,7 +62,7 @@ all:: $(ALLTGT)
$(DICS): $(HINSI)
$(FULL):: $(FZK_SRCS) fzk.master-.c

13
FreeWnn-warnings.patch
View File

@ -18,3 +18,16 @@
/* pw_d pw_h err mes */
return (-1);
if (js_dic_info (jl_env (buf), dic_no, &ret) < 0)
--- Wnn/etc/pwd.c
+++ Wnn/etc/pwd.c 2015-09-16 10:04:15.545979775 +0000
@@ -51,6 +51,10 @@
#include "commonhd.h"
#include "jslib.h"
#include "wnn_os.h"
+#else
+#include <string.h>
+#include <strings.h>
+#include <time.h>
#endif /* !JS */
#ifdef JS

30
fwnn.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Wed Sep 16 10:11:56 UTC 2015 - werner@suse.de
- Some cleanups like
+ use the same owner for /var/lib/wnn as the package canna does
+ mark configuration files as configuration files
+ avoid warning due missed header files
-------------------------------------------------------------------
Sat Sep 12 08:31:21 UTC 2015 - i@marguerite.su
- update to 1.1.1-a023
* Merge modificaion used in OpenSUSE packages by new member,
Mitsutoshi NAKANO. Added explicit function prototype and
cast in many places, so we reduced unpredictable effect
on 64bit environment.
* As a consequence of this change, #define of WNN_CREATE /
WNN_NO_CREATE in jl_dic_create() is also changed. We
believe no change is needed for client build, but please
report if you have problems.
* Exit status of jserver changed on receiving some signals
(ex. SIGTERM). (Not well documented.)
* Fixed problem for parallel build (ex. make -jXX) on pubdic+.
- drop patch: FreeWnn-sighandler.patch, upstreamed
- drop patch: FreeWnn-include.patch, upstreamed
- drop patch: FreeWnn-prototypes.patch, upstreamed
- drop patch: FreeWnn-prototypes_msg.patch, upstreamed
- drop patch: FreeWnn-1.1.1-a022.dif, upstreamed
- drop patch: FreeWnn-prototypes_3.patch, upstreamed
-------------------------------------------------------------------
Thu Aug 15 15:42:53 UTC 2013 - bkbin005@rinku.zaq.ne.jp

563
fwnn.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package fwnn
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX 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,67 +16,39 @@
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: fwnn
BuildRequires: ncurses-devel
BuildRequires: tcpd-devel
#BuildRequires: termcap
%define base_version 1.1.1
%define alpha_version a022
Requires: fwnncom
Conflicts: wnn6
PreReq: /usr/sbin/useradd %insserv_prereq %fillup_prereq
Version: 1.1.1a022
Release: 28.1
Url: http://freewnn.sourceforge.jp/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define alpha_version a023
Name: fwnn
Version: 1.1.1a023
Release: 0
Summary: FreeWnn Japanese Input System--Server Only
License: GPL-2.0+
Group: System/I18n/Japanese
Source0: ftp://ftp.iij.ad.jp/pub/sourceforge.jp/freewnn/59257/FreeWnn-%{base_version}-%{alpha_version}.tar.bz2
Url: http://freewnn.sourceforge.jp/
Source: http://iij.dl.osdn.jp/freewnn/63271/FreeWnn-%{base_version}-%{alpha_version}.tar.gz
Source1: rcfwnn
Source2: rcfcwnn
Source3: rcftwnn
Source4: rcfkwnn
Source99: fwnn-rpmlintrc
Patch0: FreeWnn-fsstnd.patch
Patch1: FreeWnn-ja.patch
# PATCH-FIX-UPSTREAM don't install as wnn user and don't setuid/setgid
Patch2: FreeWnn-noroot.patch
Patch3: FreeWnn-sighandler.patch
Patch5: FreeWnn-1.1.1-a022.dif
Patch7: FreeWnn-s390x.patch
Patch8: FreeWnn-warnings.patch
Patch11: FreeWnn-include.patch
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
#
# Ｗｎｎ（うんぬ）とは？ 　京都大学、オムロン株式会社、株式会社アステック
# によって共同開発され、 1987年に完成した UNIX上のかな漢字変換システム。現
# 在では、FreeWnn プロジェクトが開発と維持をします
# (http://www.freewnn.org)。
#
#
# Watashino Namaeha Nakanodesu（私の名前は中野です）という文章の一括変換が
# できる （当時は、文章を一括変換できることは画期的だった！）システム とい
# うことで、その文の各文節の頭文字をとって名付けられた。 　Ｃ言語で 書かれ
# たソースコードが無料で配布されたことから、多くのワークステーショ ン上で
# 使われるようになり、現在では、UNIX上のかな漢字変換システムの デファクト・
# スタンダード（事実上の標準）となっている。 　一番の特徴はクライアント・
# サーバ方式を採用していることで、 サーバ部分（jserver）は、 X Window
# System 上の入力システムであるxwnmoの かな漢字変換エンジンとしてや、
# Nemacs/ Mule のたまご（egg） のかな漢字変換エンジンとして、使われている。
#
#
# このパッケージには日本語入力サーバのみ含まれます。
BuildRequires: fdupes
BuildRequires: ncurses-devel
BuildRequires: tcpd-devel
Requires: fwnncom
# %{_sbindir}/useradd
Requires(pre): shadow
Requires(pre): %insserv_prereq %fillup_prereq
Conflicts: wnn6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
%description
FreeWnn is a Kana-Kanji translation system, originally developed by a
joint project made up of Kyoto University, OMRON Corporation [formerly
known as Tateishi Electronics Co.], and ASTEC Inc. Further development
@ -99,131 +71,90 @@ XEmacs.
This package contains only the Japanese server.
%package -n fwnn-devel
Summary: Development Library and Header Files for FreeWnn
Group: Development/Libraries/C and C++
Requires: fwnn = %{version}
Provides: fwnndev
Obsoletes: fwnndev
# Summary(ja): FreeWnn 用開発ライブラリとヘッダファイル
# %description -n fwnn-devel -l ja
#
# このパッケージには FreeWnn を利用した日本語入力 client をコンパイルする
# ために必要なヘッダファイルとライブラリが含まれています。
Provides: fwnndev = %{version}
Obsoletes: fwnndev < %{version}
%description -n fwnn-devel
This package contains the header files and libraries for building
client programs which use FreeWnn for Japanese input.
%package -n fwnncom
Summary: Common Files for FreeWnn
Group: System/I18n/Japanese
PreReq: /usr/sbin/useradd
Requires(pre): shadow
%description -n fwnncom
This package includes files you need to run FreeWnn, Free cWnn, Free
tWnn, or Free kWnn. Install this package if you will be using any part
of the Wnn System.
%package -n fcwnn
Requires: fcwnncom
Requires: fwnncom
PreReq: /usr/sbin/useradd fcwnncom
Summary: Free cWnn Chinese Input System (Mainland China)
Group: System/I18n/Chinese
# Summary(ja): Free cWnn 中国語の入力システム (中華人民共和国)
# %description -n fcwnn -l ja
#
# Free cWnn 中国語の入力システム (中華人民共和国)
Requires: fcwnncom
Requires: fwnncom
Requires(pre): shadow
Requires(pre): %insserv_prereq %fillup_prereq
Requires(post): fcwnncom
%description -n fcwnn
Free cWnn Chinese Input System (mainland China).
%package -n fcwnncom
Summary: Free cWnn/tWnn Chinese Input System Common Files (Mainland and Taiwan)
Group: System/I18n/Chinese
Requires: fwnncom
PreReq: /usr/sbin/useradd
Requires(pre): shadow
%description -n fcwnncom
This package includes the common files for the Free cWnn and Free tWnn
Chinese Input Systems. Free cWnn is for mainland Chinese and free tWnn
is for Taiwan-Chinese.
%package -n fcwnndev
Summary: Development Libraries and Header Files for Free cWnn
Group: Development/Libraries/C and C++
Requires: fcwnn = %{version}
# Summary(ja): Free cWnn 用開発ライブラリとヘッダファイル
# %description -n fcwnndev -l ja
#
# このパッケージには Free cWnn を利用したプログラムをコンパイルするために
# 必要なヘッダファイルとライブラリを含んでいます。
%description -n fcwnndev
This package contains the header files and libraries for building
client programs that use the Chinese Input System, Free cWnn.
%package -n ftwnn
Summary: Free tWnn Chinese Input System (Taiwan)
Group: System/I18n/Chinese
Requires: fcwnncom
Requires: fwnncom
PreReq: /usr/sbin/useradd, fcwnncom
# Summary(ja): Free tWnn 中国語の入力システム (台湾)
# %description -n ftwnn -l ja
#
# Free tWnn 中国語の入力システム (台湾)
Requires(pre): shadow
Requires(pre): %insserv_prereq %fillup_prereq
Requires(post): fcwnncom
%description -n ftwnn
Free tWnn Chinese input system (Taiwan).
%package -n fkwnn
Summary: Free kWnn Korean Input System
Group: System/I18n/Korean
Requires: fwnncom
PreReq: /usr/sbin/useradd
# Summary(ja): Free kWnn 韓国語の入力システム
# %description -n fkwnn -l ja
#
# Free kWnn 韓国語の入力システム
Requires(pre): shadow
Requires(pre): %insserv_prereq %fillup_prereq
%description -n fkwnn
Free kWnn Korean input system.
%package -n fkwnndev
Summary: Development Libraries and Header Files for Free kWnn
Group: Development/Libraries/C and C++
Requires: fkwnn = %{version}
# Summary(ja): Free kWnn 用開発ライブラリとヘッダファイル
# %description -n fkwnndev -l ja
#
# このパッケージには Free kWnn を利用したプログラムをコンパイルするために
# 必要なヘッダファイルとライブラリを含んでいます。
%description -n fkwnndev
This package contains the header files and libraries for building
client programs that use the Korean Input System, Free kWnn.
%prep
######################################################################
# package xwnmo
# I don't know how to build xwnmo. Will try that later ...
@ -232,65 +163,52 @@ client programs that use the Korean Input System, Free kWnn.
# Summary: xwnmo - Input Manager for the X11 Window System
# Summary(ja): xwnmo - Ｘウィンドウ・インプットマネージャー
# Group: Applications/X11
#
# %description -n xwnmo
#
#
# %description -n xwnmo
#
# Xwnmo is a input manager for the Input Method of the X Window System.
# It is based on the X11 Input Method Specifications. It provides a
# multi-language input environment for multiple clients in the X11
# Window System. Clients can connect to it by using the XIM library. The
# conversion engine xwnmo uses the internationalized Wnn. It selects
# the conversion server in accordance with language of clients.
#
# %description -n xwnmo -l ja
#
# xwnmo は、Ｘウィンドウ・インプットメソッド用のインプット・マネージャーで
# す。 X Window System, Version 11 Input Method Specifications をベースに
# 作成されました。 xwnmo は、Ｘウィンドウの複数のクライアントに対して、多
# 国語の入力環境を提供します。クライアントは、ＸＩＭライブラリを使うことに
# より、xwnmo を使用できます。変換のエンジンには、国際化されたＷｎｎを使用
# します。クライアントのランゲージに応じて、変換サーバを選択します。
%setup -q -n FreeWnn-%{base_version}-%{alpha_version}
#
%prep
%setup -q -n FreeWnn-%{base_version}-%{alpha_version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p2
%patch5 -p1
%patch7 -p2 -b .s390x
%patch8
%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
#......................................................................
# %patch2 -p1
# Trying to make Xwnmo work...
#..................................................................
# %patch3 -p1
# %patch3 -p1
%build
%configure --prefix=/usr \
%configure --prefix=%{_prefix} \
--libdir=%{_libdir} \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
%{_target_cpu}-suse-linux-gnu \
--disable-sub-bindir \
--enable-client --disable-client-setuid --disable-client-setgid \
--enable-client \
--disable-client-setuid \
--disable-client-setgid \
--with-libwrap
# not -j safe, see Wnn/pubdicplus/Makefile.in
make
make %{?_smp_mflags}
#pushd Wnn/uum
#make CCOPTIONS="$RPM_OPT_FLAGS"
#popd
%install
%makeinstall
#make install DESTDIR=$RPM_BUILD_ROOT INSTPGMFLAGS=
make install.man DESTDIR=$RPM_BUILD_ROOT
make DESTDIR=%{buildroot} install %{?_smp_mflags}
make install.man DESTDIR=%{buildroot}
#pushd Wnn/uum
#make install DESTDIR=$RPM_BUILD_ROOT INSTPGMFLAGS=
#popd
@ -301,53 +219,53 @@ make install.man DESTDIR=$RPM_BUILD_ROOT
# manpages, but unfortunately all of them into the same directory.
# 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
for i in 1 3 4 5 ; do
mkdir -p %{buildroot}/%{_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 %{buildroot}/%{_mandir}/man1/$i %{buildroot}/%{_mandir}/ja/man1/
done
%__mv $RPM_BUILD_ROOT/%{_mandir}/man3/* $RPM_BUILD_ROOT/%{_mandir}/ja/man3/
mv %{buildroot}/%{_mandir}/man3/* %{buildroot}/%{_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 %{buildroot}/%{_mandir}/man4/$i %{buildroot}/%{_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 %{buildroot}/%{_mandir}/man5/$i %{buildroot}/%{_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 %{buildroot}%{_sysconfdir}/init.d
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
mkdir -p %{buildroot}%{_sbindir}
#----------------------------------------------------------------------
# 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 %{_sourcedir}/rcfwnn %{buildroot}%{_initddir}/fwnn
install -m 755 %{_sourcedir}/rcfcwnn %{buildroot}%{_initddir}/fcwnn
install -m 755 %{_sourcedir}/rcftwnn %{buildroot}%{_initddir}/ftwnn
install -m 755 %{_sourcedir}/rcfkwnn %{buildroot}%{_initddir}/fkwnn
#----------------------------------------------------------------------
# Make symbolic links
for i in fwnn fcwnn ftwnn fkwnn ; do
( cd $RPM_BUILD_ROOT/usr/sbin; %__ln_s -f ../../etc/init.d/$i rc$i )
( cd %{buildroot}%{_sbindir}; ln -s -f ../..%{_initddir}/$i rc$i )
done
%__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
ln -s -f %{_localstatedir}/lib/wnn/ja/dic %{buildroot}%{_sysconfdir}/FreeWnn/ja/dic
ln -s -f %{_localstatedir}/lib/wnn/zh_CN/dic %{buildroot}%{_sysconfdir}/FreeWnn/zh_CN/dic
ln -s -f %{_localstatedir}/lib/wnn/zh_TW/dic %{buildroot}%{_sysconfdir}/FreeWnn/zh_TW/dic
ln -s -f %{_localstatedir}/lib/wnn/ko_KR/dic %{buildroot}%{_sysconfdir}/FreeWnn/ko_KR/dic
#----------------------------------------------------------------------
%__rm -f ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la
find %{buildroot} -type f -name "*.la" -delete -print
find %{buildroot} -type f -name "*.a" -delete -print
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %__rm -rf $RPM_BUILD_ROOT;
%fdupes -s %{buildroot}
%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 || :
%{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || :
%post -n fwnn
/sbin/ldconfig
@ -364,15 +282,15 @@ chroot . usr/bin/wnntouch var/lib/wnn/ja/dic/pubdic/*.*
/sbin/ldconfig
%restart_on_update fwnn
%insserv_cleanup
#%post -n fwnn-devel
# if you make libwnn.so, unomment it.
#/sbin/ldconfig
%pre -n fwnncom
/usr/sbin/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d /var/lib/wnn wnn 2> /dev/null || :
%{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || :
%pre -n fcwnncom
%{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || :
%pre -n fcwnn
/usr/sbin/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d /var/lib/wnn wnn 2> /dev/null || :
%{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || :
%preun -n fcwnn
%stop_on_removal fcwnn
@ -382,7 +300,7 @@ chroot . usr/bin/wnntouch var/lib/wnn/ja/dic/pubdic/*.*
# touch all public dictionary files:
chroot . usr/bin/cwnntouch var/lib/wnn/zh_CN/dic/sys/*.*
# Create symbolic run level links:
%{fillup_and_insserv}
%fillup_and_insserv
%postun -n fcwnn
/sbin/ldconfig
@ -390,7 +308,7 @@ chroot . usr/bin/cwnntouch var/lib/wnn/zh_CN/dic/sys/*.*
%insserv_cleanup
%pre -n ftwnn
/usr/sbin/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d /var/lib/wnn wnn 2> /dev/null || :
%{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || :
%preun -n ftwnn
%stop_on_removal ftwnn
@ -399,14 +317,14 @@ chroot . usr/bin/cwnntouch var/lib/wnn/zh_CN/dic/sys/*.*
# touch all public dictionary files:
chroot . usr/bin/cwnntouch var/lib/wnn/zh_TW/dic/sys/*.*
# Create symbolic run level links:
%{fillup_and_insserv}
%fillup_and_insserv
%postun -n ftwnn
%restart_on_update ftwnn
%insserv_cleanup
%pre -n fkwnn
/usr/sbin/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d /var/lib/wnn wnn 2> /dev/null || :
%{_sbindir}/useradd -r -o -g root -u 66 -s /bin/false -c "Wnn System Account" -d %{_localstatedir}/lib/wnn wnn 2> /dev/null || :
%preun -n fkwnn
%stop_on_removal fkwnn
@ -416,7 +334,7 @@ chroot . usr/bin/cwnntouch var/lib/wnn/zh_TW/dic/sys/*.*
# touch all public dictionary files:
chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.*
# Create symbolic run level links:
%{fillup_and_insserv}
%fillup_and_insserv
%postun -n fkwnn
/sbin/ldconfig
@ -425,206 +343,207 @@ chroot . usr/bin/kwnntouch var/lib/wnn/ko_KR/dic/sys/*.*
%files
%defattr(-,root,root)
%config /etc/init.d/fwnn
%config /usr/sbin/rcfwnn
%attr(-,wnn,root) /usr/bin/atod
%attr(-,wnn,root) /usr/bin/dtoa
%attr(-,wnn,root) /usr/bin/oldatonewa
%attr(-,wnn,root) /usr/bin/wdreg
%attr(-,wnn,root) /usr/bin/wnnstat
%attr(-,wnn,root) /usr/bin/atof
%attr(755,wnn,root) /usr/bin/jserver
%attr(-,wnn,root) /usr/bin/wddel
%attr(-,wnn,root) /usr/bin/wnnkill
%attr(-,wnn,root) /usr/bin/uum
%attr(-,wnn,root) /usr/bin/wnntouch
%dir %attr(-,wnn,root) /var/lib/wnn/
%dir %attr(-,wnn,root) /var/lib/wnn/ja/
%attr(-,wnn,root) /var/lib/wnn/ja/dic
%dir /etc/FreeWnn/ja/
/etc/FreeWnn/ja/dic
%config /etc/FreeWnn/ja/hinsi.data
%config /etc/FreeWnn/ja/jserverrc
%config /etc/FreeWnn/ja/libwnn.msg
%config /etc/FreeWnn/ja/rk
%config /etc/FreeWnn/ja/rk.vi
%config /etc/FreeWnn/ja/uum.msg
%config /etc/FreeWnn/ja/uumkey
%config /etc/FreeWnn/ja/uumkey.omr
%config /etc/FreeWnn/ja/uumkey_e
%config /etc/FreeWnn/ja/uumrc
%config /etc/FreeWnn/ja/uumrc.omr
%config /etc/FreeWnn/ja/uumrc.rev
%config /etc/FreeWnn/ja/uumrc_e
%config /etc/FreeWnn/ja/uumrc_vi
%config /etc/FreeWnn/ja/wnnenvrc
%config /etc/FreeWnn/ja/wnnenvrc.omr
%config /etc/FreeWnn/ja/wnnenvrc.rem
%config /etc/FreeWnn/ja/wnnenvrc.rev
%config /etc/FreeWnn/ja/wnnenvrc_R
%config /etc/FreeWnn/ja/wnnenvrc_R.omr
%config /etc/FreeWnn/ja/wnnenvrc_R.rem
%config /etc/FreeWnn/ja/wnnstat.msg
%dir /etc/FreeWnn/lt_LN/
/etc/FreeWnn/lt_LN/rk
%config /etc/FreeWnn/lt_LN/uum.msg
%config /etc/FreeWnn/lt_LN/uumkey
%config /etc/FreeWnn/lt_LN/uumkey_e
%config /etc/FreeWnn/lt_LN/uumrc
%config %{_initddir}/fwnn
%{_sbindir}/rcfwnn
%{_bindir}/atod
%{_bindir}/dtoa
%{_bindir}/oldatonewa
%{_bindir}/wdreg
%{_bindir}/wnnstat
%{_bindir}/atof
%{_bindir}/jserver
%{_bindir}/wddel
%{_bindir}/wnnkill
%{_bindir}/uum
%{_bindir}/wnntouch
%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/
%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/ja/
%attr(-,wnn,root) %{_localstatedir}/lib/wnn/ja/dic
%dir %{_sysconfdir}/FreeWnn/ja/
%{_sysconfdir}/FreeWnn/ja/dic
%config %{_sysconfdir}/FreeWnn/ja/hinsi.data
%config %{_sysconfdir}/FreeWnn/ja/jserverrc
%config %{_sysconfdir}/FreeWnn/ja/libwnn.msg
%config %{_sysconfdir}/FreeWnn/ja/rk
%config %{_sysconfdir}/FreeWnn/ja/rk.vi
%config %{_sysconfdir}/FreeWnn/ja/uum.msg
%config %{_sysconfdir}/FreeWnn/ja/uumkey
%config %{_sysconfdir}/FreeWnn/ja/uumkey.omr
%config %{_sysconfdir}/FreeWnn/ja/uumkey_e
%config %{_sysconfdir}/FreeWnn/ja/uumrc
%config %{_sysconfdir}/FreeWnn/ja/uumrc.omr
%config %{_sysconfdir}/FreeWnn/ja/uumrc.rev
%config %{_sysconfdir}/FreeWnn/ja/uumrc_e
%config %{_sysconfdir}/FreeWnn/ja/uumrc_vi
%config %{_sysconfdir}/FreeWnn/ja/wnnenvrc
%config %{_sysconfdir}/FreeWnn/ja/wnnenvrc.omr
%config %{_sysconfdir}/FreeWnn/ja/wnnenvrc.rem
%config %{_sysconfdir}/FreeWnn/ja/wnnenvrc.rev
%config %{_sysconfdir}/FreeWnn/ja/wnnenvrc_R
%config %{_sysconfdir}/FreeWnn/ja/wnnenvrc_R.omr
%config %{_sysconfdir}/FreeWnn/ja/wnnenvrc_R.rem
%config %{_sysconfdir}/FreeWnn/ja/wnnstat.msg
%dir %{_sysconfdir}/FreeWnn/lt_LN/
%dir %{_sysconfdir}/FreeWnn/lt_LN/rk
%config %{_sysconfdir}/FreeWnn/lt_LN/rk/*
%config %{_sysconfdir}/FreeWnn/lt_LN/uum.msg
%config %{_sysconfdir}/FreeWnn/lt_LN/uumkey
%config %{_sysconfdir}/FreeWnn/lt_LN/uumkey_e
%config %{_sysconfdir}/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
%{_includedir}/wnn/
%{_libdir}/libjd.so
%{_libdir}/libwnn.a
%{_libdir}/libwnn.so
%files -n fwnncom
%defattr(-,root,root)
%doc CONTRIBUTORS COPYRIGHT COPYRIGHT-j ChangeLog ChangeLog.old INSTALL
%doc CONTRIBUTORS COPYRIGHT COPYRIGHT-j ChangeLog ChangeLog.old
%doc olddoc/ Wnn/manual/ Wnn/manual.en/
%doc cWnn/manual cWnn/manual.en
%doc %{_mandir}/man?/*
%{_mandir}/man?/*
%dir %{_mandir}/ja/
%dir %{_mandir}/ja/*/
%doc %{_mandir}/ja/man?/*
%dir %attr(-,wnn,root) /var/lib/wnn
%dir /etc/FreeWnn/
%config /etc/FreeWnn/cvt_key_empty
%config /etc/FreeWnn/cvt_key_tbl
%config /etc/FreeWnn/cvt_key_tbl.ST
%config /etc/FreeWnn/cvt_key_tbl.gm
%config /etc/FreeWnn/cvt_key_tbl.kt
%config /etc/FreeWnn/cvt_key_tbl.mv
%config /etc/FreeWnn/cvt_key_tbl.vt
%config /etc/FreeWnn/serverdefs
%{_mandir}/ja/man?/*
%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn
%dir %{_sysconfdir}/FreeWnn/
%config %{_sysconfdir}/FreeWnn/cvt_key_empty
%config %{_sysconfdir}/FreeWnn/cvt_key_tbl
%config %{_sysconfdir}/FreeWnn/cvt_key_tbl.ST
%config %{_sysconfdir}/FreeWnn/cvt_key_tbl.gm
%config %{_sysconfdir}/FreeWnn/cvt_key_tbl.kt
%config %{_sysconfdir}/FreeWnn/cvt_key_tbl.mv
%config %{_sysconfdir}/FreeWnn/cvt_key_tbl.vt
%config %{_sysconfdir}/FreeWnn/serverdefs
%files -n fcwnn
%defattr(-,root,root)
%config /etc/init.d/fcwnn
%config /usr/sbin/rcfcwnn
%attr(755,wnn,root) /usr/bin/cserver
%config /etc/FreeWnn/zh_CN/cixing.data
%config /etc/FreeWnn/zh_CN/cserverrc
/etc/FreeWnn/zh_CN/dic
%dir %attr(-,wnn,root) /var/lib/wnn/
%dir %attr(-,wnn,root) /var/lib/wnn/zh_CN/
%attr(-,wnn,root)/var/lib/wnn/zh_CN/dic
%config /etc/FreeWnn/zh_CN/libwnn.msg
%dir /etc/FreeWnn/
%dir /etc/FreeWnn/zh_CN/
/etc/FreeWnn/zh_CN/rk
/etc/FreeWnn/zh_CN/rk_p
/etc/FreeWnn/zh_CN/rk_z
/etc/FreeWnn/zh_CN/uum.msg
/etc/FreeWnn/zh_CN/uumkey
/etc/FreeWnn/zh_CN/uumkey_e
/etc/FreeWnn/zh_CN/uumkey_p
%config /etc/FreeWnn/zh_CN/uumrc
%config /etc/FreeWnn/zh_CN/uumrc_p
%config /etc/FreeWnn/zh_CN/uumrc_z
%config /etc/FreeWnn/zh_CN/wnnenvrc
%config /etc/FreeWnn/zh_CN/wnnenvrc_Qi
%config /etc/FreeWnn/zh_CN/wnnenvrc_QiR
%config /etc/FreeWnn/zh_CN/wnnenvrc_R
%config /etc/FreeWnn/zh_CN/wnnenvrc_Wu
%config /etc/FreeWnn/zh_CN/wnnenvrc_WuR
%config /etc/FreeWnn/zh_CN/wnnstat.msg
%config %{_initddir}/fcwnn
%{_sbindir}/rcfcwnn
%{_bindir}/cserver
%config %{_sysconfdir}/FreeWnn/zh_CN/cixing.data
%config %{_sysconfdir}/FreeWnn/zh_CN/cserverrc
%{_sysconfdir}/FreeWnn/zh_CN/dic
%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/
%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/zh_CN/
%{_localstatedir}/lib/wnn/zh_CN/dic
%config %{_sysconfdir}/FreeWnn/zh_CN/libwnn.msg
%dir %{_sysconfdir}/FreeWnn/
%dir %{_sysconfdir}/FreeWnn/zh_CN/
%dir %{_sysconfdir}/FreeWnn/zh_CN/rk
%dir %{_sysconfdir}/FreeWnn/zh_CN/rk_p
%dir %{_sysconfdir}/FreeWnn/zh_CN/rk_z
%config %{_sysconfdir}/FreeWnn/zh_CN/rk/*
%config %{_sysconfdir}/FreeWnn/zh_CN/rk_p/*
%config %{_sysconfdir}/FreeWnn/zh_CN/rk_z/*
%config %{_sysconfdir}/FreeWnn/zh_CN/uum.msg
%config %{_sysconfdir}/FreeWnn/zh_CN/uumkey
%config %{_sysconfdir}/FreeWnn/zh_CN/uumkey_e
%config %{_sysconfdir}/FreeWnn/zh_CN/uumkey_p
%config %{_sysconfdir}/FreeWnn/zh_CN/uumrc
%config %{_sysconfdir}/FreeWnn/zh_CN/uumrc_p
%config %{_sysconfdir}/FreeWnn/zh_CN/uumrc_z
%config %{_sysconfdir}/FreeWnn/zh_CN/wnnenvrc
%config %{_sysconfdir}/FreeWnn/zh_CN/wnnenvrc_Qi
%config %{_sysconfdir}/FreeWnn/zh_CN/wnnenvrc_QiR
%config %{_sysconfdir}/FreeWnn/zh_CN/wnnenvrc_R
%config %{_sysconfdir}/FreeWnn/zh_CN/wnnenvrc_Wu
%config %{_sysconfdir}/FreeWnn/zh_CN/wnnenvrc_WuR
%config %{_sysconfdir}/FreeWnn/zh_CN/wnnstat.msg
%{_libdir}/libcwnn.so.0*
%files -n fcwnncom
%defattr(-,root,root)
/usr/bin/catod
/usr/bin/catof
/usr/bin/cdtoa
/usr/bin/cwddel
/usr/bin/cwdreg
/usr/bin/cwnnkill
/usr/bin/cwnnstat
/usr/bin/cwnntouch
/usr/bin/cuum
%{_bindir}/catod
%{_bindir}/catof
%{_bindir}/cdtoa
%{_bindir}/cwddel
%{_bindir}/cwdreg
%{_bindir}/cwnnkill
%{_bindir}/cwnnstat
%{_bindir}/cwnntouch
%{_bindir}/cuum
%files -n fcwnndev
%defattr(-,root,root)
%dir /usr/include/cwnn/
/usr/include/cwnn/*
%{_libdir}/libcwnn.a
%{_includedir}/cwnn/
%{_libdir}/libcwnn.so
%files -n ftwnn
%defattr(-,root,root)
%config /etc/init.d/ftwnn
%config /usr/sbin/rcftwnn
%attr(755,wnn,root) /usr/bin/tserver
%config /etc/FreeWnn/zh_TW/cixing.data
/etc/FreeWnn/zh_TW/dic
%dir %attr(-,wnn,root) /var/lib/wnn/
%dir %attr(-,wnn,root) /var/lib/wnn/zh_TW/
%attr(-,wnn,root) /var/lib/wnn/zh_TW/dic
%config /etc/FreeWnn/zh_TW/libwnn.msg
%dir /etc/FreeWnn/
%dir /etc/FreeWnn/zh_TW/
/etc/FreeWnn/zh_TW/rk
/etc/FreeWnn/zh_TW/rk_p
/etc/FreeWnn/zh_TW/rk_z
%config /etc/FreeWnn/zh_TW/tserverrc
%config /etc/FreeWnn/zh_TW/uum.msg
%config /etc/FreeWnn/zh_TW/uumkey
%config /etc/FreeWnn/zh_TW/uumkey_e
%config /etc/FreeWnn/zh_TW/uumkey_p
%config /etc/FreeWnn/zh_TW/uumrc
%config /etc/FreeWnn/zh_TW/uumrc_p
%config /etc/FreeWnn/zh_TW/uumrc_z
%config /etc/FreeWnn/zh_TW/wnnenvrc
%config /etc/FreeWnn/zh_TW/wnnenvrc_R
%config /etc/FreeWnn/zh_TW/wnnstat.msg
%config %{_initddir}/ftwnn
%{_sbindir}/rcftwnn
%{_bindir}/tserver
%config %{_sysconfdir}/FreeWnn/zh_TW/cixing.data
%{_sysconfdir}/FreeWnn/zh_TW/dic
%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/
%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/zh_TW/
%{_localstatedir}/lib/wnn/zh_TW/dic
%config %{_sysconfdir}/FreeWnn/zh_TW/libwnn.msg
%dir %{_sysconfdir}/FreeWnn/
%dir %{_sysconfdir}/FreeWnn/zh_TW/
%dir %{_sysconfdir}/FreeWnn/zh_TW/rk
%dir %{_sysconfdir}/FreeWnn/zh_TW/rk_p
%dir %{_sysconfdir}/FreeWnn/zh_TW/rk_z
%config %{_sysconfdir}/FreeWnn/zh_TW/rk/*
%config %{_sysconfdir}/FreeWnn/zh_TW/rk_p/*
%config %{_sysconfdir}/FreeWnn/zh_TW/rk_z/*
%config %{_sysconfdir}/FreeWnn/zh_TW/tserverrc
%config %{_sysconfdir}/FreeWnn/zh_TW/uum.msg
%config %{_sysconfdir}/FreeWnn/zh_TW/uumkey
%config %{_sysconfdir}/FreeWnn/zh_TW/uumkey_e
%config %{_sysconfdir}/FreeWnn/zh_TW/uumkey_p
%config %{_sysconfdir}/FreeWnn/zh_TW/uumrc
%config %{_sysconfdir}/FreeWnn/zh_TW/uumrc_p
%config %{_sysconfdir}/FreeWnn/zh_TW/uumrc_z
%config %{_sysconfdir}/FreeWnn/zh_TW/wnnenvrc
%config %{_sysconfdir}/FreeWnn/zh_TW/wnnenvrc_R
%config %{_sysconfdir}/FreeWnn/zh_TW/wnnstat.msg
%files -n fkwnn
%defattr(-,root,root)
%config /etc/init.d/fkwnn
%config /usr/sbin/rcfkwnn
%attr(755,wnn,root) /usr/bin/kserver
/usr/bin/katod
/usr/bin/katof
/usr/bin/kdtoa
/usr/bin/kwddel
/usr/bin/kwdreg
/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
%dir %attr(-,wnn,root) /var/lib/wnn/
%dir %attr(-,wnn,root) /var/lib/wnn/ko_KR/
%attr(-,wnn,root) /var/lib/wnn/ko_KR/dic
%config /etc/FreeWnn/ko_KR/hinsi.data
%config /etc/FreeWnn/ko_KR/kserverrc
%config /etc/FreeWnn/ko_KR/libwnn.msg
/etc/FreeWnn/ko_KR/rk
%config /etc/FreeWnn/ko_KR/uum.msg
%config /etc/FreeWnn/ko_KR/uumkey
%config /etc/FreeWnn/ko_KR/uumrc
%config /etc/FreeWnn/ko_KR/wnnenvrc
%config /etc/FreeWnn/ko_KR/wnnenvrc_R
%config /etc/FreeWnn/ko_KR/wnnstat.msg
%config %{_initddir}/fkwnn
%{_sbindir}/rcfkwnn
%{_bindir}/kserver
%{_bindir}/katod
%{_bindir}/katof
%{_bindir}/kdtoa
%{_bindir}/kwddel
%{_bindir}/kwdreg
%{_bindir}/kwnnkill
%{_bindir}/kwnnstat
%{_bindir}/kwnntouch
%{_bindir}/kuum
%dir %{_sysconfdir}/FreeWnn/
%dir %{_sysconfdir}/FreeWnn/ko_KR/
%{_sysconfdir}/FreeWnn/ko_KR/dic
%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/
%dir %attr(-,wnn,root) %{_localstatedir}/lib/wnn/ko_KR/
%{_localstatedir}/lib/wnn/ko_KR/dic
%config %{_sysconfdir}/FreeWnn/ko_KR/hinsi.data
%config %{_sysconfdir}/FreeWnn/ko_KR/kserverrc
%config %{_sysconfdir}/FreeWnn/ko_KR/libwnn.msg
%dir %{_sysconfdir}/FreeWnn/ko_KR/rk
%config %{_sysconfdir}/FreeWnn/ko_KR/rk/*
%config %{_sysconfdir}/FreeWnn/ko_KR/uum.msg
%config %{_sysconfdir}/FreeWnn/ko_KR/uumkey
%config %{_sysconfdir}/FreeWnn/ko_KR/uumrc
%config %{_sysconfdir}/FreeWnn/ko_KR/wnnenvrc
%config %{_sysconfdir}/FreeWnn/ko_KR/wnnenvrc_R
%config %{_sysconfdir}/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
%{_includedir}/kwnn/
%{_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
# %doc Xwnmo/X11R6/README Xwnmo/X11R6/include/README
# %doc Xwnmo/X11R6/README Xwnmo/X11R6/include/README
# %doc Xwnmo/xjutil/README Xwnmo/xjutil/README.j Xwnmo/xwnmo/README
# %doc Xwnmo/xwnmo/README.j Xwnmo/xwnmo/SEP_README Xwnmo/xwnmo/SEP_README.j
# /usr/X11R6/lib/X11/app-defaults/Xwnmo

1
rcfcwnn
View File

@ -11,6 +11,7 @@
# Required-Stop: $network $remote_fs $named
# Default-Start: 3 5
# Default-Stop:
# Short-Description: Free Wnn (mainland) Chinese Server
# Description: Free Wnn (mainland) Chinese Server, for input of simplified Chinese
### END INIT INFO

1
rcfkwnn
View File

@ -11,6 +11,7 @@
# Required-Stop: $network $remote_fs $named
# Default-Start: 3 5
# Default-Stop:
# Short-Description: Free Wnn Korean Server
# Description: Free Wnn Korean Server, for input of Korean
### END INIT INFO

1
rcftwnn
View File

@ -11,6 +11,7 @@
# Required-Stop: $network $remote_fs $named
# Default-Start: 3 5
# Default-Stop:
# Short-Description: Free Wnn Taiwan-Chinese Server
# Description: Free Wnn Taiwan-Chinese Server, for input of traditional Chinese
### END INIT INFO

1
rcfwnn
View File

@ -11,6 +11,7 @@
# Required-Stop: $network $remote_fs $named
# Default-Start: 3 5
# Default-Stop:
# Short-Description: Free Wnn Kanji Server
# Description: Free Wnn Kanji Server used for input of Japanese
### END INIT INFO