Hello community, here is the log from the commit of package fwnn for openSUSE:Factory checked in at 2015-09-19 06:54:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwnn (Old) and /work/SRC/openSUSE:Factory/.fwnn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fwnn" Changes: -------- --- /work/SRC/openSUSE:Factory/fwnn/fwnn.changes 2013-08-22 10:53:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fwnn.new/fwnn.changes 2015-09-19 06:55:00.000000000 +0200 @@ -1,0 +2,30 @@ +Wed Sep 16 10:11:56 UTC 2015 - [email protected] + +- 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 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- FreeWnn-1.1.1-a022.dif FreeWnn-1.1.1-a022.tar.bz2 FreeWnn-include.patch FreeWnn-prototypes.patch FreeWnn-prototypes_3.patch FreeWnn-prototypes_msg.patch FreeWnn-sighandler.patch New: ---- FreeWnn-1.1.1-a023.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwnn.spec ++++++ ++++ 806 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/fwnn/fwnn.spec ++++ and /work/SRC/openSUSE:Factory/.fwnn.new/fwnn.spec ++++++ FreeWnn-ja.patch ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -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. :-) */ ++++++ FreeWnn-noroot.patch ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -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 ++++++ FreeWnn-trad_cpp.patch ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -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) $@ - - 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 @@ + std.fsrc: fzk.master-.c $(FZK_SRC) +- $(FZK_PP) fzk.master-.c > $@ ++ $(CPP) -traditional-cpp $(FZK_FLAGS) fzk.master-.c > $@ + + 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 @@ # 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 @@ # 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 ++++++ FreeWnn-warnings.patch ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -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 ++++++ rcfcwnn ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -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 ++++++ rcfkwnn ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -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 ++++++ rcftwnn ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -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 ++++++ rcfwnn ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -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
