debian/0000755000000000000000000000000012222402672007165 5ustar debian/libwnn6-1.shlibs0000644000000000000000000000002410312751273012106 0ustar libwnn6 1 libwnn6-1 debian/libwnn6-1.symbols0000644000000000000000000002527112171510003012312 0ustar libwnn6.so.1 libwnn6-1 #MINVER# BUGreport@Base 1.0.0 ERMOPN@Base 1.0.0 ERRMOD@Base 1.0.0 allchgmod@Base 1.0.0 base@Base 1.0.0 bwnn_dic_types@Base 1.0.0 bytcnt_method@Base 1.0.0 chgmod@Base 1.0.0 choosehyo@Base 1.0.0 chrcat@Base 1.0.0 codein_len@Base 1.0.0 codeout@Base 1.0.0 condarg@Base 1.0.0 confirm_state@Base 1.0.0 curdir@Base 1.0.0 curdis@Base 1.0.0 curfnm@Base 1.0.0 cwnn_dic_types@Base 1.0.0 cwnn_is_yincod@Base 1.0.0 cwnn_py_str_analysis@Base 1.0.0 cwnn_py_yincod_str@Base 1.0.0 cwnn_pzy_yincod@Base 1.0.0 cwnn_yincod_pzy@Base 1.0.0 cwnn_yincod_pzy_str@Base 1.0.0 cwnn_zy_str_analysis@Base 1.0.0 cwnn_zy_yincod_str@Base 1.0.0 dakuadd@Base 1.0.0 dat_data@Base 1.0.0 datptr@Base 1.0.0 decmod@Base 1.0.0 delchr2@Base 1.0.0 delchr@Base 1.0.0 disout@Base 1.0.0 dspcod@Base 1.0.0 dspcod_@Base 1.0.0 dspmod@Base 1.0.0 dspnambgn@Base 1.0.0 dspnamptr@Base 1.0.0 dummy@Base 1.0.0 ebf_sw@Base 1.0.0 ename@Base 1.0.0 env0@Base 1.0.0 envs@Base 1.0.0 eofflg@Base 1.0.0 evalbuf@Base 1.0.0 filnamchk@Base 1.0.0 fixednamep@Base 1.0.0 flags@Base 1.0.0 free0@Base 1.0.0 func@Base 1.0.0 get1ltr@Base 1.0.0 getfrom_dblq@Base 1.0.0 getfrom_lptr@Base 1.0.0 handakuadd@Base 1.0.0 hank_setup@Base 1.0.0 hcurread@Base 1.0.0 hen_iki@Base 1.0.0 hen_useflgclr@Base 1.0.0 henmatch@Base 1.0.0 henorg@Base 1.0.0 henptr@Base 1.0.0 hensudefhyo@Base 1.0.0 hensumei@Base 1.0.0 hentourkptr@Base 1.0.0 hyo_n@Base 1.0.0 hyomeimem@Base 1.0.0 hyomeiorg@Base 1.0.0 hyomeiptr@Base 1.0.0 hyonum@Base 1.0.0 hyoshu@Base 1.0.0 incmod@Base 1.0.0 int_get1ltr@Base 1.0.0 int_unget1ltr@Base 1.0.0 isdir@Base 1.0.0 jl_bun_suu@Base 1.0.0 jl_c_zenkouho@Base 1.0.0 jl_close@Base 1.0.0 jl_connect_lang@Base 1.0.0 jl_dai_top@Base 1.0.0 jl_dic_add@Base 1.0.0 jl_dic_add_e@Base 1.0.0 jl_dic_comment_set@Base 1.0.0 jl_dic_comment_set_e@Base 1.0.0 jl_dic_delete@Base 1.0.0 jl_dic_delete_e@Base 1.0.0 jl_dic_list@Base 1.0.0 jl_dic_list_e@Base 1.0.0 jl_dic_save@Base 1.0.0 jl_dic_save_all@Base 1.0.0 jl_dic_save_all_e@Base 1.0.0 jl_dic_save_e@Base 1.0.0 jl_dic_use@Base 1.0.0 jl_dic_use_e@Base 1.0.0 jl_disconnect@Base 1.0.0 jl_disconnect_if_server_dead@Base 1.0.0 jl_env@Base 1.0.0 jl_env_get@Base 1.0.0 jl_env_set@Base 1.0.0 jl_env_sticky@Base 1.0.0 jl_env_sticky_e@Base 1.0.0 jl_env_un_sticky@Base 1.0.0 jl_env_un_sticky_e@Base 1.0.0 jl_fi_dic_add@Base 1.0.0 jl_fi_dic_add_e@Base 1.0.0 jl_fi_dic_list@Base 1.0.0 jl_fi_dic_list_e@Base 1.0.0 jl_fi_nobi_conv@Base 1.0.0 jl_fi_ren_conv@Base 1.0.0 jl_free0@Base 1.0.0 jl_fuzokugo_get@Base 1.0.0 jl_fuzokugo_get_e@Base 1.0.0 jl_fuzokugo_list@Base 1.0.0 jl_fuzokugo_list_e@Base 1.0.0 jl_fuzokugo_set@Base 1.0.0 jl_fuzokugo_set_e@Base 1.0.0 jl_get_henkan_env@Base 1.0.0 jl_get_henkan_env_e@Base 1.0.0 jl_get_henkan_env_local@Base 1.0.0 jl_get_henkan_env_local_e@Base 1.0.0 jl_get_henkan_hinsi@Base 1.0.0 jl_get_henkan_hinsi_e@Base 1.0.0 jl_get_lang@Base 1.0.0 jl_get_wnn_errorno_buf@Base 1.0.0 jl_get_wnn_errorno_env@Base 1.0.0 jl_get_zenkouho_kanji@Base 1.0.0 jl_get_zenkouho_yomi@Base 1.0.0 jl_hinsi_dicts@Base 1.0.0 jl_hinsi_dicts_e@Base 1.0.0 jl_hinsi_list@Base 1.0.0 jl_hinsi_list_e@Base 1.0.0 jl_hinsi_name@Base 1.0.0 jl_hinsi_name_e@Base 1.0.0 jl_hinsi_number@Base 1.0.0 jl_hinsi_number_e@Base 1.0.0 jl_inspect@Base 1.0.0 jl_isconnect@Base 1.0.0 jl_isconnect_e@Base 1.0.0 jl_jiri_len@Base 1.0.0 jl_kanji_len@Base 1.0.0 jl_kill@Base 1.0.0 jl_nobi_conv@Base 1.0.0 jl_nobi_conv_e2@Base 1.0.0 jl_nobi_conv_hinsi_flag@Base 1.0.0 jl_nobi_conv_with_hinsi_name@Base 1.0.0 jl_open_lang@Base 1.0.0 jl_optimize_fi@Base 1.0.0 jl_param_get@Base 1.0.0 jl_param_get_e@Base 1.0.0 jl_param_set@Base 1.0.0 jl_param_set_e@Base 1.0.0 jl_ren_conv@Base 1.0.0 jl_ren_conv_with_hinsi_name@Base 1.0.0 jl_reset_prev_bun@Base 1.0.0 jl_set_env_wnnrc1@Base 1.0.0 jl_set_env_wnnrc@Base 1.0.0 jl_set_henkan_env@Base 1.0.0 jl_set_henkan_env_e@Base 1.0.0 jl_set_henkan_hinsi@Base 1.0.0 jl_set_henkan_hinsi_e@Base 1.0.0 jl_set_ikeiji_dai@Base 1.0.0 jl_set_jikouho@Base 1.0.0 jl_set_jikouho_dai@Base 1.0.0 jl_tan_conv@Base 1.0.0 jl_tan_conv_hinsi_flag@Base 1.0.0 jl_tan_conv_with_hinsi_name@Base 1.0.0 jl_update_hindo@Base 1.0.0 jl_word_add@Base 1.0.0 jl_word_add_e@Base 1.0.0 jl_word_comment_set@Base 1.0.0 jl_word_comment_set_e@Base 1.0.0 jl_word_delete@Base 1.0.0 jl_word_delete_e@Base 1.0.0 jl_word_info@Base 1.0.0 jl_word_info_e@Base 1.0.0 jl_word_search@Base 1.0.0 jl_word_search_by_env@Base 1.0.0 jl_word_search_by_env_e@Base 1.0.0 jl_word_search_e@Base 1.0.0 jl_word_use@Base 1.0.0 jl_word_use_e@Base 1.0.0 jl_yomi_len@Base 1.0.0 jl_zenikeiji_dai@Base 1.0.0 jl_zenikeiji_dai_with_hinsi_name@Base 1.0.0 jl_zenkouho@Base 1.0.0 jl_zenkouho_bun@Base 1.0.0 jl_zenkouho_dai@Base 1.0.0 jl_zenkouho_dai_hinsi_flag@Base 1.0.0 jl_zenkouho_dai_with_hinsi_name@Base 1.0.0 jl_zenkouho_daip@Base 1.0.0 jl_zenkouho_hinsi_flag@Base 1.0.0 jl_zenkouho_suu@Base 1.0.0 jl_zenkouho_with_hinsi_name@Base 1.0.0 js_access@Base 1.0.0 js_access_add_host@Base 1.0.0 js_access_add_user@Base 1.0.0 js_access_disable@Base 1.0.0 js_access_enable@Base 1.0.0 js_access_get_info@Base 1.0.0 js_access_remove_host@Base 1.0.0 js_access_remove_user@Base 1.0.0 js_autolearning_word_add@Base 1.0.0 js_close@Base 1.0.0 js_connect_lang@Base 1.0.0 js_dic_add@Base 1.0.0 js_dic_delete@Base 1.0.0 js_dic_file_create@Base 1.0.0 js_dic_file_create_client@Base 1.0.0 js_dic_info@Base 1.0.0 js_dic_list@Base 1.0.0 js_dic_list_all@Base 1.0.0 js_dic_use@Base 1.0.0 js_disconnect@Base 1.0.0 js_env_exist@Base 1.0.0 js_env_list@Base 1.0.0 js_env_sticky@Base 1.0.0 js_env_un_sticky@Base 1.0.0 js_fi_dic_add@Base 1.0.0 js_fi_dic_list@Base 1.0.0 js_fi_dic_list_all@Base 1.0.0 js_fi_hindo_file_create@Base 1.0.0 js_fi_hindo_file_create_client@Base 1.0.0 js_fi_kanren@Base 1.0.0 js_file_comment_set@Base 1.0.0 js_file_discard@Base 1.0.0 js_file_info@Base 1.0.0 js_file_list@Base 1.0.0 js_file_list_all@Base 1.0.0 js_file_loaded@Base 1.0.0 js_file_loaded_local@Base 1.0.0 js_file_password_set@Base 1.0.0 js_file_read@Base 1.0.0 js_file_receive@Base 1.0.0 js_file_remove@Base 1.0.0 js_file_remove_client@Base 1.0.0 js_file_send@Base 1.0.0 js_file_stat@Base 1.0.0 js_file_write@Base 1.0.0 js_flush@Base 1.0.0 js_fuzokugo_get@Base 1.0.0 js_fuzokugo_list@Base 1.0.0 js_fuzokugo_set@Base 1.0.0 js_get_autolearning_dic@Base 1.0.0 js_get_extension@Base 1.0.0 js_get_henkan_env@Base 1.0.0 js_get_henkan_env_local@Base 1.0.0 js_get_henkan_hinsi@Base 1.0.0 js_get_lang@Base 1.0.0 js_henkan_with_data@Base 1.0.0 js_hindo_file_create@Base 1.0.0 js_hindo_file_create_client@Base 1.0.0 js_hindo_set@Base 1.0.0 js_hinsi_dicts@Base 1.0.0 js_hinsi_list@Base 1.0.0 js_hinsi_name@Base 1.0.0 js_hinsi_number@Base 1.0.0 js_hinsi_table_set@Base 1.0.0 js_ikeiji_with_data@Base 1.0.0 js_is_loaded_temporary_dic@Base 1.0.0 js_isconnect@Base 1.0.0 js_kanren@Base 1.0.0 js_kantan_dai@Base 1.0.0 js_kantan_sho@Base 1.0.0 js_kanzen_dai@Base 1.0.0 js_kanzen_sho@Base 1.0.0 js_kill@Base 1.0.0 js_mkdir@Base 1.0.0 js_open_extension@Base 1.0.0 js_open_lang@Base 1.0.0 js_optimize_fi@Base 1.0.0 js_param_get@Base 1.0.0 js_param_set@Base 1.0.0 js_set_autolearning_dic@Base 1.0.0 js_set_fi_priority@Base 1.0.0 js_set_henkan_env@Base 1.0.0 js_set_henkan_hinsi@Base 1.0.0 js_temporary_dic_add@Base 1.0.0 js_temporary_dic_delete@Base 1.0.0 js_temporary_word_add@Base 1.0.0 js_version@Base 1.0.0 js_who@Base 1.0.0 js_word_add@Base 1.0.0 js_word_comment_set@Base 1.0.0 js_word_delete@Base 1.0.0 js_word_info@Base 1.0.0 js_word_search@Base 1.0.0 js_word_search_by_env@Base 1.0.0 kbytcnt_method@Base 1.0.0 keybuf@Base 1.0.0 keyin_method@Base 1.0.0 kwnn_dic_types@Base 1.0.0 last_mark@Base 1.0.0 lastkbflen@Base 1.0.0 lastoutlen@Base 1.0.0 letterpick@Base 1.0.0 lptr@Base 1.0.0 ltov@Base 1.0.0 ltr1cut@Base 1.0.0 ltrbufbgn@Base 1.0.0 ltrbufptr@Base 1.0.0 ltrcmp@Base 1.0.0 ltrend@Base 1.0.0 ltrgrow@Base 1.0.0 ltrstrcmp@Base 1.0.0 ltrtostr@Base 1.0.0 malloc0@Base 1.0.0 match@Base 1.0.0 mcurread@Base 1.0.0 memory@Base 1.0.0 memptr@Base 1.0.0 modcond@Base 1.0.0 modefile@Base 1.0.0 modesw@Base 1.0.0 modfn@Base 1.0.0 modhyopath@Base 1.0.0 modmeibgn@Base 1.0.0 modmeimem@Base 1.0.0 modmeimem_@Base 1.0.0 modmeiptr@Base 1.0.0 msg_close@Base 1.0.0 msg_get@Base 1.0.0 msg_open@Base 1.0.0 naibu@Base 1.0.0 naibu_@Base 1.0.0 nestfile@Base 1.0.0 nil@Base 1.0.0 nisedl@Base 1.0.0 nulstr@Base 1.0.0 oneletter@Base 1.0.0 onescan@Base 1.0.0 pathareaorg@Base 1.0.0 pathmeimem@Base 1.0.0 pathmeiorg@Base 1.0.0 pathmeiptr@Base 1.0.0 pinyin_tbl@Base 1.0.0 prv_modfnm@Base 1.0.0 py_shengmu_tbl@Base 1.0.0 py_yunmu_tbl@Base 1.0.0 rangekettei@Base 1.0.0 readdata@Base 1.0.0 readfnm@Base 1.0.0 readln@Base 1.0.0 readmode@Base 1.0.0 realloc0@Base 1.0.0 remainkbf@Base 1.0.0 rk_errstat@Base 1.0.0 rk_input@Base 1.0.0 rk_output@Base 1.0.0 romkan_clear@Base 1.0.0 romkan_clear_body@Base 1.0.0 romkan_dispmode@Base 1.0.0 romkan_dispmode_body@Base 1.0.0 romkan_getc@Base 1.0.0 romkan_getc_body@Base 1.0.0 romkan_getmode@Base 1.0.0 romkan_getmode_body@Base 1.0.0 romkan_henkan@Base 1.0.0 romkan_henkan_body@Base 1.0.0 romkan_init2@Base 1.0.0 romkan_init3@Base 1.0.0 romkan_init@Base 1.0.0 romkan_next@Base 1.0.0 romkan_next_body@Base 1.0.0 romkan_offmode@Base 1.0.0 romkan_offmode_body@Base 1.0.0 romkan_reset@Base 1.0.0 romkan_reset_body@Base 1.0.0 romkan_set_lang@Base 1.0.0 romkan_set_lang_body@Base 1.0.0 romkan_setmode@Base 1.0.0 romkan_setmode_body@Base 1.0.0 romkan_ungetc@Base 1.0.0 romkan_ungetc_body@Base 1.0.0 romkan_unnext@Base 1.0.0 romkan_unnext_body@Base 1.0.0 saishu_out@Base 1.0.0 strend@Base 1.0.0 swstat@Base 1.0.0 term@Base 1.0.0 to_digit@Base 1.0.0 to_hankata@Base 1.0.0 to_zenalpha@Base 1.0.0 to_zenhira@Base 1.0.0 to_zenkata@Base 1.0.0 trytoopen@Base 1.0.0 unget1ltr@Base 1.0.0 ungetc_buf@Base 1.0.0 unnext_buf@Base 1.0.0 urabuf@Base 1.0.0 useatohyo@Base 1.0.0 usehyo@Base 1.0.0 usemaehyo@Base 1.0.0 ustrtoltr@Base 1.0.0 vtol@Base 1.0.0 wnn_Sreverse@Base 1.0.0 wnn_Strcat@Base 1.0.0 wnn_Strcmp@Base 1.0.0 wnn_Strcpy@Base 1.0.0 wnn_Strlen@Base 1.0.0 wnn_Strncat@Base 1.0.0 wnn_Strncmp@Base 1.0.0 wnn_Strncpy@Base 1.0.0 wnn_Substr@Base 1.0.0 wnn_cnt_free0@Base 1.0.0 wnn_dic_types@Base 1.0.0 wnn_errorno@Base 1.0.0 wnn_get_area@Base 1.0.0 wnn_get_machine_of_serverdefs@Base 1.0.0 wnn_get_port_num_of_serverdefs@Base 1.0.0 wnn_get_serverenv_of_serverdefs@Base 1.0.0 wnn_get_service_of_serverdefs@Base 1.0.0 wnn_get_unixdomain_of_serverdefs@Base 1.0.0 wnn_msg_cat@Base 1.0.0 wnn_perror@Base 1.0.0 wnn_perror_lang@Base 1.0.0 wnn_set_area@Base 1.0.0 wnn_word_use_initial_hindo@Base 1.0.0 zhuyin_tbl@Base 1.0.0 zy_shengmu_tbl@Base 1.0.0 zy_yunmu_tbl@Base 1.0.0 debian/libwnn6-dev.install0000644000000000000000000000012510131524555012710 0ustar debian/tmp/usr/include/wnn debian/tmp/usr/lib/libwnn.a debian/tmp/usr/lib/libwnn6.so debian/rules0000755000000000000000000000106112171525336010251 0ustar #!/usr/bin/make -f # -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 %: dh $@ override_dh_auto_build: cd contrib/im/Xsi && $(MAKE) World -f Makefile.ini \ CCOPTIONS="$(shell dpkg-buildflags --get CFLAGS)" \ PROJECT_DEFINES="$(shell dpkg-buildflags --get CPPFLAGS)" \ SHLIBGLOBALSFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" override_dh_auto_install: cd contrib/im/Xsi && $(MAKE) install DESTDIR=`pwd`/../../../debian/tmp override_dh_auto_clean: cd contrib/im/Xsi && [ -f Makefile ] && $(MAKE) distclean || true debian/copyright0000644000000000000000000001476110131476635011140 0ustar This package was debianized by Keita Maehara on Thu, 30 Dec 1999 21:13:55 +0900. It was downloaded from ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk_source/Wnn6-SDK.tar.gz Upstream Authors: (C) Copyright OMRON Corporation. 1995, 1998 all rights reserved. (C) Copyright OMRON Software Co., Ltd. 1995, 1998 all rights reserved. Copyright: WNN6 CLIENT LIBRARY--SOFTWARE LICENSE TERMS AND CONDITIONS Wnn6 Client Library : (C) Copyright OMRON Corporation. 1995, 1998 all rights reserved. (C) Copyright OMRON Software Co., Ltd. 1995, 1998 all rights reserved. Wnn Software : (C) Copyright Kyoto University Research Institute for Mathematical Sciences 1987, 1988, 1989, 1990, 1991, 1992, 1993 (C) Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1993 (C) Copyright ASCTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992, 1993 Preamble These Wnn6 Client Library--Software License Terms and Conditions (the "License Agreement") shall state the conditions under which you are permitted to copy, distribute or modify the software which can be used to create Wnn6 Client Library (the "Wnn6 Client Library"). The License Agreement can be freely copied and distributed verbatim, however, you shall NOT add, delete or change anything on the License Agreement. OMRON Corporation and OMRON Software Co., Ltd. (collectively referred to as "OMRON") jointly developed the Wnn6 Software (development code name is FI-Wnn), based on the Wnn Software. Starting from November, 1st, 1998, OMRON publishes the source code of the Wnn6 Client Library, and OMRON permits anyone to copy, distribute or change the Wnn6 Client Library under the License Agreement. Wnn6 Client Library is based on the original version of Wnn developed by Kyoto University Research Institute for Mathematical Sciences (KURIMS), OMRON Corporation and ASTEC Inc. Article 1. Definition. "Source Code" means the embodiment of the computer code, readable and understandable by a programmer of ordinary skills. It includes related source code level system documentation, comments and procedural code. "Object File" means a file, in substantially binary form, which is directly executable by a computer after linking applicable files. "Library" means a file, composed of several Object Files, which is directly executable by a computer after linking applicable files. "Software" means a set of Source Code including information on its use. "Wnn6 Client Library" the computer program, originally supplied by OMRON, which can be used to create Wnn6 Client Library. "Executable Module" means a file, created after linking Object Files or Library, which is directly executable by a computer. "User" means anyone who uses the Wnn6 Client Library under the License Agreement. Article 2. Copyright 2.1 OMRON Corporation and OMRON Software Co., Ltd. jointly own the Wnn6 Client Library, including, without limitation, its copyright. 2.2 Following words followed by the above copyright notices appear in all supporting documentation of software based on Wnn6 Client Library: This software is based on the original version of Wnn6 Client Library developed by OMRON Corporation and OMRON Software Co., Ltd. and also based on the original version of Wnn developed by Kyoto University Research Institute for Mathematical Sciences (KURIMS), OMRON Corporation and ASTEC Inc. Article 3. Grant 3.1 A User is permitted to make and distribute verbatim copies of the Wnn6 Client Library, including verbatim of copies of the License Agreement, under the License Agreement. 3.2 A User is permitted to modify the Wnn6 Client Library to create Software ("Modified Software") under the License Agreement. A User is also permitted to make or distribute copies of Modified Software, including verbatim copies of the License Agreement with the following information. Upon modifying the Wnn6 Client Library, a User MUST insert comments--stating the name of the User, the reason for the modifications, the date of the modifications, additional terms and conditions on the part of the modifications if there is any, and potential risks of using the Modified Software if they are known--right after the end of the License Agreement (or the last comment, if comments are inserted already). 3.3 A User is permitted to create Library or Executable Modules by modifying the Wnn6 Client Library in whole or in part under the License Agreement. A User is also permitted to make or distribute copies of Library or Executable Modules with verbatim copies of the License Agreement under the License Agreement. Upon modifying the Wnn6 Client Library for creating Library or Executable Modules, except for porting a computer, a User MUST add a text file to a package of the Wnn6 Client Library, providing information on the name of the User, the reason for the modifications, the date of the modifications, additional terms and conditions on the part of the modifications if there is any, and potential risks associated with using the modified Wnn6 Client Library, Library or Executable Modules if they are known. 3.4 A User is permitted to incorporate the Wnn6 Client Library in whole or in part into another Software, although its license terms and conditions may be different from the License Agreement, if such incorporation or use associated with the incorporation does NOT violate the License Agreement. Article 4. Warranty THE WNN6 CLIENT LIBRARY IS PROVIDED BY OMRON ON AN "AS IS" BAISIS. OMRON EXPRESSLY DISLCIAMS ANY AND ALL WRRANTIES, EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, IN CONNECTION WITH THE WNN6 CLIENT LIBRARY OR THE USE OR OTHER DEALING IN THE WNN6 CLIENT LIBRARY. IN NO EVENT SHALL OMRON BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES OF ANY KIND WHATSOEVER IN CONNECTION WITH THE WNN6 CLIENT LIBRARY OR THE USE OR OTHER DEALING IN THE WNN6 CLIENT LIBRARY. *************************************************************************** Wnn6 Client Library : (C) Copyright OMRON Corporation. 1995, 1998 all rights reserved. (C) Copyright OMRON Software Co., Ltd. 1995, 1998 all rights reserved. Wnn Software : (C) Copyright Kyoto University Research Institute for Mathematical Sciences 1987, 1988, 1989, 1990, 1991, 1992, 1993 (C) Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1993 (C) Copyright ASCTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992, 1993 *************************************************************************** debian/docs0000644000000000000000000000002612171505705010042 0ustar contrib/im/Xsi/README debian/source/0000755000000000000000000000000012171502207010463 5ustar debian/source/format0000644000000000000000000000001412171502207011671 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000012222402267010614 5ustar debian/patches/imake-path.patch0000644000000000000000000000325012171507003013652 0ustar Description: Fix FTBFS by passing to imake /usr/lib/X11/config as include dir instead of /usr/X11R6/lib/X11/config. (Closes: #367838) Author: Adeodato Sim坦 Last-Update: 2006-06-03 Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Makefile.ini =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Makefile.ini 2013-07-17 21:18:00.311822079 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Makefile.ini 2013-07-17 21:18:00.307822059 +0900 @@ -13,9 +13,9 @@ MAKE = make TOP = `pwd`/../../../contrib CURRENT_DIR = ./../contrib/im/Xsi -# CONFIGSRC = /usr/lib/X11/config + CONFIGSRC = /usr/lib/X11/config # CONFIGSRC = /usr/openwin/lib/X11/config - CONFIGSRC = /usr/X11R6/lib/X11/config +# CONFIGSRC = /usr/X11R6/lib/X11/config IMAKESRC = $(CONFIGSRC) IRULESRC = $(CONFIGSRC) WSFLAGS = Index: wnn6-sdk-1.0.0/contrib/im/Xsi/config/X11.tmpl =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/config/X11.tmpl 2013-07-17 21:18:00.311822079 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/config/X11.tmpl 2013-07-17 21:18:00.307822059 +0900 @@ -7,7 +7,7 @@ #include "/usr/openwin/lib/config/Project.tmpl" #else /* Sun & SVR4 */ #if defined(LinuxArchitecture) || defined(KFreeBSDArchitecture) || defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || defined(BSD386Architecture) -#include "/usr/X11R6/lib/X11/config/X11.tmpl" +#include "/usr/lib/X11/config/X11.tmpl" #else /* Linux || *BSD */ #include "/usr/lib/X11/config/Project.tmpl" #endif /* Linux || *BSD */ debian/patches/strchr.patch0000644000000000000000000000111012171526767013152 0ustar Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/jl.c =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/jlib/jl.c 2013-07-17 21:18:00.379822420 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/jl.c 2013-07-17 21:18:00.375822398 +0900 @@ -6356,11 +6356,6 @@ struct passwd *u; extern char *getenv(); extern struct passwd *getpwnam(); -#ifdef SYSVR2 -#ifndef AIXV3 - extern char * strchr(); -#endif /* AIXV3 */ -#endif if(*s != '~' && *s != '@') return(0); if((int)strlen(s) >= EXPAND_PATH_LENGTH) return(-1); debian/patches/subdirs.patch0000644000000000000000000000513712171526762013330 0ustar Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/Imakefile =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/Imakefile 2013-07-17 21:18:00.403822540 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/Imakefile 2013-07-17 21:18:00.395822499 +0900 @@ -7,7 +7,7 @@ WNNOWNER= wnn #if BuildJlib -JLIBDIR = romkan jlib +JLIBDIR = romkan etc jlib include SUBDIRS = $(JLIBDIR) #endif Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/etc/Imakefile =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/etc/Imakefile 2013-07-17 21:18:00.399822519 +0900 @@ -0,0 +1,40 @@ +#ifdef NEED_DEFINE_LIB +#define DoNormalLib YES +#define DoSharedLib YES +#define DoDebugLib NO +#define DoProfileLib NO +#endif + +#include + +#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' + + INCLUDES = -I$(WNNINCLUDESRC) + DEFINES = $(WNNDEFINES) -DWNNDEFAULT $(ALLLANGDEF) + LINTLIBS = + +SRCS= bdic.c \ + fi_bdic.c \ + gethinsi.c \ + msg.c \ + pwd.c \ + py_table.c \ + serverdefs.c \ + strings.c \ + yincoding.c \ + zy_table.c +OBJS= bdic.o \ + fi_bdic.o \ + gethinsi.o \ + msg.o \ + pwd.o \ + py_table.o \ + serverdefs.o \ + strings.o \ + yincoding.o \ + zy_table.o + +LibraryObjectRule() +AllTarget($(OBJS)) + +DependTarget() Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/Imakefile =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/jlib/Imakefile 2013-07-17 21:18:00.403822540 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/Imakefile 2013-07-17 21:18:00.399822519 +0900 @@ -30,17 +30,17 @@ wnnerrmsg.o \ jl.o SRC3= $(WNNETCSRC)/msg.c -OBJ3= msg.o +OBJ3= $(WNNETCSRC)/msg.o SRC4= $(WNNETCSRC)/yincoding.c -OBJ4= yincoding.o +OBJ4= $(WNNETCSRC)/yincoding.o SRC5= $(WNNETCSRC)/py_table.c -OBJ5= py_table.o +OBJ5= $(WNNETCSRC)/py_table.o SRC6= $(WNNETCSRC)/zy_table.c -OBJ6= zy_table.o +OBJ6= $(WNNETCSRC)/zy_table.o SRC7= $(WNNETCSRC)/strings.c -OBJ7= strings.o +OBJ7= $(WNNETCSRC)/strings.o SRC8= $(WNNETCSRC)/serverdefs.c -OBJ8= serverdefs.o +OBJ8= $(WNNETCSRC)/serverdefs.o LOCAL_RKSRCS= $(WNNROMKANSRC)/rk_bltinfn.c \ $(WNNROMKANSRC)/rk_main.c \ $(WNNROMKANSRC)/rk_modread.c \ @@ -101,4 +101,9 @@ cd $(WNNROMKANSRC); echo "making all in $(WNNROMKANSRC)"; \ $(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS) +$(LOCAL_ETCOBJS) : $(LOCAL_ETCSRCS) + @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ + cd $(WNNETCSRC); echo "making all in $(WNNETCSRC)"; \ + $(MAKE) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(MFLAGS) + DependTarget() debian/patches/hurd.patch0000644000000000000000000000211512171731165012603 0ustar Description: fix FTBFS on hurd-i386 Author: HIGUCHI Daisuke (VDR dai) Last-Update: 2013-07-17 Index: wnn6-sdk-1.0.0/contrib/im/Xsi/config/X11.tmpl =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/config/X11.tmpl 2013-07-18 18:16:06.644725055 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/config/X11.tmpl 2013-07-18 18:16:30.700943690 +0900 @@ -6,7 +6,7 @@ #if defined(SunArchitecture) && defined(SVR4) #include "/usr/openwin/lib/config/Project.tmpl" #else /* Sun & SVR4 */ -#if defined(LinuxArchitecture) || defined(KFreeBSDArchitecture) || defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || defined(BSD386Architecture) +#if defined(LinuxArchitecture) || defined(KFreeBSDArchitecture) || defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || defined(BSD386Architecture) || defined(GNUMachArchitecture) || defined(GNUArchitecture) #include "/usr/lib/X11/config/X11.tmpl" #else /* Linux || *BSD */ #include "/usr/lib/X11/config/Project.tmpl" debian/patches/malloc.patch0000644000000000000000000006761412171526746013136 0ustar Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/etc/bdic.c =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/etc/bdic.c 2013-07-17 21:18:00.335822201 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/etc/bdic.c 2013-07-17 21:18:00.327822158 +0900 @@ -1849,7 +1849,7 @@ hjt.hindo_area = (int)((serial + MAX_HINDO_DATA_AREA - 1) / MAX_HINDO_DATA_AREA); if(hjt.hindo_area != 0) { if((hjt.curserial = (unsigned char *) - malloc(hjt.hindo_area * sizeof(unsigned char))) == NULL) + malloc0(hjt.hindo_area * sizeof(unsigned char))) == NULL) return(-1); for(i = 0; i < hjt.hindo_area; i++) (hjt.curserial)[i] = 0; } else @@ -1977,7 +1977,7 @@ return(-1); if(hjt1->hindo_area != 0) { if((hjt1->curserial = (unsigned char *) - malloc(hjt1->hindo_area * sizeof(unsigned char))) == NULL) + malloc0(hjt1->hindo_area * sizeof(unsigned char))) == NULL) return(-1); for(i = 0; i < hjt1->hindo_area; i++) (hjt1->curserial)[i] = vgetc(ifpter, args); Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/etc/fi_bdic.c =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/etc/fi_bdic.c 2013-07-17 21:18:00.335822201 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/etc/fi_bdic.c 2013-07-17 21:18:00.327822158 +0900 @@ -179,6 +179,7 @@ putnull(); #endif /* Not JS */ +extern char *malloc0(); #ifndef JS @@ -215,7 +216,7 @@ /* 接続定義Wnn辞書 f_uniq 配列の読み込み */ if(jt1->maxjisho) { if((jt1->jisho_uniq = (struct wnn_file_uniq *) - malloc(jt1->maxjisho * sizeof(struct wnn_file_uniq))) == NULL) + malloc0(jt1->maxjisho * sizeof(struct wnn_file_uniq))) == NULL) return(-1); for(i = 0; i < jt1->maxjisho; i++) { if(input_file_uniq(&((jt1->jisho_uniq)[i]), ifpter, args) == -1) Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/etc/gethinsi.c =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/etc/gethinsi.c 2013-07-17 21:18:00.335822201 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/etc/gethinsi.c 2013-07-17 21:18:00.327822158 +0900 @@ -210,6 +210,9 @@ extern char *hinsi_file_name; #endif /* !DSERVER && JSERVER */ +extern char *malloc0(); +extern void free0(); + static void error_long(args) ARGS *args; @@ -622,7 +625,7 @@ struct HDT *hdata; static int wnn_find_load_hinsi_by_name(); - if((hdata = (struct HDT *)malloc(sizeof(struct HDT))) == NULL) { + if((hdata = (struct HDT *)malloc0(sizeof(struct HDT))) == NULL) { return(-1); } hp = heap = hdata->heap; @@ -701,7 +704,7 @@ return(0); err: - free(hdata); + free0(hdata); return(HINSI_ERR); } Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/etc/msg.c =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/etc/msg.c 2013-07-17 21:18:00.335822201 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/etc/msg.c 2013-07-17 21:18:00.327822158 +0900 @@ -160,6 +160,9 @@ extern char *getenv(); +extern char *malloc0(); +extern void free0(); + static char * bsearch(ky, bs, nel, width, compar) char *ky; @@ -388,7 +391,7 @@ } } - if (!(cd = (struct msg_cat *)malloc(sizeof(struct msg_cat)))) + if (!(cd = (struct msg_cat *)malloc0(sizeof(struct msg_cat)))) return(NULL); strcpy(cd->name, name); @@ -417,9 +420,9 @@ cd->msg_cnt = msg_cnt; if (!(bd = cd->msg_bd = (struct msg_bd *) - malloc((sizeof(struct msg_bd)) * msg_cnt + msg_byte + 1))) { + malloc0((sizeof(struct msg_bd)) * msg_cnt + msg_byte + 1))) { fclose(fp); - free(cd); + free0(cd); return(NULL); } msg = (char *) bd + (sizeof(struct msg_bd)) * msg_cnt; @@ -491,9 +494,9 @@ if(cd->nextp) msg_close(cd->nextp); if(cd->msg_bd) - free(cd->msg_bd); + free0(cd->msg_bd); if(cd) - free(cd); + free0(cd); } #ifdef not_use Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/jl.c =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/jlib/jl.c 2013-07-17 21:18:00.335822201 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/jl.c 2013-07-17 21:18:20.000000000 +0900 @@ -166,6 +166,9 @@ #include "wnn_string.h" extern struct msg_cat *wnn_msg_cat; +extern char *malloc0(); +extern void free0(); +extern char *realloc0(); #define MAXENVS WNN_MAX_ENV_OF_A_CLIENT @@ -482,7 +485,7 @@ register char *name; { register struct wnn_file_name_id *f, *f1; - if((f = (struct wnn_file_name_id *)malloc(sizeof(struct wnn_file_name_id) + + if((f = (struct wnn_file_name_id *)malloc0(sizeof(struct wnn_file_name_id) + strlen(name) + 1)) == NULL){ env_wnn_errorno_set=WNN_ALLOC_FAIL; return(-1); @@ -531,7 +534,7 @@ for(prev = &jl_env_p->file; (f = *prev); prev = &f->next){ if (f->id == id) { *prev = f->next; - free(f); + free0(f); UnlockMutex(&envs_lock); return(0); } @@ -780,10 +783,10 @@ struct wnn_env *env; wnn_errorno = 0; - if(rb.size == 0) rb.buf = (char *)malloc((unsigned)(rb.size = 1024)); + if(rb.size == 0) rb.buf = (char *)malloc0((unsigned)(rb.size = 1024)); #define ALLOC_SET(pter, type, size, size_var) \ - ((pter) = ((type *)malloc((unsigned)(sizeof(type) * ((size_var) = (size)))))) + ((pter) = ((type *)malloc0((unsigned)(sizeof(type) * ((size_var) = (size)))))) if(!ALLOC_SET(buf, struct wnn_buf_mt, 1, dmy)){ wnn_errorno=WNN_ALLOC_FAIL;return NULL; @@ -890,7 +893,7 @@ char **c; register WNN_BUN *d; - if((c =(char **)malloc((unsigned)(len * sizeof(WNN_BUN) + sizeof(char *)))) == NULL){ + if((c =(char **)malloc0((unsigned)(len * sizeof(WNN_BUN) + sizeof(char *)))) == NULL){ buf_wnn_errorno_set=WNN_ALLOC_FAIL; return(-1); } @@ -924,15 +927,15 @@ buf->env = 0; } - if(buf->bun) free((char *)buf->bun); - if(buf->zenkouho) free((char *)buf->zenkouho); - if(buf->zenkouho_dai) free((char *)buf->zenkouho_dai); - if(buf->down_bnst) free((char *)buf->down_bnst); + if(buf->bun) free0((char *)buf->bun); + if(buf->zenkouho) free0((char *)buf->zenkouho); + if(buf->zenkouho_dai) free0((char *)buf->zenkouho_dai); + if(buf->down_bnst) free0((char *)buf->down_bnst); for(c = buf->heap; c; c = next) { next = *(char **)c; - free(c); + free0(c); } - free((char *)buf); + free0((char *)buf); UnlockMutex(&(tmpbuf.buf_lock)); } @@ -1033,11 +1036,11 @@ } if(nhinsi) { hsize = abs(nhinsi); - hno = (int *)malloc(hsize * sizeof(int)); + hno = (int *)malloc0(hsize * sizeof(int)); for(i = 0; i < hsize; i++) { _Sstrcpy(tmp, hname[i]); if((hno[i] = jl_hinsi_number_e(buf->env, tmp)) == -1) { - free((char *)hno); + free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return(-1); } @@ -1046,7 +1049,7 @@ x = ren_conv_sub((WNN_BUF_MT *)buf, yomi, bun_no, bun_no2, use_maep, 0, nhinsi, hno, 0); - if(nhinsi) free((char *)hno); + if(nhinsi) free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return x; } /* End of jl_ren_conv_with_hinsi_name */ @@ -1428,11 +1431,11 @@ } */ if(nhinsi) { hsize = abs(nhinsi); - hno = (int *)malloc(hsize * sizeof(int)); + hno = (int *)malloc0(hsize * sizeof(int)); for(i = 0; i < hsize; i++) { _Sstrcpy(tmp, hname[i]); if((hno[i] = jl_hinsi_number_e(buf->env, tmp)) == -1) { - free((char *)hno); + free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return(-1); } @@ -1441,11 +1444,11 @@ if(tan_conv_sub((WNN_BUF_MT *)buf, yomi, bun_no, bun_no2, use_maep, ich_shop, 0, nhinsi, hno) == -1) { - if(nhinsi) free((char *)hno); + if(nhinsi) free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return(-1); } - if(nhinsi) free((char *)hno); + if(nhinsi) free0((char *)hno); x = buf->bun_suu; UnlockMutex(&BUF_LOCK(buf)); return x; @@ -1773,11 +1776,11 @@ } */ if(nhinsi) { hsize = abs(nhinsi); - hno = (int *)malloc(hsize * sizeof(int)); + hno = (int *)malloc0(hsize * sizeof(int)); for(i = 0; i < hsize; i++) { _Sstrcpy(tmp, hname[i]); if((hno[i] = jl_hinsi_number_e(buf->env, tmp)) == -1) { - free((char *)hno); + free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return(-1); } @@ -1786,11 +1789,11 @@ if(nobi_conv_sub(buf, bun_no, ichbn_len, bun_no2, use_maep, ich_shop, nhinsi, hno, 0) == -1) { - if(nhinsi) free((char *)hno); + if(nhinsi) free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return(-1); } - if(nhinsi) free((char *)hno); + if(nhinsi) free0((char *)hno); x = buf->bun_suu; UnlockMutex(&BUF_LOCK(buf)); return x; @@ -2212,18 +2215,18 @@ } */ if(nhinsi){ hsize = abs(nhinsi); - hno = (int *)malloc(hsize * sizeof(int)); + hno = (int *)malloc0(hsize * sizeof(int)); for(i = 0; i < hsize; i++) { _Sstrcpy(tmp, hname[i]); if((hno[i] = jl_hinsi_number_e(buf->env, tmp)) == -1) { - free((char *)hno); + free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return(-1); } } } x = zen_conv_sho1(buf, bun_no, use_maep, uniq_level, 0, nhinsi, hno); - if(nhinsi) free((char *)hno); + if(nhinsi) free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return x; } @@ -2437,18 +2440,18 @@ } */ if(nhinsi){ hsize = abs(nhinsi); - hno = (int *)malloc(hsize * sizeof(int)); + hno = (int *)malloc0(hsize * sizeof(int)); for(i = 0; i < hsize; i++) { _Sstrcpy(tmp, hname[i]); if((hno[i] = jl_hinsi_number_e(buf->env, tmp)) == -1) { - free((char *)hno); + free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return(-1); } } } x = zen_conv_dai1(buf, bun_no, bun_no2, use_maep, uniq_level, 0, nhinsi, hno); - if(nhinsi) free((char *)hno); + if(nhinsi) free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return x; } @@ -3181,46 +3184,46 @@ /* 前確定文節情報分を確定候補数に加える */ nkouho = bun_no2 - bun_no + WNN_PREV_BUN_SUU; - if ( (dic = (int *)malloc(nkouho * sizeof(int))) == NULL ) + if ( (dic = (int *)malloc0(nkouho * sizeof(int))) == NULL ) return(-1); - if ( (entry = (int *)malloc(nkouho * sizeof(int))) == NULL ) { - free(dic); + if ( (entry = (int *)malloc0(nkouho * sizeof(int))) == NULL ) { + free0(dic); return(-1); } - if ( (ima = (int *)malloc(nkouho * sizeof(int))) == NULL ) { - free(dic); - free(entry); + if ( (ima = (int *)malloc0(nkouho * sizeof(int))) == NULL ) { + free0(dic); + free0(entry); return(-1); } - if ( (hindo = (int *)malloc(nkouho * sizeof(int))) == NULL ) { - free(dic); - free(entry); - free(ima); + if ( (hindo = (int *)malloc0(nkouho * sizeof(int))) == NULL ) { + free0(dic); + free0(entry); + free0(ima); return(-1); } - if ( (kmoji = (int *)malloc(nkouho * sizeof(int))) == NULL ) { - free(dic); - free(entry); - free(ima); - free(hindo); + if ( (kmoji = (int *)malloc0(nkouho * sizeof(int))) == NULL ) { + free0(dic); + free0(entry); + free0(ima); + free0(hindo); return(-1); } - if ( (kouho = (w_char **)malloc(nkouho * sizeof(w_char *))) == NULL ) { - free(dic); - free(entry); - free(ima); - free(hindo); - free(kmoji); + if ( (kouho = (w_char **)malloc0(nkouho * sizeof(w_char *))) == NULL ) { + free0(dic); + free0(entry); + free0(ima); + free0(hindo); + free0(kmoji); return(-1); } - if ( (tmp = (w_char *)malloc(nkouho * sizeof(w_char) * LENGTHKANJI)) == NULL ) { - free(dic); - free(entry); - free(ima); - free(hindo); - free(kmoji); - free(kouho); + if ( (tmp = (w_char *)malloc0(nkouho * sizeof(w_char) * LENGTHKANJI)) == NULL ) { + free0(dic); + free0(entry); + free0(ima); + free0(hindo); + free0(kmoji); + free0(kouho); return(-1); } for(k = 0; k < nkouho; k++) { @@ -3286,23 +3289,23 @@ if(k == -1) { buf_wnn_errorno_copy((WNN_BUF_MT *)buf) if (buf_wnn_errorno_eql == WNN_JSERVER_DEAD) { - free(dic); - free(entry); - free(ima); - free(hindo); - free(kmoji); - free(kouho[0]); - free(kouho); + free0(dic); + free0(entry); + free0(ima); + free0(hindo); + free0(kmoji); + free0(kouho[0]); + free0(kouho); return(-1); } } - free(dic); - free(entry); - free(ima); - free(hindo); - free(kmoji); - free(kouho[0]); - free(kouho); + free0(dic); + free0(entry); + free0(ima); + free0(hindo); + free0(kmoji); + free0(kouho[0]); + free0(kouho); return(0); } /* End of optimize_in_server */ @@ -4487,7 +4490,7 @@ if(--wb->ref_cnt <= 0){ for(wb1 = wb; wb;){ if((wb1 == wb) && (wb->hinsi_list != NULL)) { - free((char *)(wb->hinsi_list)); + free0((char *)(wb->hinsi_list)); wb->hinsi_list = NULL; } wb->free_next = buf->orig.free_heap; @@ -4598,7 +4601,7 @@ wb->num_hinsi = nhinsi; if(nhinsi) { int hsize = abs(nhinsi) * sizeof(int); - if((wb->hinsi_list = (int *)malloc(hsize)) == NULL) return(NULL); + if((wb->hinsi_list = (int *)malloc0(hsize)) == NULL) return(NULL); bcopy(hlist, wb->hinsi_list, hsize); } else wb->hinsi_list = NULL; @@ -4665,7 +4668,7 @@ newsize = buf->orig.bun_suu + cnt - (bun_no2 - bun_no); -#define Realloc(a, b) realloc((char *)(a), (unsigned)(b)) +#define Realloc(a, b) realloc0((char *)(a), (unsigned)(b)) if(newsize > buf->orig.msize_bun){ buf->orig.bun = (WNN_BUN **)Realloc(buf->orig.bun, newsize * sizeof(WNN_BUN *)); @@ -5017,7 +5020,7 @@ } int -wnn_cnt_free(buf) +wnn_cnt_free0(buf) struct wnn_buf *buf; { register int n; @@ -5392,10 +5395,10 @@ *:::DOC_END */ int -jl_free(ptr) +jl_free0(ptr) char *ptr; { - free(ptr); + free0(ptr); return(0); } /* End of jl_free */ @@ -6228,22 +6231,22 @@ int ii, *hlist, nhinsi = num - 1; w_char whname[64]; if(nhinsi) { - if(!(hlist = (int *)malloc(nhinsi * sizeof(int)))) + if(!(hlist = (int *)malloc0(nhinsi * sizeof(int)))) goto _Err_happend; for(ii = 0; ii < nhinsi; ii++) { _Sstrcpy(whname, s[ii]); if((hlist[ii] = jl_hinsi_number_e_body(env, whname)) == -1) { - free((char *)hlist); + free0((char *)hlist); goto _Err_happend; } } if(strcmp(code, "unuse_hinsi") == 0) nhinsi *= -1; if(js_set_henkan_hinsi(env, 1, nhinsi, hlist) < 0) { - free((char *)hlist); + free0((char *)hlist); goto _Err_happend; } - free((char *)hlist); + free0((char *)hlist); } } break; @@ -6989,11 +6992,11 @@ if(nhinsi) { hsize = abs(nhinsi); - hno = (int *)malloc(hsize * sizeof(int)); + hno = (int *)malloc0(hsize * sizeof(int)); for(i = 0; i < hsize; i++) { _Sstrcpy(tmp, hname[i]); if((hno[i] = jl_hinsi_number_e_body(env, tmp)) == -1) { - free((char *)hno); + free0((char *)hno); return(-1); } } @@ -7002,10 +7005,10 @@ if((x = js_set_henkan_hinsi(env, mode, nhinsi, hno)) == -1) { env_wnn_errorno_copy(env); if_dead_disconnect(env); - if(nhinsi) free((char *)hno); + if(nhinsi) free0((char *)hno); return(-1); } - if(nhinsi) free((char *)hno); + if(nhinsi) free0((char *)hno); return (x); } @@ -8179,7 +8182,7 @@ if (!buf || !buf->bun || !(data = buf->bun[bun_no])) return(-1); if (js_dic_info(buf->env, data->dic_no, &dic) < 0) return(-1); - if (!(yomi = (w_char *)malloc(sizeof(w_char) * (data->yomilen + 1)))) + if (!(yomi = (w_char *)malloc0(sizeof(w_char) * (data->yomilen + 1)))) return(-1); wnn_Strncpy(yomi, data->yomi, data->yomilen); yomi[data->yomilen] = (w_char)0; @@ -8206,12 +8209,12 @@ InfoShoRec *info, *prev; if (max <= 0) return(NULL); - if (!(info = (InfoShoRec *)malloc(sizeof(InfoShoRec) * max))) return(NULL); + if (!(info = (InfoShoRec *)malloc0(sizeof(InfoShoRec) * max))) return(NULL); bzero((char *)info, sizeof(InfoShoRec) * max); for (i = 0; i < max; i++) { if (Sho_Info(buf, i, &info[i]) < 0) { - free((char *)info); + free0((char *)info); return(NULL); } info[i].next = NULL; @@ -8229,7 +8232,7 @@ InfoTotalRec *info; if (!p) return(NULL); - if (!(info = (InfoTotalRec *)malloc(sizeof(InfoTotalRec)))) return(NULL); + if (!(info = (InfoTotalRec *)malloc0(sizeof(InfoTotalRec)))) return(NULL); bzero((char *)info, sizeof(InfoTotalRec)); for (; p; p = p->next) { @@ -8258,7 +8261,7 @@ } if (cnt <= 0) return(NULL); - if (!(info = (InfoDaiRec *)malloc(sizeof(InfoDaiRec) * cnt))) return(NULL); + if (!(info = (InfoDaiRec *)malloc0(sizeof(InfoDaiRec) * cnt))) return(NULL); bzero((char *)info, sizeof(InfoDaiRec) * cnt); d = &info[0]; @@ -8600,18 +8603,18 @@ } */ if(nhinsi){ hsize = abs(nhinsi); - hno = (int *)malloc(hsize * sizeof(int)); + hno = (int *)malloc0(hsize * sizeof(int)); for(i = 0; i < hsize; i++) { _Sstrcpy(tmp, hname[i]); if((hno[i] = jl_hinsi_number_e(buf->env, tmp)) == -1) { - free((char *)hno); + free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return(-1); } } } x = zen_conv_dai_ikeiji1(buf, bun_no, bun_no2, use_maep, uniq_level, 0, nhinsi, hno); - if(nhinsi) free((char *)hno); + if(nhinsi) free0((char *)hno); UnlockMutex(&BUF_LOCK(buf)); return x; } Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/js.c =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/jlib/js.c 2013-07-17 21:18:00.335822201 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/js.c 2013-07-17 21:18:00.331822180 +0900 @@ -160,7 +160,9 @@ */ -extern char *malloc(); +extern char *malloc0(); +extern void free0(); +extern char *realloc0(); #include #include @@ -205,7 +207,7 @@ #include "../etc/pwd.c" -char *malloc(); +char *malloc0(); typedef struct _host_address { int address_len; @@ -444,7 +446,7 @@ } if (!(sp = getservbyname(name,"tcp"))) return(-1); len = strlen(name); - if (!(p = (my_serv_struct *)malloc(sizeof(my_serv_struct) + len + 1))) + if (!(p = (my_serv_struct *)malloc0(sizeof(my_serv_struct) + len + 1))) return(-1); p->name = ((char *)p) + sizeof(my_serv_struct); strcpy(p->name, name); @@ -945,7 +947,7 @@ return NULL; } sbp=0; /* init sndBufPointer */ - if(!(new_js=(char *)malloc(sizeof(WNN_JSERVER_ID_INT)))){ + if(!(new_js=(char *)malloc0(sizeof(WNN_JSERVER_ID_INT)))){ js_wnn_errorno_set=WNN_ALLOC_FAIL; return NULL; } @@ -956,7 +958,7 @@ server->js_dead_env_flg= 0; if((current_sd= cd_open_in_by_addr(addr, addrlen, port, tmout))==-1){ js_wnn_errorno_set = WNN_NO_JSERVER; - free((char*)server); + free0((char*)server); current_js=NULL; return NULL; } @@ -1013,7 +1015,7 @@ } UnlockMutex(&msg_lock); - if(!(new_js=(char *)malloc(sizeof(WNN_JSERVER_ID_INT)))){ + if(!(new_js=(char *)malloc0(sizeof(WNN_JSERVER_ID_INT)))){ wnn_errorno=WNN_ALLOC_FAIL; return NULL; } @@ -1044,7 +1046,7 @@ strcpy(host,"unix"); if((current_sd= cd_open(lang))==-1){ UnlockMutex(&open_lock); - wnn_errorno=WNN_SOCK_OPEN_FAIL;free((char*)current_js);current_js=NULL; + wnn_errorno=WNN_SOCK_OPEN_FAIL;free0((char*)current_js);current_js=NULL; return NULL; } }else{ @@ -1052,7 +1054,7 @@ host[WNN_HOSTLEN-1] = '\0'; /* truncate by WNN_HOSTLEN */ if((current_sd= cd_open_in(servername, lang, tmout))==-1){ UnlockMutex(&open_lock); - wnn_errorno=WNN_SOCK_OPEN_FAIL;free((char*)current_js);current_js=NULL; + wnn_errorno=WNN_SOCK_OPEN_FAIL;free0((char*)current_js);current_js=NULL; return NULL; } } @@ -1092,7 +1094,7 @@ if(server==0) return(-1); tmp_js_id = *(WNN_JSERVER_ID_INT *)server; - free((char *)server); + free0((char *)server); current_js = &tmp_js_id; server = (WNN_JSERVER_ID *)current_js; set_current_js(server); @@ -1130,7 +1132,7 @@ void js_set_lang(); set_current_js(server); - if(!(env=(struct wnn_env_int *)malloc(sizeof(struct wnn_env_int)))){ + if(!(env=(struct wnn_env_int *)malloc0(sizeof(struct wnn_env_int)))){ js_wnn_errorno_set=WNN_ALLOC_FAIL; return NULL; } @@ -1138,14 +1140,14 @@ handler_of_jserver_dead(server); if(js_wnn_errorno_eql) { UnlockMutex(&(server_js_lock)); - free(env); + free0(env); return(NULL); } snd_head(JS_CONNECT, server); putscom(env_name, server); snd_flush(server); e_id=get4com(server); - if(e_id==-1){ js_wnn_errorno_set= get4com(server); free(env); return NULL; } + if(e_id==-1){ js_wnn_errorno_set= get4com(server); free0(env); return NULL; } UnlockMutex(&(server_js_lock)); env->orig.env_id = e_id; env->orig.js_id = (WNN_JSERVER_ID *)server; @@ -1245,7 +1247,7 @@ if(env==0) return(-1); /* 本来は、free しなきゃあかんのだけど、リソース管理が出来ないし、 まあ、8バイトだから、ゴミが残るけどいいだろう。 - free((char *)env); + free0((char *)env); */ set_current_js(env->js_id); LockMutex(&(env_js_lock)); @@ -1638,7 +1640,7 @@ UnlockMutex(&(env_js_lock)); return -1; } *nhinsi = get4com(env->js_id); - if(((*hlist) = (int *)malloc(abs(*nhinsi) * sizeof(int))) == NULL) { + if(((*hlist) = (int *)malloc0(abs(*nhinsi) * sizeof(int))) == NULL) { int dummy; for(i = 0; i < abs(*nhinsi); i++) dummy = get4com(env->js_id); env_wnn_errorno_set = WNN_ALLOC_FAIL; @@ -2896,7 +2898,7 @@ *curfzk = get4com(server); /* 情報受け取り用構造体の領域を確保する */ - if(((*ret) = (WNN_FZK_INFO *)malloc((count + 1) * + if(((*ret) = (WNN_FZK_INFO *)malloc0((count + 1) * sizeof(WNN_FZK_INFO))) == NULL) { WNN_FZK_INFO dummy; for(i = 0; i < count; i++){ @@ -3844,13 +3846,13 @@ if(ret->size < ret->num + fi_num) { /* 新たにFI関係データ構造体配列を確保する */ fi_data = (struct fi_rel_data *) - malloc((ret->num + fi_num) * sizeof(struct fi_rel_data)); + malloc0((ret->num + fi_num) * sizeof(struct fi_rel_data)); /* 既に使用していたFI関係データをコピーする */ if(fi_data) { if(ret->fi_buf) { bcopy(ret->fi_buf, fi_data, ret->num * sizeof(struct fi_rel_data)); - free((char *)ret->fi_buf); + free0((char *)ret->fi_buf); } } ret->fi_buf = fi_data; @@ -4082,8 +4084,8 @@ { if(ret->size < size){ if(ret->buf) - free((char *)ret->buf); - ret->buf = malloc(size); + free0((char *)ret->buf); + ret->buf = malloc0(size); ret->size = size; } } @@ -4397,7 +4399,7 @@ funiq.createhost[i]=get1com(env->js_id); } njisho = get1com(env->js_id); - if((primary = (int *)malloc(njisho * sizeof(int))) == NULL) { + if((primary = (int *)malloc0(njisho * sizeof(int))) == NULL) { env_wnn_errorno_set = WNN_MALLOC_ERR; UnlockMutex(&(env_js_lock)); return(-1); @@ -4405,12 +4407,12 @@ for(i = 0; i < njisho; i++) primary[i] = get4com(env->js_id); if(create_fi_hindo_file(&funiq,fn,com,hpasswd,njisho,primary,NULL) == -1){ - free(primary); + free0(primary); env_wnn_errorno_set = WNN_FILE_CREATE_ERROR; UnlockMutex(&(env_js_lock)); return(-1); } - free(primary); + free0(primary); UnlockMutex(&(env_js_lock)); return(0); } /* End of js_fi_hindo_file_create_client */ @@ -4708,7 +4710,7 @@ num++; } if (num == 0) return(0); - if (!(l = (char **)(s = malloc((sizeof(char *) * num) + total)))) { + if (!(l = (char **)(s = malloc0((sizeof(char *) * num) + total)))) { js_wnn_errorno_set = WNN_MALLOC_ERR; return(-1); } @@ -5043,7 +5045,7 @@ UnlockMutex(&(server_js_lock)); return((char **)NULL); } - if (!(save = p = malloc((sizeof(host_address) * total_num) + bytes))) { + if (!(save = p = malloc0((sizeof(host_address) * total_num) + bytes))) { for (i = 0; i < bytes; i++) get1com(server); js_wnn_errorno_set = WNN_MALLOC_ERR; return((char **)NULL); @@ -5106,8 +5108,8 @@ else total += get_host_name_len(host_p); } - if (!(p = malloc((sizeof(char *) * total_num) + total + total_num))) { - free((char *)save); + if (!(p = malloc0((sizeof(char *) * total_num) + total + total_num))) { + free0((char *)save); js_wnn_errorno_set = WNN_MALLOC_ERR; UnlockMutex(&(server_js_lock)); return((char **)NULL); @@ -5122,7 +5124,7 @@ } else p += get_host_name(host_p, p) + 1; } - free((char *)save); + free0((char *)save); *ret_num = total_num; UnlockMutex(&(server_js_lock)); return(out_save); @@ -5624,5 +5626,6 @@ return x; } /* end of js_ikeiji_with_data */ +#include "malloc.c" Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/malloc.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/malloc.c 2013-07-17 21:18:00.331822180 +0900 @@ -0,0 +1,86 @@ +/* + * $Id: malloc.c,v 1.3 1994/08/19 01:31:26 kuwa Exp $ + */ +/* + * Copyright Kyoto University Research Institute for Mathematical Sciences + * 1987, 1988, 1989, 1990, 1991 + * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991 + * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991 + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that all of the following conditions are satisfied: + * + * 1) The above copyright notices appear in all copies + * 2) Both those copyright notices and this permission notice appear + * in supporting documentation + * 3) The name of "Wnn" isn't changed unless substantial modifications + * are made, or + * 3') Following words followed by the above copyright notices appear + * in all supporting documentation of software based on "Wnn": + * + * "This software is based on the original version of Wnn developed by + * Kyoto University Research Institute for Mathematical Sciences (KURIMS), + * OMRON Corporation and ASTEC Inc." + * + * 4) The names KURIMS, OMRON and ASTEC not be used in advertising or + * publicity pertaining to distribution of the software without + * specific, written prior permission + * + * KURIMS, OMRON and ASTEC make no representations about the suitability + * of this software for any purpose. It is provided "as is" without + * express or implied warranty. + * + * Wnn consortium is one of distributors of the official Wnn source code + * release. Wnn consortium also makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * KURIMS, OMRON, ASTEC AND WNN CONSORTIUM DISCLAIM ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL KURIMS, OMRON, ASTEC OR + * WNN CONSORTIUM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + * + */ +/* Version 4.0 + */ +#include +/* #include "wnn_malloc.h" */ + +char * +malloc0(size) +int size; +{ + if(size == NULL){ + size = 1; + } + size = (size + 7) & 0xfffffff8; + return(calloc(size,1)); +} + +void +free0(pter) +char *pter; +{ + if(pter == NULL) return; + free(pter); + return; +} + +char * +realloc0(pter,size) +char *pter; +int size; +{ + if(size == NULL){ + size = 1; + } + size = (size + 7) & 0xfffffff8; + if(pter == NULL) + return(malloc0(size)); + return(realloc(pter,size)); +} debian/patches/shared.patch0000644000000000000000000000306512171526774013124 0ustar Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/Imakefile =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/jlib/Imakefile 2013-07-17 21:18:00.355822299 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/jlib/Imakefile 2013-07-17 21:18:12.000000000 +0900 @@ -4,7 +4,7 @@ #ifdef NEED_DEFINE_LIB #define DoNormalLib YES -#define DoSharedLib NO +#define DoSharedLib YES #define DoDebugLib NO #define DoProfileLib NO #endif @@ -63,7 +63,7 @@ LibraryObjectRule() -AllTarget($(OBJS) libwnn6_fromsrc.a) +AllTarget($(OBJS) libwnn.a libwnn6.so.1.0.0) js.o : js.c \ @@ -74,13 +74,15 @@ SingleProgramTarget(kankana,kankana.o,$(WNNJLIB),) -NormalLibraryTarget(wnn6_fromsrc,$(OBJS)) -LintLibraryTarget(wnn6_fromsrc,$(SRCS)) +NormalLibraryTarget(wnn,$(OBJS)) +SharedLibraryTarget(wnn6,1.0.0,$(OBJS),.,.) +LintLibraryTarget(wnn6,$(SRCS)) instlib:: install -InstallLibrary(wnn6_fromsrc,$(WNNLIBDIR)) +InstallLibrary(wnn,$(WNNLIBDIR)) +InstallSharedLibrary(wnn6,1.0.0,$(WNNLIBDIR)) #if ProfileLibJlib ProfiledLibraryTarget(wnn,$(OBJS)) Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/romkan/Imakefile =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/romkan/Imakefile 2013-07-17 21:18:00.355822299 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/romkan/Imakefile 2013-07-17 21:18:00.351822279 +0900 @@ -4,7 +4,7 @@ #ifdef NEED_DEFINE_LIB #define DoNormalLib YES -#define DoSharedLib NO +#define DoSharedLib YES #define DoDebugLib NO #define DoProfileLib NO #endif debian/patches/crypt-linkage.patch0000644000000000000000000000114512222402267014407 0ustar Description: Link libwnn6 with libcrypt Author: Colin Watson Bug-Debian: http://bugs.debian.org/558970 Forwarded: no Last-Update: 2013-10-01 Index: b/contrib/im/Xsi/Wnn/jlib/Imakefile =================================================================== --- a/contrib/im/Xsi/Wnn/jlib/Imakefile +++ b/contrib/im/Xsi/Wnn/jlib/Imakefile @@ -75,7 +75,7 @@ SingleProgramTarget(kankana,kankana.o,$(WNNJLIB),) NormalLibraryTarget(wnn,$(OBJS)) -SharedLibraryTarget(wnn6,1.0.0,$(OBJS),.,.) +SharedLibraryTarget(wnn6,1.0.0,$(OBJS) -lcrypt,.,.) LintLibraryTarget(wnn6,$(SRCS)) instlib:: install debian/patches/chown.patch0000644000000000000000000000126012171506620012753 0ustar Description: Never chown to wnn (hopefully closes: Bug#59501). Author: Keita Maehara Last-Update: 2000-03-05 Index: wnn6-sdk-1.0.0/contrib/im/Xsi/config/X11.tmpl =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/config/X11.tmpl 2013-07-17 21:18:00.267821860 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/config/X11.tmpl 2013-07-17 21:18:40.000000000 +0900 @@ -423,7 +423,7 @@ #undef MakeDir #endif #define MakeDir(dir) DirFailPrefix@if [ -d dir ]; then set +x; \ @@\ - else (set -x; $(MKDIRHIER) dir; chown $(WNNOWNER) dir); fi + else (set -x; $(MKDIRHIER) dir); fi #ifdef MakeDirectory #undef MakeDirectory debian/patches/config.patch0000644000000000000000000000511112171526727013113 0ustar Index: wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/Imakefile =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/Wnn/Imakefile 2013-07-17 21:18:00.287821960 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/Wnn/Imakefile 2013-07-17 21:18:12.000000000 +0900 @@ -14,10 +14,10 @@ MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) -install:: mkwnndir +XCOMM install:: mkwnndir -MakeDirectory(mkwnndir, $(DESTDIR)$(WNNWNNDIR)) -MakeDirectory(mkwnndir, $(DESTDIR)$(JWNNWNNDIR)) +XCOMM MakeDirectory(mkwnndir, $(DESTDIR)$(WNNWNNDIR)) +XCOMM MakeDirectory(mkwnndir, $(DESTDIR)$(JWNNWNNDIR)) checkwnnid:: @A=`egrep "^$(WNNOWNER):" /etc/passwd | cat` ;\ Index: wnn6-sdk-1.0.0/contrib/im/Xsi/config/X11.tmpl =================================================================== --- wnn6-sdk-1.0.0.orig/contrib/im/Xsi/config/X11.tmpl 2013-07-17 21:18:00.287821960 +0900 +++ wnn6-sdk-1.0.0/contrib/im/Xsi/config/X11.tmpl 2013-07-17 21:18:35.000000000 +0900 @@ -6,7 +6,7 @@ #if defined(SunArchitecture) && defined(SVR4) #include "/usr/openwin/lib/config/Project.tmpl" #else /* Sun & SVR4 */ -#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || defined(BSD386Architecture) +#if defined(LinuxArchitecture) || defined(KFreeBSDArchitecture) || defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || defined(BSD386Architecture) #include "/usr/X11R6/lib/X11/config/X11.tmpl" #else /* Linux || *BSD */ #include "/usr/lib/X11/config/Project.tmpl" @@ -502,6 +502,10 @@ #define WnnOwner wnn #endif +#ifndef InstallHeader +#define InstallHeader YES +#endif + #ifndef ImTop #define ImTop $(CONTRIBSRC)/im/Xsi #endif @@ -512,22 +516,22 @@ #ifndef WnnBinDir -#define WnnBinDir /usr/local/bin +#define WnnBinDir /usr/bin #endif #ifndef WnnIncDir -#define WnnIncDir $(INCROOT) +#define WnnIncDir /usr/include #endif #ifndef WnnLibDir -#define WnnLibDir $(USRLIBDIR) +#define WnnLibDir /usr/lib #endif WNNOWNER = WnnOwner IMTOP = ImTop WNNWNNDIR = WnnWnnDir WNNBINDIR = WnnBinDir - WNNINCDIR = WnnIncRoot + WNNINCDIR = WnnIncDir WNNLIBDIR = WnnLibDir WNNTERM_LIB = termLibrary @@ -563,7 +567,7 @@ WNNCNVFILEDIR = $(WNNJDSRC)/cvtfileDir WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC) WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" - WNNJLIB = $(WNNJLIBSRC)/libwnn6_fromsrc.a + WNNJLIB = $(WNNJLIBSRC)/libwnn6.a WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a CWNNTOP = $(IMTOP)/cWnn debian/patches/series0000644000000000000000000000017612222402170012026 0ustar chown.patch config.patch imake-path.patch malloc.patch shared.patch strchr.patch subdirs.patch hurd.patch crypt-linkage.patch debian/compat0000644000000000000000000000000211225557631010373 0ustar 6 debian/control0000644000000000000000000000271512171514471010601 0ustar Source: wnn6-sdk Section: libs Priority: extra Maintainer: Debian QA Group Build-Depends: debhelper (>= 9), xutils-dev, x11proto-core-dev Standards-Version: 3.9.4 Homepage: https://www.omronsoft.co.jp/SP/pcunix/sdk/index.html Vcs-Git: git://anonscm.debian.org/collab-maint/wnn6-sdk.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/wnn6-sdk.git Package: libwnn6-dev Section: libdevel Architecture: any Depends: ${misc:Depends}, libwnn6-1 (= ${binary:Version}), libc6-dev Conflicts: wnn-dev, freewnn-jserver-dev, wnn6-dev, libwnn-dev Replaces: wnn6-dev Description: Header files and static library for Wnn6 client library Wnn6 is a network-extensible Kana-to-Kanji conversion system based on the original version of Wnn developed by Kyoto University Research Institute for Mathematical Sciences (KURIMS), OMRON Corporation and ASTEC Inc. . This package contains the header files and static library for Wnn6 client library. Install this package if you wish to develop your own Wnn6 client programs. Package: libwnn6-1 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libwnn6 Description: Wnn6 client library Wnn6 is a network-extensible Kana-to-Kanji conversion system based on the original version of Wnn developed by Kyoto University Research Institute for Mathematical Sciences (KURIMS), OMRON Corporation and ASTEC Inc. . This package contains the open source Wnn6 client library from OMRON SOFTWARE. debian/libwnn6-1.install0000644000000000000000000000010410312751340012262 0ustar debian/tmp/usr/lib/libwnn6.so.1 debian/tmp/usr/lib/libwnn6.so.1.0.0 debian/changelog0000644000000000000000000001274712222402572011051 0ustar wnn6-sdk (1.0.0-18) unstable; urgency=low * QA upload. * Link libwnn6 with libcrypt (closes: #558970). -- Colin Watson Tue, 01 Oct 2013 00:12:56 +0100 wnn6-sdk (1.0.0-17) unstable; urgency=low * QA upload. * debian/patches/hurd.patch: refresh to really fix FTBFS on hurd-i386. -- HIGUCHI Daisuke (VDR dai) Thu, 18 Jul 2013 18:17:00 +0900 wnn6-sdk (1.0.0-16) unstable; urgency=low * QA upload. * debian/control - update B-D: and Depends: - add Homepage: and Vcs-* headers. * use dh7 - debian/rules: update. - debian/{apply-patch,extract-upstream}: remove. * debian/patches/hurd.patch: fix FTBFS on hurd-i386. * debian/patches/*: use quilt. * debian/docs: fix path. * debian/libwnn6-1.symbols: new file. * debian/source/format: new file. * bump up Standards-Version: 3.9.4 -- HIGUCHI Daisuke (VDR dai) Wed, 17 Jul 2013 21:40:51 +0900 wnn6-sdk (1.0.0-15) unstable; urgency=low * Set the Maintainer field to Debian QA Group. -- Keita Maehara Tue, 02 Jul 2013 01:42:38 +0900 wnn6-sdk (1.0.0-14.2) unstable; urgency=low * Non-maintainer upload. * Fix build dependencies (Closes: #485228, #515488) * Cleanup rules file * Bump debhelper compat level to six * Use binary:Version instead of Source-Version * Add section to the source package -- Raphael Geissert Fri, 10 Jul 2009 01:22:21 -0500 wnn6-sdk (1.0.0-14.1) unstable; urgency=low * Non-maintainer upload. * Fix FTBFS by passing to imake /usr/lib/X11/config as include dir instead of /usr/X11R6/lib/X11/config. [patch/imake-path.patch] (Closes: #367838) -- Adeodato Sim坦 Sat, 3 Jun 2006 01:33:50 +0200 wnn6-sdk (1.0.0-14) unstable; urgency=low * Replaced xlibs-dev with x-dev (closes: Bug#346754). * Fixed FTBFS on GNU/kFreeBSD (closes: Bug#341446). -- Keita Maehara Tue, 17 Jan 2006 01:57:03 +0900 wnn6-sdk (1.0.0-13) unstable; urgency=low * Maintainer release (closes: Bug#259894). * Added "Conflicts: libwnn6" to libwnn6-1 (closes: Bug#337740). * Updated Standards-Version: to 3.6.2. -- Keita Maehara Sun, 20 Nov 2005 00:13:30 +0900 wnn6-sdk (1.0.0-12.1) unstable; urgency=medium * Non-maintainer upload. * Medium-urgency upload for RC bugfix. * Remove broken non-ANSI redefinitions of malloc/free. Closes: #259894. * Rename libwnn6 to libwnn6-1, since new versions of imake have changed the SONAME for us. -- Steve Langasek Sat, 17 Sep 2005 00:43:08 -0700 wnn6-sdk (1.0.0-12) unstable; urgency=low * Updated Standards-Version: to 3.6.1. * Added "Conflicts: libwnn-dev" to libwnn6-dev (closes: Bug#274794). -- Keita Maehara Fri, 8 Oct 2004 22:48:33 +0900 wnn6-sdk (1.0.0-11) unstable; urgency=low * Added build-time dependency on xlibs-dev (closes: Bug#92473). -- Keita Maehara Tue, 3 Apr 2001 00:26:14 +0900 wnn6-sdk (1.0.0-10) unstable; urgency=low * Fixed wrong section and priority. -- Keita Maehara Sun, 1 Apr 2001 23:53:09 +0900 wnn6-sdk (1.0.0-9) unstable; urgency=low * New upstream release. -- Keita Maehara Sat, 31 Mar 2001 16:24:07 +0900 wnn6-sdk (1.0.0-8) frozen unstable; urgency=low * Now uses /usr/lib instead of /usr/X11R6/lib (closes: Bug#60078). -- Keita Maehara Sun, 12 Mar 2000 22:49:39 +0900 wnn6-sdk (1.0.0-7) frozen unstable; urgency=low * Added build-time dependency on xlib6g-dev and patch (closes: Bug#59500). * Never chown to wnn (hopefully closes: Bug#59501). -- Keita Maehara Fri, 3 Mar 2000 18:45:46 +0900 wnn6-sdk (1.0.0-6) frozen unstable; urgency=low * Fixed LIBDIR and WnnWnnDir (closes: Bug#56984). -- Keita Maehara Wed, 16 Feb 2000 23:12:32 +0900 wnn6-sdk (1.0.0-5) frozen unstable; urgency=low * Now provides some symbols missed in recent versions (closes: Bug#57097). -- Keita Maehara Sun, 13 Feb 2000 17:10:31 +0900 wnn6-sdk (1.0.0-4) frozen unstable; urgency=low * Fixed shlibs file again. -- Keita Maehara Sun, 23 Jan 2000 00:01:24 +0900 wnn6-sdk (1.0.0-3) frozen unstable; urgency=low * Fixed lintian error: "shlib-with-non-pic-code usr/X11R6/lib/libwnn6.so.1.0.0" * Fixed shlibs file. -- Keita Maehara Mon, 17 Jan 2000 21:48:10 +0900 wnn6-sdk (1.0.0-2) unstable; urgency=low * Now license is in the copyright file. -- Keita Maehara Sun, 9 Jan 2000 20:14:40 +0900 wnn6-sdk (1.0.0-1) unstable; urgency=low * Renamed Debian source to wnn6-sdk. * Updated to Standards-Version 3.1.1. * Now provides libwnn6 and libwnn6-dev, each of which were split and renamed from wnn6-dev. * Added "Build-Depends: debhelper". * Better package description. -- Keita Maehara Thu, 30 Dec 1999 00:22:34 +0900 wnn6-dev (4.0-1) frozen unstable; urgency=low * Now Wnn6 SDK is totally free and we can distribute wnn6-dev in main. -- Keita Maehara Thu, 29 Oct 1998 22:20:35 +0900 wnn6-dev (0.0-0.2) unstable; urgency=low * Repackaged to sign the original source. -- Keita Maehara Sun, 11 Oct 1998 02:07:42 +0900 wnn6-dev (0.0-0.1) unstable; urgency=low * Initial Release. -- Keita Maehara Sun, 11 Oct 1998 00:42:56 +0900 Local variables: mode: debian-changelog End: