Request for review: anthy 9100h+0.4
Yasuhiro KIMURA
yasu@utahime.org
Thu Jun 4 17:04:11 GMT 2020
From: Yaakov Selkowitz via Cygwin-apps <cygwin-apps@cygwin.com>
Subject: Re: Request for review: anthy 9100h+0.4 (Re: Update of packages by non-maintainer)
Date: Wed, 03 Jun 2020 12:41:14 -0400
>> Anyway version number issue has sloved. So I would like to request for
>> review of anthy 9100h+0.4.
>
> Not ready yet; see comments inline.
Thank you for comments. Followings are revised version of .cygport
file and patches. All pointed out problems should be fixed now.
anthy.cygport:
----------------------------------------------------------------------
NAME="anthy"
VERSION=9100h+0.4
RELEASE=1
CATEGORY="Libs"
SUMMARY="Japanese input method"
DESCRIPTION="Anthy is a system for Japanese input method. It converts
Hiragana text to Kana Kanji mixed text."
HOMEPAGE="https://salsa.debian.org/debian/anthy"
SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_0.4.orig.tar.gz"
PATCH_URI="
https://salsa.debian.org/debian/anthy/-/commit/b83129e05cdde8046a5aa0484f63910e9a204555.patch
https://salsa.debian.org/debian/anthy/-/commit/e7748e35ab5f68d50690d2ba54341a2d45339ece.patch
https://salsa.debian.org/debian/anthy/-/commit/cea40c6a31815b1ec14312265025dea7b6d22fac.patch
9100h-exeext.patch
9100h-no-undefined.patch
"
SRC_DIR="${PN}-0.4"
PKG_NAMES="${NAME} lib${NAME}1 lib${NAME}-common lib${NAME}-devel emacs-${NAME}"
anthy_CATEGORY="Text"
anthy_CONTENTS="usr/bin/*.exe usr/share/doc/"
libanthy1_REQUIRES="libanthy-common"
libanthy1_CONTENTS="usr/bin/cyganthy*-1.dll"
libanthy1_OBSOLETES="libanthy0"
libanthy_common_CONTENTS="etc/ usr/share/anthy/"
libanthy_devel_CONTENTS="usr/include/ usr/lib/"
emacs_anthy_CATEGORY="Editors"
emacs_anthy_CONTENTS="usr/share/emacs/"
emacs_anthy_REQUIRES="emacs"
CYGPORT_USE_UNSTABLE_API=1
# prevent stack overflow in mkworddic
LDFLAGS+=" -Wl,--stack,0x4000000"
----------------------------------------------------------------------
9100h-exeext.patch:
----------------------------------------------------------------------
diff -Nru origsrc/anthy-0.4/depgraph/Makefile.am src/anthy-0.4/depgraph/Makefile.am
--- origsrc/anthy-0.4/depgraph/Makefile.am 2019-07-05 11:37:13.000000000 +0900
+++ src/anthy-0.4/depgraph/Makefile.am 2020-06-04 16:06:42.090446500 +0900
@@ -11,7 +11,7 @@
mkdepgraph_SOURCES = mkdepgraph.c
mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la
-anthy.dep : mkdepgraph all.depword indepword-wt.txt
+anthy.dep : mkdepgraph$(EXEEXT) all.depword indepword-wt.txt
./mkdepgraph
all.depword: $(DEPWORDS)
diff -Nru origsrc/anthy-0.4/mkanthydic/Makefile.am src/anthy-0.4/mkanthydic/Makefile.am
--- origsrc/anthy-0.4/mkanthydic/Makefile.am 2019-07-05 11:37:13.000000000 +0900
+++ src/anthy-0.4/mkanthydic/Makefile.am 2020-06-04 16:06:42.092412000 +0900
@@ -11,64 +11,64 @@
anthy.dic: anthy.dic3
cp -p anthy.dic3 anthy.dic
-anthy.dic0: mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep
+anthy.dic0: mkfiledic$(EXEEXT) ../mkworddic/anthy.wdic ../depgraph/anthy.dep
./mkfiledic -i -o anthy.dic0
-parsed_data0: $(top_srcdir)/corpus/corpus.?.txt ../calctrans/proccorpus anthy.dic0
+parsed_data0: $(top_srcdir)/corpus/corpus.?.txt ../calctrans/proccorpus$(EXEEXT) anthy.dic0
../calctrans/proccorpus -d anthy.dic0 \
$(top_srcdir)/corpus/corpus.?.txt > parsed_data0
-parsed_data1: $(top_srcdir)/corpus/corpus.?.txt ../calctrans/proccorpus anthy.dic1
+parsed_data1: $(top_srcdir)/corpus/corpus.?.txt ../calctrans/proccorpus$(EXEEXT) anthy.dic1
../calctrans/proccorpus -d anthy.dic1 \
$(top_srcdir)/corpus/corpus.?.txt > parsed_data1
-parsed_data2: $(top_srcdir)/corpus/corpus.?.txt ../calctrans/proccorpus anthy.dic2
+parsed_data2: $(top_srcdir)/corpus/corpus.?.txt ../calctrans/proccorpus$(EXEEXT) anthy.dic2
../calctrans/proccorpus -d anthy.dic2 \
$(top_srcdir)/corpus/corpus.?.txt > parsed_data2
-parsed_data3: $(top_srcdir)/corpus/corpus.?.txt ../calctrans/proccorpus anthy.dic3
+parsed_data3: $(top_srcdir)/corpus/corpus.?.txt ../calctrans/proccorpus$(EXEEXT) anthy.dic3
../calctrans/proccorpus -d anthy.dic3 \
$(top_srcdir)/corpus/corpus.?.txt > parsed_data3
-parsed_data4: $(top_srcdir)/corpus/corpus.?.txt ../calctrans/proccorpus anthy.dic4
+parsed_data4: $(top_srcdir)/corpus/corpus.?.txt ../calctrans/proccorpus$(EXEEXT) anthy.dic4
../calctrans/proccorpus -d anthy.dic4 \
$(top_srcdir)/corpus/corpus.?.txt > parsed_data4
-anthy.dic1: mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep parsed_data0
+anthy.dic1: mkfiledic$(EXEEXT) ../mkworddic/anthy.wdic ../depgraph/anthy.dep parsed_data0
../calctrans/calctrans parsed_data0 -o corpus_info
../calctrans/calctrans parsed_data0 -e -o weak_words
../calctrans/calctrans -c corpus_info weak_words
./mkfiledic -o anthy.dic1
-anthy.dic2: mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep \
+anthy.dic2: mkfiledic$(EXEEXT) ../mkworddic/anthy.wdic ../depgraph/anthy.dep \
parsed_data0 parsed_data1
../calctrans/calctrans parsed_data0 parsed_data1 -o corpus_info
../calctrans/calctrans parsed_data0 parsed_data1 -e -o weak_words
../calctrans/calctrans -c corpus_info weak_words
./mkfiledic -o anthy.dic2
-anthy.dic3: mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep \
+anthy.dic3: mkfiledic$(EXEEXT) ../mkworddic/anthy.wdic ../depgraph/anthy.dep \
parsed_data0 parsed_data1 parsed_data2
../calctrans/calctrans parsed_data0 parsed_data1 parsed_data2 -o corpus_info
../calctrans/calctrans parsed_data0 parsed_data1 parsed_data2 -e -o weak_words
../calctrans/calctrans -c corpus_info weak_words
./mkfiledic -o anthy.dic3
-anthy.dic4: mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep \
+anthy.dic4: mkfiledic$(EXEEXT) ../mkworddic/anthy.wdic ../depgraph/anthy.dep \
parsed_data0 parsed_data1 parsed_data2 parsed_data3
../calctrans/calctrans parsed_data0 parsed_data1 parsed_data2 parsed_data3 -o corpus_info
../calctrans/calctrans parsed_data0 parsed_data1 parsed_data2 parsed_data3 -e -o weak_words
../calctrans/calctrans -c corpus_info weak_words
./mkfiledic -o anthy.dic4
-anthy.dic5: mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep \
+anthy.dic5: mkfiledic$(EXEEXT) ../mkworddic/anthy.wdic ../depgraph/anthy.dep \
parsed_data0 parsed_data1 parsed_data2 parsed_data3 parsed_data4
../calctrans/calctrans parsed_data0 parsed_data1 parsed_data2 parsed_data3 parsed_data4 -o corpus_info
../calctrans/calctrans parsed_data0 parsed_data1 parsed_data2 parsed_data3 parsed_data4 -e -o weak_words
../calctrans/calctrans -c corpus_info weak_words
./mkfiledic -o anthy.dic5
else
-anthy.dic: mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep \
+anthy.dic: mkfiledic$(EXEEXT) ../mkworddic/anthy.wdic ../depgraph/anthy.dep \
corpus_info weak_words
../calctrans/calctrans -c $(srcdir)/corpus_info $(srcdir)/weak_words
./mkfiledic -o anthy.dic
diff -Nru origsrc/anthy-0.4/mkworddic/Makefile.am src/anthy-0.4/mkworddic/Makefile.am
--- origsrc/anthy-0.4/mkworddic/Makefile.am 2019-07-05 11:37:13.000000000 +0900
+++ src/anthy-0.4/mkworddic/Makefile.am 2020-06-04 16:06:42.094407200 +0900
@@ -31,7 +31,7 @@
noinst_DATA = anthy.wdic
-anthy.wdic : mkworddic $(DIC_FILES)
+anthy.wdic : mkworddic$(EXEEXT) $(DIC_FILES)
./mkworddic -f ./dict.args
----------------------------------------------------------------------
9100h-no-undefined.patch:
----------------------------------------------------------------------
diff -Nru origsrc/anthy-0.4/src-main/Makefile.am src/anthy-0.4/src-main/Makefile.am
--- origsrc/anthy-0.4/src-main/Makefile.am 2019-07-05 11:37:13.000000000 +0900
+++ src/anthy-0.4/src-main/Makefile.am 2020-06-04 16:27:55.568919600 +0900
@@ -6,6 +6,6 @@
../src-ordering/libordering.la \
../src-worddic/libanthydic.la -lm
-libanthy_la_LDFLAGS = -version-info 2:2:1
+libanthy_la_LDFLAGS = -version-info 2:2:1 -no-undefined
libanthy_la_SOURCES = main.c context.c main.h
diff -Nru origsrc/anthy-0.4/src-util/Makefile.am src/anthy-0.4/src-util/Makefile.am
--- origsrc/anthy-0.4/src-util/Makefile.am 2019-07-05 11:37:13.000000000 +0900
+++ src/anthy-0.4/src-util/Makefile.am 2020-06-04 16:58:59.585843600 +0900
@@ -26,5 +26,6 @@
libanthyinput_la_SOURCES = input.c rkconv.c rkhelper.c\
rkconv.h rkmap.h rkhelper.h
libanthyinput_la_LIBADD = ../src-main/libanthy.la
+libanthyinput_la_LDFLAGS = -version-info 2:2:1 -no-undefined
pkgdata_DATA = typetab dic-tool-usage.txt
diff -Nru origsrc/anthy-0.4/src-worddic/Makefile.am src/anthy-0.4/src-worddic/Makefile.am
--- origsrc/anthy-0.4/src-worddic/Makefile.am 2019-07-05 11:37:13.000000000 +0900
+++ src/anthy-0.4/src-worddic/Makefile.am 2020-06-04 16:27:55.573902300 +0900
@@ -13,5 +13,5 @@
mem_dic.h dic_personality.h
libanthydic_la_LIBADD = ../src-diclib/libdiclib.la
-libanthydic_la_LDFLAGS = -version-info 2:3:1
+libanthydic_la_LDFLAGS = -version-info 2:3:1 -no-undefined
lib_LTLIBRARIES = libanthydic.la
----------------------------------------------------------------------
Best Regards.
---
Yasuhiro KIMURA
More information about the Cygwin-apps
mailing list