9a14d50062
- Modify FreeWnn-prototypes_3.patch . I found a bug in make_hinsi_list() at Wnn/jserver/hinsi_list.c, then fixed it . - Add FreeWnn-prototypes_3.patch . Prototype declarations for reducing compilation warnings . - Add FreeWnn-prototypes_msg.patch . Bugfix: In openSUSE 13.1 Milestone 3, uum could not get error messages . This issue's cause is that we forgot prototype declaration of msg_get() in Wnn/include/msg.h . Then I added "FreeWnn-prototypes_msg.patch" as %Patch15 . http://lists.opensuse.org/opensuse-ja/2013-08/msg00014.html http://sourceforge.jp/projects/freewnn/lists/archive/users/2013-August/000140.html - I added %configure --with-libwrap option . The [jctk]server s were linked -lwrap . Then we can use /etc/hosts.allow /etc/hosts.deny . - Degrade fix: In "FreeWnn-prototypes.patch", I invalidated the patch of "FreeWnn-sighandler.patch" . Then I deleted a wrong patch to "Wnn/jserver/de.c" from "FreeWnn-prototypes.patch" . http://sourceforge.jp/projects/freewnn/lists/archive/users/2013-August/000141.html - Change: In "FreeWnn-sighandler.patch", I changed from _exit(-1) to _exit(255) . This change effects [jctk]server's exit status . - SLE_11 and openSUSE 12.2 does not provide libwrap0, then I could not build FreeWnn on them . So, I deleted %configure --with-libwrap option OBS-URL: https://build.opensuse.org/request/show/195772 OBS-URL: https://build.opensuse.org/package/show/M17N/fwnn?expand=0&rev=11
54 lines
2.8 KiB
Diff
54 lines
2.8 KiB
Diff
--- FreeWnn-1.1.1-a022.bak/Wnn/pubdicplus/Makefile.in 2013-08-07 06:08:05.039178998 +0900
|
|
+++ FreeWnn-1.1.1-a022/Wnn/pubdicplus/Makefile.in 2013-08-07 00:37:02.866652685 +0900
|
|
@@ -421,7 +421,7 @@
|
|
$(LN) $? $@
|
|
|
|
std.fzk: fzk.master-.c $(FZK_SRC)
|
|
- $(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 @@
|
|
$(DICS): $(HINSI)
|
|
|
|
$(FULL):: $(FZK_SRCS) con.master-.c
|
|
- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
|
|
+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
|
|
|
|
$(FULLR):: $(FZK_SRCS) con.masterR-.c
|
|
- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
|
|
+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
|
|
|
|
# To avoid circular dependency, we don't use 'con.master?.c'
|
|
con.master-.c: con.master
|
|
--- FreeWnn-1.1.1-a022.bak/cWnn/tdic/Makefile.in 2013-08-07 06:08:05.139178134 +0900
|
|
+++ FreeWnn-1.1.1-a022/cWnn/tdic/Makefile.in 2013-08-07 00:43:26.207005663 +0900
|
|
@@ -64,10 +64,10 @@
|
|
$(DICS): $(HINSI)
|
|
|
|
$(FULL):: $(FZK_SRCS) con.master-.c
|
|
- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
|
|
+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
|
|
|
|
$(FULLR):: $(FZK_SRCS) con.masterR-.c
|
|
- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
|
|
+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
|
|
|
|
# To avoid circular dependency, we don't use 'con.master?.c'
|
|
con.master-.c: con.master
|
|
--- FreeWnn-1.1.1-a022.bak/kWnn/kdic/Makefile.in 2013-08-07 06:08:05.151178030 +0900
|
|
+++ FreeWnn-1.1.1-a022/kWnn/kdic/Makefile.in 2013-08-07 00:44:57.500267277 +0900
|
|
@@ -62,7 +62,7 @@
|
|
$(DICS): $(HINSI)
|
|
|
|
$(FULL):: $(FZK_SRCS) fzk.master-.c
|
|
- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
|
|
+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
|
|
|
|
# To avoid circular dependency, we don't use 'fzk.master.c'
|
|
fzk.master-.c: fzk.master
|