Request for review: anthy 9100h+0.4 (Re: Update of packages by non-maintainer)
From: Yasuhiro KIMURA
Subject: Re: Update of packages by non-maintainer
Date: Wed, 03 Jun 2020 14:31:56 +0900 (JST)
> So I gave up to use override.hint and decided to change version number
> to "9100h+0.4". It works fine with all of cygport, mksetupini and
> setup-x86_64.
Anyway version number issue has sloved. So I would like to request for
review of anthy 9100h+0.4.
Changes from 9100h-2 are:
* Source is switched to version 0.4 from Debian forked Anthy project.
* VERSION is changed to "9100h+0.4" to keep version number from going
backword.
* Fedora patchset is removed.
* Some patches committed to repository of a Debian Anthy after release
of 0.4 are adopted.
* As for cygwin local patch, 9100h-no-undefined.patch is changed to
make it fit to new source tree. Others are removed.
* All of src_patch_hook is unnecessary for new sources. So it is
removed.
* Add "MAKEOPTS=-j1" because parallel make causes build error.
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-no-undefined.patch
"
SRC_DIR="${PN}-0.4"
PKG_NAMES="${NAME} lib${NAME}0 lib${NAME}-common lib${NAME}-devel emacs-${NAME}"
anthy_CATEGORY="Text"
anthy_CONTENTS="usr/bin/*.exe usr/share/doc/"
libanthy0_REQUIRES="libanthy-common"
libanthy0_CONTENTS="usr/bin/cyganthy*.dll"
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,0x400"
# parallel make causes build error
MAKEOPTS=-j1
--
9100h-no-undefined.patch:
--
--- origsrc/anthy-0.4/src-main/Makefile.am 2019-07-05 11:37:13.0
+0900
+++ src/anthy-0.4/src-main/Makefile.am 2020-05-23 00:59:04.136024700 +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
--- origsrc/anthy-0.4/src-util/Makefile.am 2019-07-05 11:37:13.0
+0900
+++ src/anthy-0.4/src-util/Makefile.am 2020-05-23 00:59:26.155191100 +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 = -no-undefined
pkgdata_DATA = typetab dic-tool-usage.txt
--- origsrc/anthy-0.4/src-worddic/Makefile.am 2019-07-05 11:37:13.0
+0900
+++ src/anthy-0.4/src-worddic/Makefile.am 2020-05-23 00:59:52.482504900
+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
Re: Request for review: anthy 9100h+0.4 (Re: Update of packages by non-maintainer)
On Thu, 2020-06-04 at 01:20 +0900, Yasuhiro KIMURA wrote:
> From: Yasuhiro KIMURA
> > So I gave up to use override.hint and decided to change version number
> > to "9100h+0.4". It works fine with all of cygport, mksetupini and
> > setup-x86_64.
>
> 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.
> * As for cygwin local patch, 9100h-no-undefined.patch is changed to
> make it fit to new source tree. Others are removed.
[snip]
> * Add "MAKEOPTS=-j1" because parallel make causes build error.
That's the whole purpose of the exeext patch, to fix parallel make.
Before you remove patches, you first need to understand what the patch
does, why it was needed, and see if it still is or not. If you don't
know, then you should be asking rather than just dropping them.
> PKG_NAMES="${NAME} lib${NAME}0 lib${NAME}-common lib${NAME}-devel
> emacs-${NAME}"
[snip]
> libanthy0_REQUIRES="libanthy-common"
> libanthy0_CONTENTS="usr/bin/cyganthy*.dll"
This is wrong; most of the DLLs will be -1.dll, so this needs to be
libanthy1 (but see below!!).
> 9100h-no-undefined.patch:
This looks mostly fine, except:
> --- origsrc/anthy-0.4/src-util/Makefile.am 2019-07-05 11:37:13.0
> +0900
> +++ src/anthy-0.4/src-util/Makefile.am 2020-05-23 00:59:26.155191100 +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 = -no-undefined
>
> pkgdata_DATA = typetab dic-tool-usage.txt
This should probably have -version-info flag as well upstream,
otherwise you'll have conflicts with libanthy0 and libanthy1.
--
Yaakov Selkowitz
Senior Software Engineer - Platform Enablement
Red Hat, Inc.
