Rel 3; rediff patches

diff --git a/FreeWnn-ja.patch b/FreeWnn-ja.patch
index c12c2002b1b12f21ddfa438f24959525c8a8aae1..295af91d74c2f5737d23299a99c468fb5ea9a7c5 100644 (file)
--- a/FreeWnn-ja.patch
+++ b/FreeWnn-ja.patch
@@ -1,6 +1,7 @@
---- FreeWnn-1.1.1-a017.org/Wnn/etc/msg.c       Tue Mar 21 01:31:33 2000
-+++ FreeWnn-1.1.1-a017/Wnn/etc/msg.c   Thu Jul  6 11:41:34 2000
-@@ -457,12 +457,12 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/etc/msg.c FreeWnn-1.1.1-a023/Wnn/etc/msg.c
+--- FreeWnn-1.1.1-a023.org/Wnn/etc/msg.c       2013-09-02 13:01:39.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/etc/msg.c   2023-02-02 20:00:10.683168707 +0100
+@@ -412,12 +412,12 @@ main ()
  {
    struct msg_cat *cd;
  
@@ -16,9 +17,10 @@
    printf (msg_get (cd, 100, "message not found\n", "zh_CN"), "abc");
  }
  #endif /* not_use */
---- FreeWnn-1.1.1-a017.org/Wnn/include/jd_sock.h       Thu Feb 24 00:31:29 2000
-+++ FreeWnn-1.1.1-a017/Wnn/include/jd_sock.h   Thu Jul  6 11:43:16 2000
-@@ -67,7 +67,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/include/jd_sock.h FreeWnn-1.1.1-a023/Wnn/include/jd_sock.h
+--- FreeWnn-1.1.1-a023.org/Wnn/include/jd_sock.h       2005-04-10 17:26:37.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/include/jd_sock.h   2023-02-02 20:00:10.683168707 +0100
+@@ -57,7 +57,7 @@
  #ifdef  JAPANESE                /* Japanese */
  # define WNN_PORT_IN    (0x5701)
  static char *sockname = "/tmp/jd_sockV4";       /* for jserver */
@@ -27,7 +29,7 @@
  # define SERVERNAME     "wnn4"
  # define MESSAGE_FILE   "jserver.msg"
  #else /* JAPANESE */
-@@ -98,7 +98,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,9 +38,10 @@
  # define SERVERNAME     "wnn4"
  # define MESSAGE_FILE   "jserver.msg"
  #endif /* KOREAN */
---- FreeWnn-1.1.1-a017.org/Wnn/include/jslib.h Thu Feb 24 00:31:30 2000
-+++ FreeWnn-1.1.1-a017/Wnn/include/jslib.h     Thu Jul  6 11:44:15 2000
-@@ -394,8 +394,8 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/include/jslib.h FreeWnn-1.1.1-a023/Wnn/include/jslib.h
+--- FreeWnn-1.1.1-a023.org/Wnn/include/jslib.h 2013-09-02 13:01:39.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/include/jslib.h     2023-02-02 20:00:10.683168707 +0100
+@@ -412,8 +412,8 @@ struct wnn_file_head
  /*
    JSLIB function declaration
  */
@@ -47,21 +50,23 @@
 +#define js_open(server, timeout)        js_open_lang(server, "ja", timeout)
 +#define js_connect(server,env_name)     js_connect_lang(server, env_name, "ja")
  
- extern WNN_JSERVER_ID *js_open_lang ();
- extern int js_close ();
---- FreeWnn-1.1.1-a017.org/Wnn/include/msg.h   Thu Feb 24 00:31:30 2000
-+++ FreeWnn-1.1.1-a017/Wnn/include/msg.h       Thu Jul  6 11:44:27 2000
-@@ -50,7 +50,7 @@
+ 
+ extern WNN_JSERVER_ID *js_open_lang FRWNN_PARAMS((const register char *server, const register char *lang, register int timeout));
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/include/msg.h FreeWnn-1.1.1-a023/Wnn/include/msg.h
+--- FreeWnn-1.1.1-a023.org/Wnn/include/msg.h   2013-09-02 13:01:39.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/include/msg.h       2023-02-02 20:00:10.683168707 +0100
+@@ -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-a017.org/Wnn/include/wnn_config.h    Thu Feb 24 00:31:30 2000
-+++ FreeWnn-1.1.1-a017/Wnn/include/wnn_config.h        Thu Jul  6 11:45:12 2000
+ #if __STDC__
+ #define FRWNN_PARAMS(paramlist)       paramlist
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/include/wnn_config.h FreeWnn-1.1.1-a023/Wnn/include/wnn_config.h
+--- FreeWnn-1.1.1-a023.org/Wnn/include/wnn_config.h    2005-04-10 17:26:37.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/include/wnn_config.h        2023-02-02 20:00:10.683168707 +0100
 @@ -44,7 +44,7 @@
  #define WNN_CSERVER_ENV         "CSERVER"
  #define WNN_KSERVER_ENV         "KSERVER"
@@ -98,8 +103,9 @@
  #endif /* HINSIDATA_FILE */
  
  #define USR_DIC_DIR_VAR "@USR"
---- FreeWnn-1.1.1-a017.org/Wnn/jd/serverdefs   Sun Jan 30 12:40:48 2000
-+++ FreeWnn-1.1.1-a017/Wnn/jd/serverdefs       Thu Jul  6 11:40:36 2000
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/jd/serverdefs FreeWnn-1.1.1-a023/Wnn/jd/serverdefs
+--- FreeWnn-1.1.1-a023.org/Wnn/jd/serverdefs   2001-06-14 19:55:32.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/jd/serverdefs       2023-02-02 20:00:10.683168707 +0100
 @@ -30,7 +30,7 @@
  ;
  
@@ -109,9 +115,10 @@
  japanese      jserver         /tmp/jd_sockV4          wnn4            22273
  nihongo               jserver         /tmp/jd_sockV4          wnn4            22273
  zh_CN         cserver         /tmp/cd_sockV4          wnn4_Cn         22289
---- FreeWnn-1.1.1-a017.org/Wnn/jlib/jl.c       Tue Mar 21 01:21:12 2000
-+++ FreeWnn-1.1.1-a017/Wnn/jlib/jl.c   Thu Jul  6 11:46:00 2000
-@@ -442,7 +442,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/jlib/jl.c FreeWnn-1.1.1-a023/Wnn/jlib/jl.c
+--- FreeWnn-1.1.1-a023.org/Wnn/jlib/jl.c       2015-05-10 03:39:27.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/jlib/jl.c   2023-02-02 20:00:10.686502040 +0100
+@@ -460,7 +460,7 @@ jl_connect_lang (env_n, server_n, lang,
    if (!lang || !*lang)
      {
  /* Sorry! Default is Japanese. :-) */

diff --git a/FreeWnn-jserverrc-g-jinmei.patch b/FreeWnn-jserverrc-g-jinmei.patch
index 24dbee8c559a2705df00baa5fe6db4ad910c6260..e5023d2737922b1be85ef3a49709f84025e76faf 100644 (file)
--- a/FreeWnn-jserverrc-g-jinmei.patch
+++ b/FreeWnn-jserverrc-g-jinmei.patch
@@ -1,8 +1,9 @@
---- FreeWnn-1.1.1-a013/Wnn/jd/jserverrc.org    Tue May 30 18:19:37 2000
-+++ FreeWnn-1.1.1-a013/Wnn/jd/jserverrc        Tue May 30 18:20:02 2000
-@@ -48,6 +48,8 @@
- readfile pubdic/tankan.dic
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/jd/jserverrc FreeWnn-1.1.1-a023/Wnn/jd/jserverrc
+--- FreeWnn-1.1.1-a023.org/Wnn/jd/jserverrc    2001-06-14 20:08:31.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/jd/jserverrc        2023-02-02 20:00:50.813168705 +0100
+@@ -43,6 +43,8 @@ readfile pubdic/tankan.dic
  readfile pubdic/bio.dic
+ readfile gerodic/g-jinmei.dic
  
 +readfile gerodic/g-jinmei.dic
 +

diff --git a/FreeWnn-manpaths.patch b/FreeWnn-manpaths.patch
index 8a95622844d090e77f559944cb87eb9b3c729bb3..6aeba7cfb21e1ed0729122fd96151e247c99d512 100644 (file)
--- a/FreeWnn-manpaths.patch
+++ b/FreeWnn-manpaths.patch
@@ -1,17 +1,7 @@
---- FreeWnn-1.1.1-a021/makerule.mk.in.orig     2012-11-17 14:43:37.699823983 +0100
-+++ FreeWnn-1.1.1-a021/makerule.mk.in  2012-11-17 15:36:36.376424397 +0100
-@@ -44,6 +44,8 @@
- 
-            MANDIR = @mandir@/man$(MANSUFFIX)
-         LIBMANDIR = @mandir@/man$(LIBMANSUFFIX)
-+          JMANDIR = @mandir@/ja/man$(MANSUFFIX)
-+       JLIBMANDIR = @mandir@/ja/man$(LIBMANSUFFIX)
- 
-         MANSUFFIX = 1
-      LIBMANSUFFIX = 3
---- FreeWnn-1.1.1-a021/Wnn/man/2.env/dic/Makefile.in.orig      2001-08-14 15:43:21.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/man/2.env/dic/Makefile.in   2012-11-17 15:40:28.603086222 +0100
-@@ -34,6 +34,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/man/2.env/dic/Makefile.in FreeWnn-1.1.1-a023/Wnn/man/2.env/dic/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/man/2.env/dic/Makefile.in       2001-08-14 15:43:21.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/man/2.env/dic/Makefile.in   2023-02-02 20:01:12.676502036 +0100
+@@ -34,6 +34,7 @@ top_builddir = ../../../..
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
  
@@ -19,9 +9,10 @@
  MANSUFFIX = 5
  
  all::
---- FreeWnn-1.1.1-a021/Wnn/man/2.env/wnn/Makefile.in.orig      2001-08-14 15:43:21.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/man/2.env/wnn/Makefile.in   2012-11-17 15:41:07.563085411 +0100
-@@ -34,6 +34,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/man/2.env/wnn/Makefile.in FreeWnn-1.1.1-a023/Wnn/man/2.env/wnn/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/man/2.env/wnn/Makefile.in       2001-08-14 15:43:21.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/man/2.env/wnn/Makefile.in   2023-02-02 20:01:12.676502036 +0100
+@@ -34,6 +34,7 @@ top_builddir = ../../../..
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
  
@@ -29,9 +20,10 @@
  MANSUFFIX = 4
  
  install.man:: 2a_ctrl.man
---- FreeWnn-1.1.1-a021/Wnn/man/3.libwnn/jl_lib/Makefile.in.orig        2001-09-16 16:20:17.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/man/3.libwnn/jl_lib/Makefile.in     2012-11-17 15:41:36.536418141 +0100
-@@ -34,7 +34,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/man/3.libwnn/jl_lib/Makefile.in FreeWnn-1.1.1-a023/Wnn/man/3.libwnn/jl_lib/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/man/3.libwnn/jl_lib/Makefile.in 2001-09-16 16:20:17.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/man/3.libwnn/jl_lib/Makefile.in     2023-02-02 20:01:12.676502036 +0100
+@@ -34,7 +34,7 @@ top_builddir = ../../../..
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
  
@@ -40,9 +32,10 @@
  MANSUFFIX = $(LIBMANSUFFIX)
  
  install.man:: bun_suu.man
---- FreeWnn-1.1.1-a021/Wnn/man/3.libwnn/js_lib/Makefile.in.orig        2001-08-14 15:43:21.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/man/3.libwnn/js_lib/Makefile.in     2012-11-17 15:41:55.896417735 +0100
-@@ -34,7 +34,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/man/3.libwnn/js_lib/Makefile.in FreeWnn-1.1.1-a023/Wnn/man/3.libwnn/js_lib/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/man/3.libwnn/js_lib/Makefile.in 2001-08-14 15:43:21.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/man/3.libwnn/js_lib/Makefile.in     2023-02-02 20:01:12.676502036 +0100
+@@ -34,7 +34,7 @@ top_builddir = ../../../..
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
  
@@ -51,9 +44,10 @@
  MANSUFFIX = $(LIBMANSUFFIX)
  
  all::
---- FreeWnn-1.1.1-a021/Wnn/man/3.libwnn/misc_lib/Makefile.in.orig      2001-08-14 15:43:21.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/man/3.libwnn/misc_lib/Makefile.in   2012-11-17 15:42:07.269750834 +0100
-@@ -34,7 +34,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/man/3.libwnn/misc_lib/Makefile.in FreeWnn-1.1.1-a023/Wnn/man/3.libwnn/misc_lib/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/man/3.libwnn/misc_lib/Makefile.in       2001-08-14 15:43:21.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/man/3.libwnn/misc_lib/Makefile.in   2023-02-02 20:01:12.676502036 +0100
+@@ -34,7 +34,7 @@ top_builddir = ../../../..
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
  
@@ -62,9 +56,10 @@
  MANSUFFIX = $(LIBMANSUFFIX)
  
  install.man:: msg_open.man
---- FreeWnn-1.1.1-a021/Wnn/man/3.libwnn/rk_lib/Makefile.in.orig        2001-08-14 15:43:21.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/man/3.libwnn/rk_lib/Makefile.in     2012-11-17 15:42:28.299750394 +0100
-@@ -34,7 +34,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/man/3.libwnn/rk_lib/Makefile.in FreeWnn-1.1.1-a023/Wnn/man/3.libwnn/rk_lib/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/man/3.libwnn/rk_lib/Makefile.in 2001-08-14 15:43:21.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/man/3.libwnn/rk_lib/Makefile.in     2023-02-02 20:01:12.676502036 +0100
+@@ -34,7 +34,7 @@ top_builddir = ../../../..
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
  
@@ -73,23 +68,37 @@
  MANSUFFIX = $(LIBMANSUFFIX)
  
  install.man:: rk_clear.man
---- FreeWnn-1.1.1-a021/Wnn/man/4.cmd/Makefile.in.orig  2001-08-14 15:43:21.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/man/4.cmd/Makefile.in       2012-11-17 15:42:54.219749853 +0100
-@@ -34,6 +34,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/man/4.cmd/Makefile.in FreeWnn-1.1.1-a023/Wnn/man/4.cmd/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/man/4.cmd/Makefile.in   2010-07-11 12:18:17.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/man/4.cmd/Makefile.in       2023-02-02 20:01:12.676502036 +0100
+@@ -35,6 +35,7 @@ top_builddir = @top_builddir@
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
  
 +MANDIR = $(JMANDIR)
  MANSUFFIX = 1
  
- install.man:: jserver.man
---- FreeWnn-1.1.1-a021/Wnn/man/6.jutil/Makefile.in.orig        2001-08-14 15:43:21.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/man/6.jutil/Makefile.in     2012-11-17 15:43:15.059749419 +0100
-@@ -34,6 +34,7 @@
+ SERVER_MAN = jserver.man
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/man/6.jutil/Makefile.in FreeWnn-1.1.1-a023/Wnn/man/6.jutil/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/man/6.jutil/Makefile.in 2010-07-11 12:18:17.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/man/6.jutil/Makefile.in     2023-02-02 20:01:12.676502036 +0100
+@@ -35,6 +35,7 @@ top_builddir = @top_builddir@
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
  
 +MANDIR = $(JMANDIR)
  MANSUFFIX = 1
  
- install.man:: atod.man
+ MANUALS = atod.man dtoa.man atof.man wddel.man wdreg.man wnntouch.man
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/makerule.mk.in FreeWnn-1.1.1-a023/makerule.mk.in
+--- FreeWnn-1.1.1-a023.org/makerule.mk.in      2023-02-02 20:01:12.163168702 +0100
++++ FreeWnn-1.1.1-a023/makerule.mk.in  2023-02-02 20:01:12.676502036 +0100
+@@ -48,6 +48,8 @@ all::
+ 
+            MANDIR = @mandir@/man$(MANSUFFIX)
+         LIBMANDIR = @mandir@/man$(LIBMANSUFFIX)
++          JMANDIR = @mandir@/ja/man$(MANSUFFIX)
++       JLIBMANDIR = @mandir@/ja/man$(LIBMANSUFFIX)
+ 
+         MANSUFFIX = 1
+      LIBMANSUFFIX = 3

diff --git a/FreeWnn-noroot.patch b/FreeWnn-noroot.patch
index 53df990d8cab9be6744be262f0d22757f93271ce..ddb985b53c07ac690e05859a14714c1814aac0cb 100644 (file)
--- a/FreeWnn-noroot.patch
+++ b/FreeWnn-noroot.patch
@@ -1,6 +1,7 @@
---- FreeWnn-1.1.1-a021/Contrib/dic/gerodic/Makefile.in.orig    2012-11-16 19:46:06.097913226 +0100
-+++ FreeWnn-1.1.1-a021/Contrib/dic/gerodic/Makefile.in 2012-11-16 19:49:16.601242597 +0100
-@@ -43,7 +43,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Contrib/dic/gerodic/Makefile.in FreeWnn-1.1.1-a023/Contrib/dic/gerodic/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Contrib/dic/gerodic/Makefile.in     2006-05-28 18:37:02.000000000 +0200
++++ FreeWnn-1.1.1-a023/Contrib/dic/gerodic/Makefile.in 2023-02-02 20:00:31.846502039 +0100
+@@ -46,7 +46,7 @@ top_builddir = @top_builddir@
  
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
@@ -8,8 +9,8 @@
 +LOCAL_INSTFLAGS =
  
  #ATOD=${JWNNBINDIR}/atod
- ATOD=${WNNJUTILSRC}/atod
-@@ -67,7 +67,6 @@
+ ATOD=${WNNJUTILOBJ}/atod
+@@ -70,7 +70,6 @@ $(OBJ): $(SRC)
  install:: ${OBJ}
        @if [ -d $(DESTDIR)$(GERODIR) ]; then set +x; \
        else (set -x; $(MKDIRHIER) $(DESTDIR)$(GERODIR)); fi
@@ -17,9 +18,10 @@
        $(INSTALL) $(INSTDATFLAGS) $(LOCAL_INSTFLAGS) ${OBJ} $(DESTDIR)$(GERODIR)
        ${WNNTOUCH} $(DESTDIR)$(GERODIR)/${OBJ}
  
---- FreeWnn-1.1.1-a021/Wnn/jserver/Makefile.in.orig    2012-11-16 19:46:06.101246559 +0100
-+++ FreeWnn-1.1.1-a021/Wnn/jserver/Makefile.in 2012-11-16 19:49:41.477908774 +0100
-@@ -36,7 +36,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/jserver/Makefile.in FreeWnn-1.1.1-a023/Wnn/jserver/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/jserver/Makefile.in     2010-07-11 12:18:17.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/jserver/Makefile.in 2023-02-02 20:00:31.846502039 +0100
+@@ -36,7 +36,7 @@ include @top_builddir@/makerule.mk
  top_builddir = @top_builddir@
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
@@ -28,20 +30,22 @@
  
   JSERVERDEFINES = -DJSERVER -DWRITE_CHECK
         INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) -I$(srcdir)
---- FreeWnn-1.1.1-a021/Wnn/jutil/Makefile.in.orig      2012-11-16 19:46:06.101246559 +0100
-+++ FreeWnn-1.1.1-a021/Wnn/jutil/Makefile.in   2012-11-16 19:50:18.187907603 +0100
-@@ -37,7 +37,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/jutil/Makefile.in FreeWnn-1.1.1-a023/Wnn/jutil/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/jutil/Makefile.in       2011-04-17 18:29:50.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/jutil/Makefile.in   2023-02-02 20:00:31.846502039 +0100
+@@ -37,7 +37,7 @@ top_builddir = @top_builddir@
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
  LT_INSTALL      = $(LIBTOOL) --mode=install $(INSTALL)
  LT_LD           = $(LIBTOOL) --mode=link $(CCLINK)
 -LOCAL_INSTFLAGS = -o $(WNNOWNER)
 +LOCAL_INSTFLAGS =
  
-        INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir)
+        INCLUDES = -I$(top_builddir) @EXTWNNJINC@ -I$(WNNINCLUDESRC)
          DEFINES = $(WNNDEFINES) $(WNNLANGDEF)
---- FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in.orig 2004-04-24 20:56:40.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in      2012-11-16 19:50:33.974574401 +0100
-@@ -35,7 +35,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/pubdicplus/Makefile.in FreeWnn-1.1.1-a023/Wnn/pubdicplus/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/pubdicplus/Makefile.in  2013-11-22 11:53:01.000000000 +0100
++++ FreeWnn-1.1.1-a023/Wnn/pubdicplus/Makefile.in      2023-02-02 20:00:31.846502039 +0100
+@@ -35,7 +35,7 @@ top_builddir = @top_builddir@
   WNNJUTILOBJ = $(top_builddir)/Wnn/jutil
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
@@ -50,7 +54,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 \
@@ -60,9 +64,10 @@
        done
  
  install:: $(DIC)
---- FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in.orig        2001-08-14 15:43:21.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in     2012-11-16 19:51:15.051240552 +0100
-@@ -33,7 +33,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Wnn/wnncons/dic/Makefile.in FreeWnn-1.1.1-a023/Wnn/wnncons/dic/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Wnn/wnncons/dic/Makefile.in 2001-08-14 15:43:21.000000000 +0200
++++ FreeWnn-1.1.1-a023/Wnn/wnncons/dic/Makefile.in     2023-02-02 20:00:31.846502039 +0100
+@@ -33,7 +33,7 @@ include @top_srcdir@/makerule.mk
  top_builddir = ../../..
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
@@ -71,7 +76,7 @@
  
             ATOD = $(WNNJUTILSRC)/atod
         WNNTOUCH = $(WNNJUTILSRC)/wnntouch
-@@ -74,8 +74,7 @@
+@@ -74,8 +74,7 @@ instserver:: install
  install::
        @case '${MFLAGS}' in *[i]*) set +e;; esac;
        @for i in $(JWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \
@@ -81,9 +86,10 @@
        done
  
  install:: $(DICS)
---- FreeWnn-1.1.1-a021/Xwnmo/xjutil/Makefile.in.orig   2012-11-16 19:46:06.107913226 +0100
-+++ FreeWnn-1.1.1-a021/Xwnmo/xjutil/Makefile.in        2012-11-16 19:52:15.237905547 +0100
-@@ -26,7 +26,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Xwnmo/xjutil/Makefile.in FreeWnn-1.1.1-a023/Xwnmo/xjutil/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Xwnmo/xjutil/Makefile.in    2001-08-14 15:43:21.000000000 +0200
++++ FreeWnn-1.1.1-a023/Xwnmo/xjutil/Makefile.in        2023-02-02 20:00:31.846502039 +0100
+@@ -26,7 +26,7 @@ include @top_srcdir@/makerule.mk
  top_builddir = ../..
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
@@ -92,9 +98,10 @@
  
         INCLUDES = -I. $(XWNMOINCLUDES) -I$(XWNMOSRC)
  
---- FreeWnn-1.1.1-a021/Xwnmo/xwnmo/Makefile.in.orig    2012-11-16 19:46:06.111246559 +0100
-+++ FreeWnn-1.1.1-a021/Xwnmo/xwnmo/Makefile.in 2012-11-16 19:52:35.257905017 +0100
-@@ -26,7 +26,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/Xwnmo/xwnmo/Makefile.in FreeWnn-1.1.1-a023/Xwnmo/xwnmo/Makefile.in
+--- FreeWnn-1.1.1-a023.org/Xwnmo/xwnmo/Makefile.in     2001-08-14 15:43:21.000000000 +0200
++++ FreeWnn-1.1.1-a023/Xwnmo/xwnmo/Makefile.in 2023-02-02 20:00:31.846502039 +0100
+@@ -26,7 +26,7 @@ include @top_srcdir@/makerule.mk
  top_builddir = ../..
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
@@ -103,9 +110,10 @@
  
         INCLUDES = $(XWNMOINCLUDES)
  
---- FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in.orig      2004-04-24 20:56:40.000000000 +0200
-+++ FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in   2012-11-16 19:53:08.247904391 +0100
-@@ -31,7 +31,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/cWnn/cdic/Makefile.in FreeWnn-1.1.1-a023/cWnn/cdic/Makefile.in
+--- FreeWnn-1.1.1-a023.org/cWnn/cdic/Makefile.in       2010-02-22 18:06:54.000000000 +0100
++++ FreeWnn-1.1.1-a023/cWnn/cdic/Makefile.in   2023-02-02 20:00:31.846502039 +0100
+@@ -32,7 +32,7 @@ top_builddir = @top_builddir@
  CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil
  
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
@@ -114,7 +122,7 @@
  
          ATOD = $(CWNNJUTILOBJ)/catod
          ATOF = $(CWNNJUTILOBJ)/catof
-@@ -85,8 +85,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 \
@@ -124,31 +132,34 @@
        done
  
  install:: $(ALLTGT)
---- FreeWnn-1.1.1-a021/cWnn/jserver/Makefile.in.orig   2004-05-21 18:39:32.000000000 +0200
-+++ FreeWnn-1.1.1-a021/cWnn/jserver/Makefile.in        2012-11-16 19:46:06.114579892 +0100
-@@ -38,7 +38,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/cWnn/jserver/Makefile.in FreeWnn-1.1.1-a023/cWnn/jserver/Makefile.in
+--- FreeWnn-1.1.1-a023.org/cWnn/jserver/Makefile.in    2013-09-02 13:01:40.000000000 +0200
++++ FreeWnn-1.1.1-a023/cWnn/jserver/Makefile.in        2023-02-02 20:00:31.846502039 +0100
+@@ -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-a021/cWnn/jutil/Makefile.in.orig     2012-11-16 19:46:06.114579892 +0100
-+++ FreeWnn-1.1.1-a021/cWnn/jutil/Makefile.in  2012-11-16 19:53:19.394570865 +0100
-@@ -36,7 +36,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/cWnn/jutil/Makefile.in FreeWnn-1.1.1-a023/cWnn/jutil/Makefile.in
+--- FreeWnn-1.1.1-a023.org/cWnn/jutil/Makefile.in      2011-04-17 18:29:50.000000000 +0200
++++ FreeWnn-1.1.1-a023/cWnn/jutil/Makefile.in  2023-02-02 20:00:31.846502039 +0100
+@@ -36,7 +36,7 @@ top_builddir = @top_builddir@
  INSTALL         = @INSTALL@ $(INSTALLFLAGS)
  LT_INSTALL      = $(LIBTOOL) --mode=install $(INSTALL)
  LT_LD           = $(LIBTOOL) --mode=link $(CCLINK)
 -LOCAL_INSTFLAGS = -o $(WNNOWNER)
 +LOCAL_INSTFLAGS =
  
-        INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir)
+        INCLUDES = -I$(top_builddir) @EXTCWNNJINC@ -I$(CWNNINCLUDESRC)
          DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF)
---- FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in.orig      2004-04-24 20:56:40.000000000 +0200
-+++ FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in   2012-11-16 19:53:49.317903600 +0100
-@@ -31,7 +31,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/cWnn/tdic/Makefile.in FreeWnn-1.1.1-a023/cWnn/tdic/Makefile.in
+--- FreeWnn-1.1.1-a023.org/cWnn/tdic/Makefile.in       2010-02-22 18:06:54.000000000 +0100
++++ FreeWnn-1.1.1-a023/cWnn/tdic/Makefile.in   2023-02-02 20:00:31.846502039 +0100
+@@ -32,7 +32,7 @@ top_builddir = @top_builddir@
  CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil
  
  INSTALL      = @INSTALL@
@@ -157,7 +168,7 @@
  
          ATOD = $(CWNNJUTILOBJ)/catod
          ATOF = $(CWNNJUTILOBJ)/catof
-@@ -85,8 +85,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 \
@@ -167,9 +178,10 @@
        done
  
  install:: $(ALLTGT)
---- FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in.orig   2004-05-21 18:39:32.000000000 +0200
-+++ FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in        2012-11-16 19:46:06.121246559 +0100
-@@ -38,7 +38,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/kWnn/jserver/Makefile.in FreeWnn-1.1.1-a023/kWnn/jserver/Makefile.in
+--- FreeWnn-1.1.1-a023.org/kWnn/jserver/Makefile.in    2010-07-11 12:18:17.000000000 +0200
++++ FreeWnn-1.1.1-a023/kWnn/jserver/Makefile.in        2023-02-02 20:00:31.846502039 +0100
+@@ -38,7 +38,7 @@ INSTALL      = @INSTALL@
   JSERVERDEFINES = -DJSERVER -DWRITE_CHECK
         INCLUDES = -I$(KWNNJSERVERSRC) -I$(KWNNINCLUDESRC) -I$(top_builddir)
          DEFINES = $(KWNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) $(KWNNLANGDEF)
@@ -178,20 +190,22 @@
    SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(KWNNLANG)/kserverrc\"
      HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\"
          WRAPLIB = @WRAPLIB@
---- FreeWnn-1.1.1-a021/kWnn/jutil/Makefile.in.orig     2012-11-16 19:46:06.121246559 +0100
-+++ FreeWnn-1.1.1-a021/kWnn/jutil/Makefile.in  2012-11-16 19:54:51.017902278 +0100
-@@ -39,7 +39,7 @@
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/kWnn/jutil/Makefile.in FreeWnn-1.1.1-a023/kWnn/jutil/Makefile.in
+--- FreeWnn-1.1.1-a023.org/kWnn/jutil/Makefile.in      2011-04-17 18:29:50.000000000 +0200
++++ FreeWnn-1.1.1-a023/kWnn/jutil/Makefile.in  2023-02-02 20:00:31.846502039 +0100
+@@ -39,7 +39,7 @@ LT_LD           = $(LIBTOOL) --mode=link
  
-        INCLUDES = -I$(KWNNINCLUDESRC) -I$(top_builddir)
+        INCLUDES = -I$(top_builddir) @EXTKWNNJINC@ -I$(KWNNINCLUDESRC)
          DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF)
 -LOCAL_INSTFLAGS = -o $(WNNOWNER)
 +LOCAL_INSTFLAGS =
      HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\"
  
- CLIENTPROGRAMS = kwnnstat kwnnkill kwddel kwdreg
---- FreeWnn-1.1.1-a021/kWnn/kdic/Makefile.in.orig      2004-04-24 20:56:40.000000000 +0200
-+++ FreeWnn-1.1.1-a021/kWnn/kdic/Makefile.in   2012-11-16 19:55:04.417902006 +0100
-@@ -31,7 +31,7 @@
+ CLIENTPROGRAMS = kwddel kwdreg
+diff -urNp -x '*.orig' FreeWnn-1.1.1-a023.org/kWnn/kdic/Makefile.in FreeWnn-1.1.1-a023/kWnn/kdic/Makefile.in
+--- FreeWnn-1.1.1-a023.org/kWnn/kdic/Makefile.in       2010-02-22 18:06:55.000000000 +0100
++++ FreeWnn-1.1.1-a023/kWnn/kdic/Makefile.in   2023-02-02 20:00:31.846502039 +0100
+@@ -32,7 +32,7 @@ top_builddir = @top_builddir@
  KWNNJUTILOBJ = $(top_builddir)/kWnn/jutil
  
  INSTALL      = @INSTALL@
@@ -200,7 +214,7 @@
  
          ATOD = $(KWNNJUTILOBJ)/katod
          ATOF = $(KWNNJUTILOBJ)/katof
-@@ -76,8 +76,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 \

diff --git a/FreeWnn.spec b/FreeWnn.spec
index 4da2fce7cde63e930ab4fd98e1f669574fa13d56..1e1c5868a95d9603524dc5670500839a648ede5d 100644 (file)
--- a/FreeWnn.spec
+++ b/FreeWnn.spec
@@ -2,7 +2,7 @@ Summary:        FreeWnn Japanese Input System
 Summary(pl.UTF-8):     FreeWnn - system wprowadzania znaków japońskich
 Name:          FreeWnn
 Version:       1.1.1
-%define rel     2
+%define rel     3
 %define        subver  a023
 Release:       0.%{subver}.%{rel}
 Epoch:         2