94c4a3d26d
- 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
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
--- FreeWnn-1.1.1-a022.bak/makerule.mk.in 2013-06-07 03:24:38.000000000 +0900
|
|
+++ FreeWnn-1.1.1-a022/makerule.mk.in 2013-08-07 14:15:30.506662233 +0900
|
|
@@ -136,7 +136,7 @@
|
|
exec_prefix = @exec_prefix@
|
|
bindir = @bindir@
|
|
sbindir = @sbindir@
|
|
- WNNWNNDIR = $(exec_prefix)/lib/wnn
|
|
+ WNNWNNDIR = /etc/FreeWnn
|
|
WNNBINDIR = $(bindir)
|
|
WNNSBINDIR = @WNNSBINDIR@
|
|
WNNINCDIR = @includedir@
|
|
@@ -157,12 +157,12 @@
|
|
WNNCONSDICSRC = $(IMTOP)/Wnn-consortium/dic
|
|
|
|
WNNTOP = $(IMTOP)/Wnn
|
|
- JWNNLANG = ja_JP
|
|
+ JWNNLANG = ja
|
|
JWNNWNNDIR = $(WNNWNNDIR)/$(JWNNLANG)
|
|
JWNNBINDIR = $(WNNBINDIR)$(JWNNSUBBINDIR)
|
|
JWNNSBINDIR = $(WNNSBINDIR)$(JWNNSUBBINDIR)
|
|
JWNNINCDIR = $(WNNINCDIR)/wnn
|
|
- JWNNDICDIR = $(JWNNWNNDIR)/dic
|
|
+ JWNNDICDIR = /var/lib/wnn/$(JWNNLANG)/dic
|
|
JWNNPUBDICDIR = $(JWNNDICDIR)/pubdic
|
|
JWNNWNNCONSDICDIR = $(JWNNDICDIR)/wnncons
|
|
JWNNFZKSRCDIR = $(JWNNDICDIR)/src
|
|
@@ -193,7 +193,7 @@
|
|
CWNNINCDIR = $(WNNINCDIR)/cwnn
|
|
CWNNBINDIR = $(WNNBINDIR)$(CWNNSUBBINDIR)
|
|
CWNNSBINDIR = $(WNNSBINDIR)$(CWNNSUBBINDIR)
|
|
- CWNNDICDIR = $(CWNNWNNDIR)/dic
|
|
+ CWNNDICDIR = /var/lib/wnn/$(CWNNLANG)/dic
|
|
CWNNSYSDICDIR = $(CWNNDICDIR)/sys
|
|
CWNNCDSRC = $(CWNNTOP)/cd
|
|
CWNNCDICSRC = $(CWNNTOP)/cdic
|
|
@@ -217,7 +217,7 @@
|
|
KWNNINCDIR = $(WNNINCDIR)/kwnn
|
|
KWNNBINDIR = $(WNNBINDIR)$(KWNNSUBBINDIR)
|
|
KWNNSBINDIR = $(WNNSBINDIR)$(KWNNSUBBINDIR)
|
|
- KWNNDICDIR = $(KWNNWNNDIR)/dic
|
|
+ KWNNDICDIR = /var/lib/wnn/$(KWNNLANG)/dic
|
|
KWNNSYSDICDIR = $(KWNNDICDIR)/sys
|
|
KWNNKDSRC = $(KWNNTOP)/kd
|
|
KWNNKDICSRC = $(KWNNTOP)/kdic
|
|
@@ -237,7 +237,7 @@
|
|
|
|
TWNNLANG = zh_TW
|
|
TWNNWNNDIR = $(WNNWNNDIR)/$(TWNNLANG)
|
|
- TWNNDICDIR = $(TWNNWNNDIR)/dic
|
|
+ TWNNDICDIR = /var/lib/wnn/$(TWNNLANG)/dic
|
|
TWNNSYSDICDIR = $(TWNNDICDIR)/sys
|
|
TWNNTDSRC = $(CWNNTOP)/td
|
|
TWNNTDICSRC = $(CWNNTOP)/tdic
|