commit fwnn for openSUSE:Factory

Hello community, here is the log from the commit of package fwnn for openSUSE:Factory checked in at 2013-08-22 10:53:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-12-19 10:55:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fwnn.new/fwnn.changes 2013-08-22 10:53:57.000000000 +0200 @@ -1,0 +2,339 @@ +Thu Aug 15 15:42:53 UTC 2013 - bkbin005@rinku.zaq.ne.jp + +- Modify FreeWnn-prototypes_3.patch . + I found a bug in make_hinsi_list() at Wnn/jserver/hinsi_list.c, + then fixed it . + +------------------------------------------------------------------- +Thu Aug 15 15:07:13 UTC 2013 - bkbin005@rinku.zaq.ne.jp + +- Add FreeWnn-prototypes_3.patch . + Prototype declarations for reducing compilation warnings . + +------------------------------------------------------------------- +Fri Aug 9 00:51:15 UTC 2013 - bkbin005@rinku.zaq.ne.jp + +- 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/00014... +- 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/00014... +- Change: In "FreeWnn-sighandler.patch", + I changed from _exit(-1) to _exit(255) . + This change effects [jctk]server's exit status . + +------------------------------------------------------------------- +Thu Aug 8 04:16:47 UTC 2013 - bkbin005@rinku.zaq.ne.jp + +- 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 + and "BuildRequires: libwrap0" from fwnn.spec file . + +------------------------------------------------------------------- +Wed Aug 7 22:53:49 UTC 2013 - bkbin005@rinku.zaq.ne.jp + +- The uum can use UNIX 98 pseudoterminal now . (bnc#830533) + https://bugzilla.novell.com/show_bug.cgi?id=830533 +- The kuum is packaged in fkwnn . +- The cuum is packaged in fcwnncom . +- The [jctk]server s were linked -lwrap . + Then we can use /etc/hosts.allow /etc/hosts.deny . +- This release need not link to -ltermcap, but use ncurses, + then fwnn.spec was changed . +- FreeWnn-trad_cpp.patch: + Makefile.in s were changed formats, then remade the patch . +- FreeWnn-prototypes.patch: + Already, many functions were added prototype decraretion + in the tarball, then remade this patch . +- FreeWnn-returnvalue.diff: + Already, the tarball's source was fixed about return value . + Then this patch was removed . +- FreeWnn-include.patch: + Many sources already included proper header files . + Then this patch was remade . +- Freewnn-1.1.1-a21.dif was deleted, + but Freewnn-1.1.1-a22.dif was added: + In Wnn/include/jllib.h, many functions were added + prototype decraretion in the tarball, + then they need not to declare in the patch . + In Wnn/jlib/jlib.c, wrong cast changed . +- FreeWnn-uum.patch, fwnn.spec: + Now, FreeWnn need not to use -ltermcap, + but need to use -lncursess, then this patch was deleted . + And "BuildRequires:" was changed from termcap to ncurses + in fwnn.spec . +- FreeWnn-ja.patch: + FreeWnn-1.1.1-a017/Xsi/Wnn/uum/header.c was changed , then remade it . +- Fwnn-fsstnd-patch: + Changed makerule.mk.in format, then remade it . +- FreeWnn 1.1.1-a-22 released . + * Removed strange word (pronounces as 'Hirokazu', transfers to + 'Kobayashi'). Spotted by some poster of FreeWnn thread in + 2ch.net + (http://toro.2ch.net/test/read.cgi/unix/1084551838/458) + * uum failed to start on traditional systems because opening + tty fails. Fixed open_pty_traditional() + to set tty_slave correctly. + * Improve libutil detection. Systems that have both ptsname() and + openpty() does not need libutil, this change (probably) + covers these systems. ([freewnn-users 133]). + http://sourceforge.jp/projects/freewnn/lists/archive/users/2013-August/00013... + * libutil is (may be) used only in uum, so separate this library + (if exists) from normal LIBS. + Patch by 1xx (itsango at gmail.com) ([freewnn-users 126]) + http://sourceforge.jp/projects/freewnn/lists/archive/users/2013-July/000125.... + . + * Pass CPPFLAGS and LDFLAGS on configure / make. + Original suggestion by Hideki Yamane, but arranged a bit. + * Wnn/uum/inspect.c: + Fix typo in comment. + * Wnn/: jutil/wddel.c, jutil/wdreg.c, uum/inspect.c, + uum/select_ele.c: + * Quick fix for warning about format-security by gcc. + Based on patch by Hideki Yamane and Makoto Fujiwara + ([Freewnn-users 102]). + http://sourceforge.jp/projects/freewnn/lists/archive/users/2012-May/000101.h... + Replacing from sprintf() to snprintf() or strncat() + would be better. + * (Wnn/jutil/wddel.c) Change (fix?) type of Com[] to w_char + in code for 'wddel -C' mode. I think I'm doing right, + but not tested. + * Strip old mail address (as usual). + * configure, configure.in, Wnn/jutil/Makefile.in, + Wnn/uum/Makefile.in, cWnn/jutil/Makefile.in, + cWnn/uum/Makefile.in, kWnn/jutil/Makefile.in, + kWnn/uum/Makefile.in: + Fix to work --with-*wnn-includes . + Same as --with-*wnn-libraries , these are enabled + on *Wnn/jutil and *Wnn/uum only. + * Fix to work as expected in case --without-lib*wnn is explicitly + specified. + * Wnn/jserver/renbn_kai.c: + * Explicitly add cast to pointer in tan_syo(). + It helps compilers to guess argument type of sbn_kai(), + and fix other jserver crash bug on Linux/amd64 . + * Wnn/jserver/de_header.h: + Added prototype declaration of functions in bnsetu_kai.c + (for safety) . + * configure, configure.in: + We cannot build Xwnmo for now, so we (temporally) disabled + AC_PATH_X . + Probably workaround for systems with modern install layout + of X11. + * Wnn/jserver/de_header.h: + Fix return type mismatch of kanjiaddr() + prototype declaration . + Spotted on + http://twitter.com/pachira23/status/8875168688513024 , + and reported to freewnn-users by Hideki Yamane. Original + reporter saids it also fixes crash bug of jserver when client + register new word to dictionary. + * Add prototype declaration of functions in bdic.c (and some + source files). + * Wnn/jutil/ujisf.c: + Added prototype declaration of kanjiaddr() and Print_entry() . + * INSTALL, configure, configure.in, makerule.mk.in, + Wnn/jserver/Makefile.in, Wnn/jutil/Makefile.in, + Wnn/man/4.cmd/Makefile.in, Wnn/man/6.jutil/Makefile.in, + Wnn/uum/Makefile.in, cWnn/jserver/Makefile.in, + cWnn/jutil/Makefile.in, cWnn/man/4.cmd/Makefile.in, + cWnn/man/6.jutil/Makefile.in, cWnn/uum/Makefile.in, + kWnn/jserver/Makefile.in, kWnn/jutil/Makefile.in, + kWnn/uum/Makefile.in: + Added (first step of) support for new installation path + layout . + Maybe useful for package managers . + * Makefile.in: + Remove rules that exist on makerule.mk. make install + (for example) runs two times faster :-p + * configure, configure.in, makerule.mk.in, + Wnn/pubdicplus/Makefile.in, cWnn/cdic/Makefile.in, + cWnn/tdic/Makefile.in, kWnn/kdic/Makefile.in: + Recent cpp of gcc (at least 4.4) splits line that has many + characters per line (in C language manner). This is problem + on *.fzk (pubdic etc.) file processing. So adds + -traditional-cpp parameter to cpp + (at least gcc-2.95 passes this parameter). + Simply adding it to CPPFLAGS may break other build, + so split FZK_PP (cpp for text processing) from normal CPP . + Spotted by some posters of FreeWnn thread in 2ch.net . + (Other changes) + * Use AC_SEARCH_LIBS for libnsl checking + (Linux (for example) does not need it) . + * Modified to build correctly if builddir != srcdir (as usual). + * Wnn/: man/2.env/wnn/2b_romkan.man, manual/2.env/wnn/2b_romkana: + * Change '\' to '\e' to correctly format backslash + in man file . + (Also change formatted text file.) + It should reduce Debian lintian warning . + * Added .nf / .fi to pre-formatted table. + * Wnn/uum/setutmp.c: + * Stop checking return value of pututline() + because many systems does not have return value + of this function. + * Change handling of ut_err to work correctly + (especially on systems that have utmp (pututline()) + without utmpx) . + * aclocal.m4, config.guess, config.sub, configure, ltmain.sh: + Update libtool to 1.5.26 + (last release of 1.5 series - bit old). + * (jhlp.c) Check owner / permission of ttyp (tty_slave / ttypfd) + on open_ttyp(). If check (and chown/chmod) fails, + uum warns it may be insecure (ttyp readable) + from other local users. + (Probably you need proper privileges to uum + (ex. setuid-root) . ) ++++ 142 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/fwnn/fwnn.changes ++++ and /work/SRC/openSUSE:Factory/.fwnn.new/fwnn.changes Old: ---- FreeWnn-1.1.1-a021.dif FreeWnn-1.1.1-a021.tar.bz2 FreeWnn-returnvalue.diff FreeWnn-uum.patch New: ---- FreeWnn-1.1.1-a022.dif FreeWnn-1.1.1-a022.tar.bz2 FreeWnn-prototypes_3.patch FreeWnn-prototypes_msg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwnn.spec ++++++ --- /var/tmp/diff_new_pack.nImiAB/_old 2013-08-22 10:53:58.000000000 +0200 +++ /var/tmp/diff_new_pack.nImiAB/_new 2013-08-22 10:53:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fwnn # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products 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,39 +16,44 @@ # +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + Name: fwnn BuildRequires: ncurses-devel -BuildRequires: termcap +BuildRequires: tcpd-devel +#BuildRequires: termcap %define base_version 1.1.1 -%define alpha_version a021 +%define alpha_version a022 Requires: fwnncom Conflicts: wnn6 PreReq: /usr/sbin/useradd %insserv_prereq %fillup_prereq -Version: 1.1.1a021 -Release: 0 -Url: http://www.freewnn.org +Version: 1.1.1a022 +Release: 28.1 +Url: http://freewnn.sourceforge.jp/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: FreeWnn Japanese Input System--Server Only License: GPL-2.0+ Group: System/I18n/Japanese -Source: ftp://ftp.etl.go.jp/pub/FreeWnn/alpha/FreeWnn-%{base_version}-%{alpha_version}.tar.bz2 +Source0: ftp://ftp.iij.ad.jp/pub/sourceforge.jp/freewnn/59257/FreeWnn-%{base_version}-%{alpha_version}.tar.bz2 Source1: rcfwnn Source2: rcfcwnn Source3: rcftwnn Source4: rcfkwnn -Source99: fwnn-rpmlintrc Patch0: FreeWnn-fsstnd.patch Patch1: FreeWnn-ja.patch Patch2: FreeWnn-noroot.patch Patch3: FreeWnn-sighandler.patch -Patch4: FreeWnn-uum.patch -Patch5: FreeWnn-%{base_version}-%{alpha_version}.dif +Patch5: FreeWnn-1.1.1-a022.dif Patch7: FreeWnn-s390x.patch Patch8: FreeWnn-warnings.patch Patch11: FreeWnn-include.patch -Patch12: FreeWnn-returnvalue.diff 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 # @@ -246,18 +251,19 @@ # より、xwnmo を使用できます。変換のエンジンには、国際化されたＷｎｎを使用 # します。クライアントのランゲージに応じて、変換サーバを選択します。 %setup -q -n FreeWnn-%{base_version}-%{alpha_version} -%patch0 -p2 -%patch1 -p2 -%patch2 -p2 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %patch3 -p2 -%patch4 -p2 %patch5 -p1 %patch7 -p2 -b .s390x %patch8 -%patch11 -p2 -%patch12 -%patch13 -%patch14 +%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 #...................................................................... @@ -267,23 +273,28 @@ # %patch3 -p1 %build -./configure --prefix=/usr \ +%configure --prefix=/usr \ --libdir=%{_libdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ - %{_target_cpu}-suse-linux-gnu + %{_target_cpu}-suse-linux-gnu \ + --disable-sub-bindir \ + --enable-client --disable-client-setuid --disable-client-setgid \ + --with-libwrap # not -j safe, see Wnn/pubdicplus/Makefile.in -make CCOPTIONS="$RPM_OPT_FLAGS" -pushd Wnn/uum -make CCOPTIONS="$RPM_OPT_FLAGS" -popd +make +#pushd Wnn/uum +#make CCOPTIONS="$RPM_OPT_FLAGS" +#popd %install -make install DESTDIR=$RPM_BUILD_ROOT INSTPGMFLAGS= +%makeinstall +#make install DESTDIR=$RPM_BUILD_ROOT INSTPGMFLAGS= make install.man DESTDIR=$RPM_BUILD_ROOT -pushd Wnn/uum -make install DESTDIR=$RPM_BUILD_ROOT INSTPGMFLAGS= -popd +#pushd Wnn/uum +#make install DESTDIR=$RPM_BUILD_ROOT INSTPGMFLAGS= +#popd + #---------------------------------------------------------------------- # move Japanese man pages to their correct destination: # (the above 'make install.man' command installs Japanese AND English @@ -291,49 +302,49 @@ # 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 + %__mkdir_p $RPM_BUILD_ROOT/%{_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 $RPM_BUILD_ROOT/%{_mandir}/man1/$i $RPM_BUILD_ROOT/%{_mandir}/ja/man1/ done -mv $RPM_BUILD_ROOT/%{_mandir}/man3/* $RPM_BUILD_ROOT/%{_mandir}/ja/man3/ +%__mv $RPM_BUILD_ROOT/%{_mandir}/man3/* $RPM_BUILD_ROOT/%{_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 $RPM_BUILD_ROOT/%{_mandir}/man4/$i $RPM_BUILD_ROOT/%{_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 $RPM_BUILD_ROOT/%{_mandir}/man5/$i $RPM_BUILD_ROOT/%{_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 $RPM_BUILD_ROOT/etc/init.d +%__mkdir_p $RPM_BUILD_ROOT/var/adm/fillup-templates +%__mkdir_p $RPM_BUILD_ROOT/usr/sbin #---------------------------------------------------------------------- # 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 $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 #---------------------------------------------------------------------- # Make symbolic links for i in fwnn fcwnn ftwnn fkwnn ; do - ( cd $RPM_BUILD_ROOT/usr/sbin; ln -sf ../../etc/init.d/$i rc$i ) + ( cd $RPM_BUILD_ROOT/usr/sbin; %__ln_s -f ../../etc/init.d/$i rc$i ) done -ln -sf /var/lib/wnn/ja/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/ja/dic -ln -sf /var/lib/wnn/zh_CN/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/zh_CN/dic -ln -sf /var/lib/wnn/zh_TW/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/zh_TW/dic -ln -sf /var/lib/wnn/ko_KR/dic ${RPM_BUILD_ROOT}/etc/FreeWnn/ko_KR/dic +%__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 #---------------------------------------------------------------------- -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la +%__rm -f ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la %clean -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %__rm -rf $RPM_BUILD_ROOT; %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 || : @@ -535,6 +546,7 @@ /usr/bin/cwnnkill /usr/bin/cwnnstat /usr/bin/cwnntouch +/usr/bin/cuum %files -n fcwnndev %defattr(-,root,root) @@ -584,6 +596,7 @@ /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 ++++++ FreeWnn-1.1.1-a021.dif -> FreeWnn-1.1.1-a022.dif ++++++ --- /work/SRC/openSUSE:Factory/fwnn/FreeWnn-1.1.1-a021.dif 2011-09-23 01:58:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fwnn.new/FreeWnn-1.1.1-a022.dif 2013-08-22 10:53:56.000000000 +0200 @@ -1,116 +1,5 @@ ---- FreeWnn-1.1.1-a021/Wnn/include/jllib.h -+++ FreeWnn-1.1.1-a021/Wnn/include/jllib.h -@@ -248,59 +248,59 @@ - #define jl_set_lang(buf, lang) js_set_lang((buf)->env, lang) - - /* extern function defines */ --extern struct wnn_buf *jl_open_lang (); --extern struct wnn_env *jl_connect_lang (); --extern struct wnn_env *jl_env_get (); --extern struct wnn_jdata *jl_word_info_e (); --extern w_char *jl_hinsi_name_e (); -+extern struct wnn_buf *jl_open_lang (const char *, const char *, const char *, const char *, int (*) (const char *), int (*) (const char *), int); -+extern struct wnn_env *jl_connect_lang (const char *, const char *, const char *, const char *, int (*) (const char *), int (*) (const char *), int); -+extern struct wnn_env *jl_env_get (struct wnn_buf *); -+extern struct wnn_jdata *jl_word_info_e (struct wnn_env *, int, int); -+extern w_char *jl_hinsi_name_e (struct wnn_env *, int); - --extern void jl_close (); --extern int jl_dic_add_e (); --extern int jl_dic_comment_set_e (); --extern int jl_dic_delete_e (); --extern int jl_dic_list_e (); --extern int jl_dic_save_all_e (); --extern int jl_dic_save_e (); --extern int jl_dic_use_e (); --extern void jl_disconnect (); --extern void jl_disconnect_if_server_dead (); --extern void jl_env_set (); --extern int jl_fuzokugo_get_e (); --extern int jl_fuzokugo_set_e (); --extern void jl_get_zenkouho_kanji (); --extern int jl_hinsi_dicts_e (); --extern int jl_hinsi_list_e (); --extern int jl_hinsi_number_e (); --extern int jl_isconnect_e (); --extern int jl_kanji_len (); --extern int jl_kill (); --extern int jl_nobi_conv (); --extern int jl_nobi_conv_e2 (); --extern int jl_param_get_e (); --extern int jl_param_set_e (); --extern int jl_ren_conv (); --extern int jl_set_env_wnnrc (); --extern int jl_set_env_wnnrc1 (); --extern int jl_set_jikouho (); --extern int jl_set_jikouho_dai (); --extern int jl_tan_conv (); --extern int jl_update_hindo (); --extern int jl_word_add_e (); --extern int jl_word_comment_set_e (); --extern int jl_word_delete_e (); --extern int jl_word_search_by_env_e (); --extern int jl_word_search_e (); --extern int jl_word_use_e (); --extern int jl_yomi_len (); --extern int jl_zenkouho (); --extern int jl_zenkouho_dai (); --extern int wnn_get_area (); -+extern void jl_close (struct wnn_buf *); -+extern int jl_dic_add_e (struct wnn_env *, char *, char *, int, int, int, int, char *, char *, int (*) (const char *), int (*) (const char *)); -+extern int jl_dic_comment_set_e (struct wnn_env *, int, w_char *); -+extern int jl_dic_delete_e (struct wnn_env *, int); -+extern int jl_dic_list_e (struct wnn_env *, WNN_DIC_INFO **); -+extern int jl_dic_save_all_e (struct wnn_env *); -+extern int jl_dic_save_e (struct wnn_env *, int); -+extern int jl_dic_use_e (struct wnn_env *, int, int); -+extern void jl_disconnect (struct wnn_env *); -+extern void jl_disconnect_if_server_dead (struct wnn_env *); -+extern void jl_env_set (struct wnn_buf *, struct wnn_env *); -+extern int jl_fuzokugo_get_e (struct wnn_env *, char *); -+extern int jl_fuzokugo_set_e (struct wnn_env *, char *); -+extern void jl_get_zenkouho_kanji (struct wnn_buf *, int, w_char *); -+extern int jl_hinsi_dicts_e (struct wnn_env *, int, int **); -+extern int jl_hinsi_list_e (struct wnn_env *, int, w_char *, w_char ***); -+extern int jl_hinsi_number_e (struct wnn_env *, w_char *); -+extern int jl_isconnect_e (struct wnn_env *); -+extern int jl_kanji_len (struct wnn_buf *, int, int); -+extern int jl_kill (struct wnn_buf *, int, int); -+extern int jl_nobi_conv (struct wnn_buf *, int, int, int, int, int); -+extern int jl_nobi_conv_e2 (struct wnn_buf *, struct wnn_env *, int, int, int, int, int); -+extern int jl_param_get_e (struct wnn_env *, struct wnn_param *); -+extern int jl_param_set_e (struct wnn_env *, struct wnn_param *); -+extern int jl_ren_conv (struct wnn_buf *, w_char *, int, int, int); -+extern int jl_set_env_wnnrc (struct wnn_env *, const char *, int (*) (const char *), int (*) (const char *)); -+extern int jl_set_env_wnnrc1 (struct wnn_env *, const char *, int (*) (const char *), int (*) (const char *), int); -+extern int jl_set_jikouho (struct wnn_buf *, int); -+extern int jl_set_jikouho_dai (struct wnn_buf *, int); -+extern int jl_tan_conv (struct wnn_buf *, w_char *, int, int, int, int); -+extern int jl_update_hindo (struct wnn_buf *, int, int); -+extern int jl_word_add_e (struct wnn_env *, int, w_char *, w_char *, w_char *, int, int); -+extern int jl_word_comment_set_e (struct wnn_env *, int, int, w_char *); -+extern int jl_word_delete_e (struct wnn_env *, int, int); -+extern int jl_word_search_by_env_e (struct wnn_env *, w_char *, struct wnn_jdata **); -+extern int jl_word_search_e (struct wnn_env *, int, w_char *, struct wnn_jdata **); -+extern int jl_word_use_e (struct wnn_env *, int, int); -+extern int jl_yomi_len (struct wnn_buf *, int, int); -+extern int jl_zenkouho (struct wnn_buf *, int, int, int); -+extern int jl_zenkouho_dai (struct wnn_buf *, int, int, int, int); -+extern int wnn_get_area (struct wnn_buf *, int, int, w_char *, int); - --extern char *wnn_perror (); --extern char *wnn_perror_lang (); -+extern char *wnn_perror (void); -+extern char *wnn_perror_lang (char *); - - #ifdef CONVERT_by_STROKE --extern void jl_get_zenkouho_yomi (); -+extern void jl_get_zenkouho_yomi (struct wnn_buf *, int, w_char *); - #endif - - #endif /* WNN_JLLIB_H */ ---- FreeWnn-1.1.1-a021/Wnn/jlib/jl.c -+++ FreeWnn-1.1.1-a021/Wnn/jlib/jl.c +--- 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 # endif @@ -200,7 +89,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)) ++ 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) @@ -218,7 +107,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)) ++ 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); @@ -227,7 +116,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) ++ if (error_handler == (int (*) (const char *)) WNN_NO_CREATE) { return (-1); } @@ -271,27 +160,28 @@ { confirm_state = NO_CREATE; } -@@ -2775,8 +2777,8 @@ +@@ -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; ++ int (*error_handler) (const char *), (*message_handler) (const char *); int level; { register int num; -@@ -2829,7 +2831,7 @@ + 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 *) = (int (*) (const char *)) 0; ++ int (*error_handler1) (const char *) = NULL; expand_expr_all (s[0], env); if (num < 3 || !REAL_PARAM (s[1])) { -@@ -2855,11 +2857,11 @@ +@@ -2855,11 +2856,11 @@ else if (confirm_state == CREATE_WITHOUT_CONFIRM) { @@ -305,7 +195,7 @@ } 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 +2992,7 @@ +@@ -2990,7 +2991,7 @@ if (*s != '~' && *s != '@') return (0); @@ -314,7 +204,7 @@ return (-1); s1 = s; -@@ -3008,12 +3010,12 @@ +@@ -3008,12 +3009,12 @@ { if (*s1) { @@ -329,7 +219,7 @@ } } -@@ -3021,13 +3023,13 @@ +@@ -3021,13 +3022,13 @@ { /* then, *s must be '@' */ if (!strcmp (s1, "HOME")) { @@ -345,7 +235,7 @@ strcpy (buf, p); strcat (buf, "/"); -@@ -3044,15 +3046,15 @@ +@@ -3044,15 +3045,15 @@ } else if (!strcmp (s1, "LIBDIR")) { @@ -364,7 +254,7 @@ } else { /* @HOME, @LIBDIR @ENV igai ha kaenai */ -@@ -3076,7 +3078,7 @@ +@@ -3076,7 +3077,7 @@ total = 0; flag = 0; @@ -373,7 +263,7 @@ { if (isdigit (*st)) { -@@ -3135,7 +3137,7 @@ +@@ -3135,7 +3136,7 @@ int d; int fid; char *pwd_dic, *pwd_hindo; @@ -382,7 +272,7 @@ { char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN]; int rev_dict_type; -@@ -3243,7 +3245,7 @@ +@@ -3243,7 +3244,7 @@ make_dir_rec1 (env, path, error_handler, message_handler) struct wnn_env *env; register char *path; @@ -391,7 +281,7 @@ { char gomi[128]; register char *c; -@@ -3266,7 +3268,7 @@ +@@ -3266,7 +3267,7 @@ make_dir1 (env, dirname, error_handler, message_handler) register struct wnn_env *env; register char *dirname; @@ -400,7 +290,7 @@ { char gomi[128]; if (dirname[0] == C_LOCAL) -@@ -3287,7 +3289,7 @@ +@@ -3287,7 +3288,7 @@ return (0); /* dir already exists */ } } @@ -409,7 +299,7 @@ { 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 +3326,8 @@ +@@ -3324,8 +3325,8 @@ static int call_error_handler (error_handler, c) @@ -420,7 +310,7 @@ { register int x; x = error_handler (c); -@@ -3340,16 +3342,16 @@ +@@ -3340,16 +3341,16 @@ } static void @@ -442,8 +332,8 @@ (*message_handler) (buf); } } ---- FreeWnn-1.1.1-a021/Wnn/jlib/js.c -+++ FreeWnn-1.1.1-a021/Wnn/jlib/js.c +--- 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); */ ++++++ FreeWnn-1.1.1-a021.tar.bz2 -> FreeWnn-1.1.1-a022.tar.bz2 ++++++ ++++ 34482 lines of diff (skipped) ++++++ FreeWnn-fsstnd.patch ++++++ --- /var/tmp/diff_new_pack.nImiAB/_old 2013-08-22 10:54:00.000000000 +0200 +++ /var/tmp/diff_new_pack.nImiAB/_new 2013-08-22 10:54:00.000000000 +0200 @@ -1,51 +1,48 @@ -diff -Naur FreeWnn-1.1.1-a013.orig/Xsi/makerule.mk.in FreeWnn-1.1.1-a013/Xsi/makerule.mk.in ---- FreeWnn-1.1.1-a013.orig/Xsi/makerule.mk.in Wed Sep 29 01:56:24 1999 -+++ FreeWnn-1.1.1-a013/Xsi/makerule.mk.in Mon Jan 31 13:26:50 2000 -@@ -113,7 +113,7 @@ - prefix = @prefix@ +--- 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@ - PREFIX = @prefix@ -- WNNWNNDIR = ${PREFIX}/lib/wnn + bindir = @bindir@ + sbindir = @sbindir@ +- WNNWNNDIR = $(exec_prefix)/lib/wnn + WNNWNNDIR = /etc/FreeWnn - WNNBINDIR = ${PREFIX}/bin + WNNBINDIR = $(bindir) + WNNSBINDIR = @WNNSBINDIR@ WNNINCDIR = @includedir@ - WNNLIBDIR = @libdir@ -@@ -125,9 +125,9 @@ +@@ -157,12 +157,12 @@ + WNNCONSDICSRC = $(IMTOP)/Wnn-consortium/dic + WNNTOP = $(IMTOP)/Wnn - JWNNLANG = ja_JP + JWNNLANG = ja JWNNWNNDIR = $(WNNWNNDIR)/$(JWNNLANG) -- JWNNBINDIR = $(WNNBINDIR)/Wnn4 -+ JWNNBINDIR = $(WNNBINDIR) + 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 -@@ -155,8 +155,8 @@ - CWNNLANG = zh_CN - CWNNWNNDIR = $(WNNWNNDIR)/$(CWNNLANG) +@@ -193,7 +193,7 @@ CWNNINCDIR = $(WNNINCDIR)/cwnn -- CWNNBINDIR = $(WNNBINDIR)/cWnn4 + CWNNBINDIR = $(WNNBINDIR)$(CWNNSUBBINDIR) + CWNNSBINDIR = $(WNNSBINDIR)$(CWNNSUBBINDIR) - CWNNDICDIR = $(CWNNWNNDIR)/dic -+ CWNNBINDIR = $(WNNBINDIR) + CWNNDICDIR = /var/lib/wnn/$(CWNNLANG)/dic CWNNSYSDICDIR = $(CWNNDICDIR)/sys CWNNCDSRC = $(CWNNTOP)/cd CWNNCDICSRC = $(CWNNTOP)/cdic -@@ -178,8 +178,8 @@ - KWNNLANG = ko_KR - KWNNWNNDIR = $(WNNWNNDIR)/$(KWNNLANG) +@@ -217,7 +217,7 @@ KWNNINCDIR = $(WNNINCDIR)/kwnn -- KWNNBINDIR = $(WNNBINDIR)/kWnn4 + KWNNBINDIR = $(WNNBINDIR)$(KWNNSUBBINDIR) + KWNNSBINDIR = $(WNNSBINDIR)$(KWNNSUBBINDIR) - KWNNDICDIR = $(KWNNWNNDIR)/dic -+ KWNNBINDIR = $(WNNBINDIR) + KWNNDICDIR = /var/lib/wnn/$(KWNNLANG)/dic KWNNSYSDICDIR = $(KWNNDICDIR)/sys KWNNKDSRC = $(KWNNTOP)/kd KWNNKDICSRC = $(KWNNTOP)/kdic -@@ -199,7 +199,7 @@ +@@ -237,7 +237,7 @@ TWNNLANG = zh_TW TWNNWNNDIR = $(WNNWNNDIR)/$(TWNNLANG) ++++++ FreeWnn-include.patch ++++++ --- /var/tmp/diff_new_pack.nImiAB/_old 2013-08-22 10:54:00.000000000 +0200 +++ /var/tmp/diff_new_pack.nImiAB/_new 2013-08-22 10:54:00.000000000 +0200 @@ -1,5 +1,5 @@ ---- BUILD/FreeWnn-1.1.1-a021/PubdicPlus/ctopd.c -+++ BUILD/FreeWnn-1.1.1-a021/PubdicPlus/ctopd.c +--- 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 @@ -8,8 +8,8 @@ static char *program; ---- BUILD/FreeWnn-1.1.1-a021/PubdicPlus/wtopd.c -+++ BUILD/FreeWnn-1.1.1-a021/PubdicPlus/wtopd.c +--- 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 @@ -19,53 +19,3 @@ static char *program; ---- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/basic_op.c -+++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/basic_op.c -@@ -48,6 +48,7 @@ - # include - # endif - #endif /* STDC_HEADERS */ -+#include - #include "jllib.h" - #include "commonhd.h" - #include "sdefine.h" ---- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/hinsi.c -+++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/hinsi.c -@@ -30,6 +30,7 @@ - */ - - #include -+#include - #include "commonhd.h" - #include "sdefine.h" - #include "sheader.h" ---- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/jikouho.c -+++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/jikouho.c -@@ -30,6 +30,7 @@ - */ - - #include -+#include - #include "jllib.h" - #include "commonhd.h" - #include "sdefine.h" ---- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/printf.c -+++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/printf.c -@@ -30,6 +30,7 @@ - */ - - #include -+#include - #include "commonhd.h" - #include "sdefine.h" - #include "sheader.h" ---- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/touroku.c -+++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/touroku.c -@@ -32,6 +32,7 @@ - /* ��Ͽ�Τ���Υ롼���� */ - - #include -+#include - #include "jllib.h" - #include "commonhd.h" - #include "sdefine.h" ++++++ FreeWnn-ja.patch ++++++ --- /var/tmp/diff_new_pack.nImiAB/_old 2013-08-22 10:54:00.000000000 +0200 +++ /var/tmp/diff_new_pack.nImiAB/_new 2013-08-22 10:54:00.000000000 +0200 @@ -1,6 +1,6 @@ ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/etc/msg.c Mon Mar 20 17:31:33 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/etc/msg.c Fri Aug 18 15:20:20 2000 -@@ -457,12 +457,12 @@ +--- 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 @@ { struct msg_cat *cd; @@ -16,9 +16,9 @@ printf (msg_get (cd, 100, "message not found\n", "zh_CN"), "abc"); } #endif /* not_use */ ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/jd_sock.h Wed Feb 23 16:31:29 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/jd_sock.h Fri Aug 18 15:41:45 2000 -@@ -67,7 +67,7 @@ +--- 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 +@@ -57,7 +57,7 @@ #ifdef JAPANESE /* Japanese */ # define WNN_PORT_IN (0x5701) static char *sockname = "/tmp/jd_sockV4"; /* for jserver */ @@ -27,7 +27,7 @@ # define SERVERNAME "wnn4" # define MESSAGE_FILE "jserver.msg" #else /* JAPANESE */ -@@ -98,7 +98,7 @@ +@@ -88,7 +88,7 @@ # define WNN_PORT_IN (0x5701) static char *sockname = "/tmp/jd_sockV4"; /* for jserver */ @@ -36,22 +36,22 @@ # define SERVERNAME "wnn4" # define MESSAGE_FILE "jserver.msg" #endif /* KOREAN */ ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/jslib.h Wed Feb 23 16:31:30 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/jslib.h Fri Aug 18 15:42:49 2000 -@@ -394,8 +394,8 @@ +--- 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 @@ /* 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") - extern WNN_JSERVER_ID *js_open_lang (); - extern int js_close (); ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/msg.h Wed Feb 23 16:31:30 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/msg.h Fri Aug 18 15:43:29 2000 -@@ -50,7 +50,7 @@ + #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 @@ /* #define DEF_LANG "C" */ @@ -60,8 +60,8 @@ extern struct msg_cat *msg_open (); extern char *msg_get (); ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/wnn_config.h Wed Feb 23 16:31:30 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/wnn_config.h Fri Aug 18 15:46:02 2000 +--- 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 @@ -44,7 +44,7 @@ #define WNN_CSERVER_ENV "CSERVER" #define WNN_KSERVER_ENV "KSERVER" @@ -98,8 +98,8 @@ #endif /* HINSIDATA_FILE */ #define USR_DIC_DIR_VAR "@USR" ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jd/serverdefs Sun Jan 30 04:40:48 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jd/serverdefs Fri Aug 18 15:46:43 2000 +--- 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 @@ -30,7 +30,7 @@ ; @@ -109,9 +109,9 @@ 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.orig/Xsi/Wnn/jlib/jl.c Mon Mar 20 17:21:12 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/jl.c Fri Aug 18 15:47:44 2000 -@@ -442,7 +442,7 @@ +--- 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 @@ if (!lang || !*lang) { /* Sorry! Default is Japanese. :-) */ @@ -120,14 +120,3 @@ } else { ---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/header.c Wed Feb 23 16:31:42 2000 -+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/header.c Fri Aug 18 15:48:36 2000 -@@ -131,7 +131,7 @@ - - FuncDataBase function_db[] = { - #ifdef JAPANESE -- {"ja_JP", -+ {"ja", - {NULL, NULL, call_t_redraw_move_normal, - call_t_redraw_move_1_normal, call_t_redraw_move_2_normal, - call_t_print_l_normal, NULL, char_len_normal, char_q_len_normal, ++++++ FreeWnn-noroot.patch ++++++ --- /var/tmp/diff_new_pack.nImiAB/_old 2013-08-22 10:54:00.000000000 +0200 +++ /var/tmp/diff_new_pack.nImiAB/_new 2013-08-22 10:54:00.000000000 +0200 @@ -1,6 +1,6 @@ ---- BUILD/FreeWnn-1.1.1-a021/Contrib/dic/gerodic/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/Contrib/dic/gerodic/Makefile.in -@@ -67,9 +67,7 @@ +--- 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 @@ install:: ${OBJ} @if [ -d $(DESTDIR)$(GERODIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(GERODIR)); fi @@ -11,36 +11,36 @@ clean:: $(RM) ${OBJ} ---- BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/Wnn/jserver/Makefile.in +--- 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 @@ top_builddir = @top_builddir@ INSTALL = @INSTALL@ $(INSTALLFLAGS) -LOCAL_INSTFLAGS = -o $(WNNOWNER) -+LOCAL_INSTFLAGS = ++LOCAL_INSTFLAGS = JSERVERDEFINES = -DJSERVER -DWRITE_CHECK INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) -I$(srcdir) ---- BUILD/FreeWnn-1.1.1-a021/Wnn/jutil/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/Wnn/jutil/Makefile.in +--- 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 @@ INSTALL = @INSTALL@ $(INSTALLFLAGS) LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) LT_LD = $(LIBTOOL) --mode=link $(CCLINK) -LOCAL_INSTFLAGS = -o $(WNNOWNER) -+LOCAL_INSTFLAGS = ++LOCAL_INSTFLAGS = - INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) + INCLUDES = -I$(top_builddir) @EXTWNNJINC@ -I$(WNNINCLUDESRC) DEFINES = $(WNNDEFINES) $(WNNLANGDEF) ---- BUILD/FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in +--- 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 @@ WNNJUTILOBJ = $(top_builddir)/Wnn/jutil INSTALL = @INSTALL@ $(INSTALLFLAGS) -LOCAL_INSTFLAGS = -o $(WNNOWNER) -+LOCAL_INSTFLAGS = ++LOCAL_INSTFLAGS = INCLUDES = -I$(top_builddir) ATOD = $(WNNJUTILOBJ)/atod @@ -54,25 +54,14 @@ done install:: $(DIC) ---- BUILD/FreeWnn-1.1.1-a021/Wnn/uum/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/Wnn/uum/Makefile.in -@@ -35,7 +35,7 @@ - VPATH = @srcdir@ - - INSTALL = @INSTALL@ $(INSTALLFLAGS) --LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) -+LOCAL_INSTFLAGS = - - UUMOWNER = root - INCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANSRC) -I$(top_builddir) ---- BUILD/FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in +--- 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 @@ top_builddir = ../../.. INSTALL = @INSTALL@ $(INSTALLFLAGS) -LOCAL_INSTFLAGS = -o $(WNNOWNER) -+LOCAL_INSTFLAGS = ++LOCAL_INSTFLAGS = ATOD = $(WNNJUTILSRC)/atod WNNTOUCH = $(WNNJUTILSRC)/wnntouch @@ -85,40 +74,40 @@ done depend:: ---- BUILD/FreeWnn-1.1.1-a021/Xwnmo/xjutil/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/Xwnmo/xjutil/Makefile.in +--- 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 @@ top_builddir = ../.. INSTALL = @INSTALL@ $(INSTALLFLAGS) -LOCAL_INSTFLAGS = -o $(WNNOWNER) -+LOCAL_INSTFLAGS = ++LOCAL_INSTFLAGS = INCLUDES = -I. $(XWNMOINCLUDES) -I$(XWNMOSRC) ---- BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/Xwnmo/xwnmo/Makefile.in +--- 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 @@ top_builddir = ../.. INSTALL = @INSTALL@ $(INSTALLFLAGS) -LOCAL_INSTFLAGS = -o $(WNNOWNER) -+LOCAL_INSTFLAGS = ++LOCAL_INSTFLAGS = INCLUDES = $(XWNMOINCLUDES) ---- BUILD/FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/cWnn/cdic/Makefile.in -@@ -31,7 +31,7 @@ +--- 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 @@ CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil INSTALL = @INSTALL@ $(INSTALLFLAGS) -LOCAL_INSTFLAGS = -o $(WNNOWNER) -+LOCAL_INSTFLAGS = ++LOCAL_INSTFLAGS = ATOD = $(CWNNJUTILOBJ)/catod ATOF = $(CWNNJUTILOBJ)/catof -@@ -85,8 +85,7 @@ +@@ -86,8 +86,7 @@ install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(CWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -128,40 +117,40 @@ done install:: $(ALLTGT) ---- BUILD/FreeWnn-1.1.1-a021/cWnn/jserver/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/cWnn/jserver/Makefile.in +--- 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 @@ JSERVERDEFINES = -DJSERVER -DWRITE_CHECK INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir) DEFINES = $(CWNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) $(CWNNLANGDEF) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(WNNOWNER) -+LOCAL_INSTFLAGS = ++LOCAL_INSTFLAGS = SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(CWNNLANG)/cserverrc\" HINSIDEFINE = -DHINSIDATA_FILE=\"/$(CWNNLANG)/cixing.data\" TSERVERINITDEF = -DSERVER_INIT_FILE=\"/$(TWNNLANG)/tserverrc\" ---- BUILD/FreeWnn-1.1.1-a021/cWnn/jutil/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/cWnn/jutil/Makefile.in +--- 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 @@ INSTALL = @INSTALL@ $(INSTALLFLAGS) LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) LT_LD = $(LIBTOOL) --mode=link $(CCLINK) -LOCAL_INSTFLAGS = -o $(WNNOWNER) -+LOCAL_INSTFLAGS = ++LOCAL_INSTFLAGS = - INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir) + INCLUDES = -I$(top_builddir) @EXTCWNNJINC@ -I$(CWNNINCLUDESRC) DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) ---- BUILD/FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/cWnn/tdic/Makefile.in -@@ -31,7 +31,7 @@ +--- 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 @@ CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil INSTALL = @INSTALL@ -INSTALLFLAGS = -o $(WNNOWNER) -+INSTALLFLAGS = ++INSTALLFLAGS = ATOD = $(CWNNJUTILOBJ)/catod ATOF = $(CWNNJUTILOBJ)/catof -@@ -85,8 +85,7 @@ +@@ -86,8 +86,7 @@ install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(TWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -171,19 +160,8 @@ done install:: $(ALLTGT) ---- BUILD/FreeWnn-1.1.1-a021/cWnn/uum/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/cWnn/uum/Makefile.in -@@ -37,7 +37,7 @@ - UUMOWNER = root - INCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANSRC) -I$(top_builddir) - DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) --LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) -+LOCAL_INSTFLAGS = - LOCAL_LIBRARIES = $(CWNNJLIB) $(CWNNCONVLIB) @LIBS@ - - HDRS= buffer.h cvtcode.h sdefine.h sheader.h ---- BUILD/FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/kWnn/jserver/Makefile.in +--- 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 @@ JSERVERDEFINES = -DJSERVER -DWRITE_CHECK INCLUDES = -I$(KWNNJSERVERSRC) -I$(KWNNINCLUDESRC) -I$(top_builddir) @@ -193,29 +171,29 @@ SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(KWNNLANG)/kserverrc\" HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\" WRAPLIB = @WRAPLIB@ ---- BUILD/FreeWnn-1.1.1-a021/kWnn/jutil/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/kWnn/jutil/Makefile.in +--- 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$(KWNNINCLUDESRC) -I$(top_builddir) + INCLUDES = -I$(top_builddir) @EXTKWNNJINC@ -I$(KWNNINCLUDESRC) DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) -LOCAL_INSTFLAGS = -o $(WNNOWNER) -+LOCAL_INSTFLAGS = ++LOCAL_INSTFLAGS = HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\" - CLIENTPROGRAMS = kwnnstat kwnnkill kwddel kwdreg ---- BUILD/FreeWnn-1.1.1-a021/kWnn/kdic/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/kWnn/kdic/Makefile.in -@@ -31,7 +31,7 @@ + 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 @@ KWNNJUTILOBJ = $(top_builddir)/kWnn/jutil INSTALL = @INSTALL@ -INSTALLFLAGS = -o $(WNNOWNER) -+INSTALLFLAGS = ++INSTALLFLAGS = ATOD = $(KWNNJUTILOBJ)/katod ATOF = $(KWNNJUTILOBJ)/katof -@@ -76,8 +76,7 @@ +@@ -77,8 +77,7 @@ install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(KWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -225,14 +203,3 @@ done install:: $(ALLTGT) ---- BUILD/FreeWnn-1.1.1-a021/kWnn/uum/Makefile.in -+++ BUILD/FreeWnn-1.1.1-a021/kWnn/uum/Makefile.in -@@ -37,7 +37,7 @@ - UUMOWNER = root - INCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANSRC) -I$(top_builddir) - DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) --LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(UUMOWNER) -+LOCAL_INSTFLAGS = - LOCAL_LIBRARIES = $(KWNNJLIB) $(KWNNCONVLIB) @LIBS@ - - HDRS= buffer.h cvtcode.h sdefine.h sheader.h ++++++ FreeWnn-prototypes.patch ++++++ ++++ 661 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/fwnn/FreeWnn-prototypes.patch ++++ and /work/SRC/openSUSE:Factory/.fwnn.new/FreeWnn-prototypes.patch ++++++ FreeWnn-prototypes_3.patch ++++++ ++++ 3825 lines (skipped) ++++++ FreeWnn-prototypes_msg.patch ++++++ From: Mitsutoshi NAKANO 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/00014... --- 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 */ ++++++ FreeWnn-sighandler.patch ++++++ --- /var/tmp/diff_new_pack.nImiAB/_old 2013-08-22 10:54:00.000000000 +0200 +++ /var/tmp/diff_new_pack.nImiAB/_new 2013-08-22 10:54:00.000000000 +0200 @@ -13,7 +13,7 @@ + if (sig == SIGTERM) + _exit(0); + else -+ _exit(-1); ++ _exit(255); +} +#endif + ++++++ FreeWnn-trad_cpp.patch ++++++ --- /var/tmp/diff_new_pack.nImiAB/_old 2013-08-22 10:54:00.000000000 +0200 +++ /var/tmp/diff_new_pack.nImiAB/_new 2013-08-22 10:54:00.000000000 +0200 @@ -1,51 +1,52 @@ ---- Wnn/pubdicplus/Makefile.in -+++ Wnn/pubdicplus/Makefile.in +--- 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) -- $(CPP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ +- $(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 ---- cWnn/cdic/Makefile.in -+++ cWnn/cdic/Makefile.in -@@ -63,10 +63,10 @@ +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 -- $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ +- $(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 -- $(CPP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ +- $(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 ---- cWnn/tdic/Makefile.in -+++ cWnn/tdic/Makefile.in -@@ -63,10 +63,10 @@ +--- 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 -- $(CPP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ +- $(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 -- $(CPP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ +- $(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 ---- kWnn/kdic/Makefile.in -+++ kWnn/kdic/Makefile.in -@@ -61,7 +61,7 @@ +--- 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 -- $(CPP) -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ +- $(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' -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org