diff mbox series

[meta-oe,2/2] anthy: port to anthy-unicode 1.0.0.20260213

Message ID 20260726022951.1696787-2-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-gnome,1/2] gnome-terminal: replace deprecated GFDL-1.3 with GFDL-1.3-no-invariants-only | expand

Commit Message

Khem Raj July 26, 2026, 2:29 a.m. UTC 
Replace the long-dead anthy 9100h (last released 2009, fetched from an old
Ubuntu source tarball) with the maintained fork anthy-unicode, which is UTF-8
native and actively released on GitHub.

anthy-unicode renames its libraries (libanthy-unicode, libanthydic-unicode,
libanthyinput-unicode), pkg-config module file (anthy-unicode.pc), headers
(includedir/anthy-unicode-1.0/anthy), config file (anthy-unicode.conf) and
binaries (anthy-*-unicode). The recipe and packaging are updated accordingly:
libanthy-unicode0 for the runtime libraries and the standard PN-dev for the
development files.

The cross-compilation strategy is carried over from the old recipe: dictionary
generation runs helper programs (mkfiledic, mkworddic, mkdepgraph, calctrans,
proccorpus) that cannot execute when cross compiling. native-helpers.patch
promotes them to bin_PROGRAMS so anthy-unicode-native stages them into the
native sysroot; target-helpers.patch makes the target dictionary rules call
them from PATH instead of ./. not_build_elc.patch avoids byte-compiling the
Emacs lisp (no target Emacs under cross compilation). The patches are
regenerated against anthy-unicode's -unicode-suffixed libtool archives. The
legacy 2ch_t.patch is dropped; anthy-unicode has no mkanthydic/2ch.t.

uim is switched from the legacy EUC-JP anthy backend to the UTF-8
anthy-unicode backend it already supports: configure with --without-anthy
--with-anthy-utf8, DEPENDS on anthy-unicode, and the uim-anthy package is
renamed uim-anthy-utf8 (plugin libuim-anthy-utf8, anthy-utf8*.scm, module
registered as anthy-utf8) with RDEPENDS on libanthy-unicode0.

packagegroup-meta-oe: anthy -> anthy-unicode.

Verified by building anthy-unicode-native and anthy-unicode for
x86-64 (do_package_qa clean): the native helpers stage into the native
sysroot, the target build generates anthy.wdic/anthy.dep/anthy.dic via those
native helpers, and packaging splits into anthy-unicode, libanthy-unicode0 and
anthy-unicode-dev. uim variables verified by parse (it requires the x11
DISTRO_FEATURE, which the qemux86-64 yoe distro strips, so it is not buildable
in this configuration).

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 .../packagegroups/packagegroup-meta-oe.bb     |    2 +-
 .../anthy-unicode/native-helpers.patch        |   61 +
 .../anthy-unicode/not_build_elc.patch         |   23 +
 .../anthy-unicode}/target-helpers.patch       |   50 +-
 .../anthy-unicode_1.0.0.20260213.bb           |   41 +
 .../recipes-support/anthy/anthy/2ch_t.patch   | 5064 -----------------
 .../anthy/anthy/native-helpers.patch          |   60 -
 .../anthy/anthy/not_build_elc.patch           |   19 -
 meta-oe/recipes-support/anthy/anthy_9100h.bb  |   48 -
 meta-oe/recipes-support/uim/uim_1.9.6.bb      |   26 +-
 10 files changed, 171 insertions(+), 5223 deletions(-)
 create mode 100644 meta-oe/recipes-support/anthy-unicode/anthy-unicode/native-helpers.patch
 create mode 100644 meta-oe/recipes-support/anthy-unicode/anthy-unicode/not_build_elc.patch
 rename meta-oe/recipes-support/{anthy/anthy => anthy-unicode/anthy-unicode}/target-helpers.patch (67%)
 create mode 100644 meta-oe/recipes-support/anthy-unicode/anthy-unicode_1.0.0.20260213.bb
 delete mode 100644 meta-oe/recipes-support/anthy/anthy/2ch_t.patch
 delete mode 100644 meta-oe/recipes-support/anthy/anthy/native-helpers.patch
 delete mode 100644 meta-oe/recipes-support/anthy/anthy/not_build_elc.patch
 delete mode 100644 meta-oe/recipes-support/anthy/anthy_9100h.bb
diff mbox series

Patch

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index bdda72195b..824ef445f1 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -705,7 +705,7 @@  RDEPENDS:packagegroup-meta-oe-shells = "\

 RDEPENDS:packagegroup-meta-oe-support = "\
     ace-cloud-editor \
-    anthy \
+    anthy-unicode \
     asio \
     atop \
     augeas \
diff --git a/meta-oe/recipes-support/anthy-unicode/anthy-unicode/native-helpers.patch b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/native-helpers.patch
new file mode 100644
index 0000000000..88676bbd42
--- /dev/null
+++ b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/native-helpers.patch
@@ -0,0 +1,61 @@ 
+Upstream-Status: Inappropriate [cross-compile specific]
+
+Stage the native anthy-unicode helpers (mkfiledic, mkdepgraph, mkworddic,
+calctrans, proccorpus) as bin_PROGRAMS so anthy-unicode-native installs them
+into the native sysroot, where the target build's dictionary rules pick them
+up from PATH (see target-helpers.patch).
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+diff --git a/calctrans/Makefile.am b/calctrans/Makefile.am
+index a48867a..dc6af11 100644
+--- a/calctrans/Makefile.am
++++ b/calctrans/Makefile.am
+@@ -3,7 +3,7 @@ EXTRA_DIST =\
+  corpus.3.txt corpus.4.txt corpus.5.txt\
+  corpus_info weak_words
+
+-noinst_PROGRAMS = calctrans proccorpus
++bin_PROGRAMS = calctrans proccorpus
+ INCLUDES = -I$(top_srcdir)/
+
+ calctrans_SOURCES = calctrans.c input_set.c input_set.h corpus.c
+diff --git a/depgraph/Makefile.am b/depgraph/Makefile.am
+index 468f90c..75b285c 100644
+--- a/depgraph/Makefile.am
++++ b/depgraph/Makefile.am
+@@ -9,7 +9,7 @@ CLEANFILES = anthy.dep
+ EXTRA_DIST = indepword.txt $(DEPWORDS)
+
+ # Generate the dictionary
+-noinst_PROGRAMS = mkdepgraph
++bin_PROGRAMS = mkdepgraph
+ mkdepgraph_SOURCES = mkdepgraph.c
+ mkdepgraph_LDADD =  ../src-main/libanthy-unicode.la ../src-worddic/libanthydic-unicode.la
+
+diff --git a/mkanthydic/Makefile.am b/mkanthydic/Makefile.am
+index dfabff6..1c665eb 100644
+--- a/mkanthydic/Makefile.am
++++ b/mkanthydic/Makefile.am
+@@ -3,7 +3,7 @@ noinst_SCRIPTS =
+ CLEANFILES = anthy.dic
+ INCLUDES = -I$(top_srcdir)/ -DSRCDIR=\"$(srcdir)\"
+
+-noinst_PROGRAMS = mkfiledic
++bin_PROGRAMS = mkfiledic
+ mkfiledic_SOURCES = mkfiledic.c
+ mkfiledic_LDADD = ../src-diclib/libdiclib.la
+
+diff --git a/mkworddic/Makefile.am b/mkworddic/Makefile.am
+index d9b262e..b0a9e01 100644
+--- a/mkworddic/Makefile.am
++++ b/mkworddic/Makefile.am
+@@ -26,7 +26,7 @@ DIC_FILES = @top_srcdir@/alt-cannadic/gcanna.ctd \
+ 	    @top_srcdir@/mkworddic/udict
+
+ # Generate the dictionary
+-noinst_PROGRAMS = mkworddic
++bin_PROGRAMS = mkworddic
+ mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h
+ mkworddic_LDADD = ../src-worddic/libanthydic-unicode.la
+
diff --git a/meta-oe/recipes-support/anthy-unicode/anthy-unicode/not_build_elc.patch b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/not_build_elc.patch
new file mode 100644
index 0000000000..a3aa82407d
--- /dev/null
+++ b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/not_build_elc.patch
@@ -0,0 +1,23 @@ 
+Upstream-Status: Inappropriate [cross-compile specific]
+
+Do not byte-compile the Emacs lisp files at build time; there is no target
+Emacs available under cross compilation. The .el sources are still shipped.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+diff --git a/src-util/Makefile.am b/src-util/Makefile.am
+index c51c076..7ccad01 100644
+--- a/src-util/Makefile.am
++++ b/src-util/Makefile.am
+@@ -16,10 +16,7 @@ bin_PROGRAMS = \
+     anthy-agent-unicode \
+     anthy-morphological-analyzer-unicode \
+     $(NULL)
+-ELCFILES = anthy-unicode.elc anthy-unicode-azik.elc anthy-unicode-conf.elc \
+-    anthy-unicode-dic.elc anthy-unicode-isearch.elc anthy-unicode-kyuri.elc \
+-    leim-list.elc \
+-    $(NULL)
++ELCFILES =
+ if ELISP
+ lisp_LISP = $(ELISP_FILES)
+ endif
diff --git a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/target-helpers.patch
similarity index 67%
rename from meta-oe/recipes-support/anthy/anthy/target-helpers.patch
rename to meta-oe/recipes-support/anthy-unicode/anthy-unicode/target-helpers.patch
index fc5c72c051..ce0a51ee58 100644
--- a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch
+++ b/meta-oe/recipes-support/anthy-unicode/anthy-unicode/target-helpers.patch
@@ -1,9 +1,18 @@ 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [cross-compile specific]

-diff -Nurp anthy-9100h.org/calctrans/Makefile.am anthy-9100h/calctrans/Makefile.am
---- anthy-9100h.org/calctrans/Makefile.am	2007-10-27 23:02:59.000000000 +0900
-+++ anthy-9100h/calctrans/Makefile.am	2014-11-11 17:14:42.152999991 +0900
-@@ -15,31 +15,31 @@ dict_source_files = anthy.cand_info anth
+For the target build, do not compile or run the dictionary-generation helpers
+(mkfiledic, mkdepgraph, mkworddic, calctrans, proccorpus) locally -- they are
+built by anthy-unicode-native and installed into the native sysroot. Drop the
+"./" prefix from the dictionary rules so the helpers are taken from PATH, and
+disable the local build of the helpers that also provide libraries.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+diff --git a/calctrans/Makefile.am b/calctrans/Makefile.am
+index a48867a..b47b6af 100644
+--- a/calctrans/Makefile.am
++++ b/calctrans/Makefile.am
+@@ -15,31 +15,31 @@ dict_source_files = anthy.cand_info anthy.trans_info anthy.corpus_array anthy.co

  update_params:
  	rm -f parsed_data2
@@ -47,19 +56,20 @@  diff -Nurp anthy-9100h.org/calctrans/Makefile.am anthy-9100h/calctrans/Makefile.

  noinst_DATA = $(dict_source_files)
  CLEANFILES = $(dict_source_files) parsed_data parsed_data2 anthy.feature_info
-diff -Nurp anthy-9100h.org/depgraph/Makefile.am anthy-9100h/depgraph/Makefile.am
---- anthy-9100h.org/depgraph/Makefile.am	2008-11-29 21:46:14.000000000 +0900
-+++ anthy-9100h/depgraph/Makefile.am	2014-11-11 17:12:03.813999991 +0900
+diff --git a/depgraph/Makefile.am b/depgraph/Makefile.am
+index 468f90c..1f3de05 100644
+--- a/depgraph/Makefile.am
++++ b/depgraph/Makefile.am
 @@ -9,11 +9,11 @@ CLEANFILES = anthy.dep
  EXTRA_DIST = indepword.txt $(DEPWORDS)

  # Generate the dictionary
 -noinst_PROGRAMS = mkdepgraph
 -mkdepgraph_SOURCES = mkdepgraph.c
--mkdepgraph_LDADD =  ../src-main/libanthy.la ../src-worddic/libanthydic.la
+-mkdepgraph_LDADD =  ../src-main/libanthy-unicode.la ../src-worddic/libanthydic-unicode.la
 +#noinst_PROGRAMS = mkdepgraph
 +#mkdepgraph_SOURCES = mkdepgraph.c
-+#mkdepgraph_LDADD =  ../src-main/libanthy.la ../src-worddic/libanthydic.la
++#mkdepgraph_LDADD =  ../src-main/libanthy-unicode.la ../src-worddic/libanthydic-unicode.la

 -anthy.dep : mkdepgraph $(DEPWORDS)
 -	./mkdepgraph
@@ -67,9 +77,10 @@  diff -Nurp anthy-9100h.org/depgraph/Makefile.am anthy-9100h/depgraph/Makefile.am
 +	mkdepgraph

  noinst_DATA = anthy.dep
-diff -Nurp anthy-9100h.org/mkanthydic/Makefile.am anthy-9100h/mkanthydic/Makefile.am
---- anthy-9100h.org/mkanthydic/Makefile.am	2007-04-14 18:01:10.000000000 +0900
-+++ anthy-9100h/mkanthydic/Makefile.am	2014-11-11 17:10:34.792999991 +0900
+diff --git a/mkanthydic/Makefile.am b/mkanthydic/Makefile.am
+index dfabff6..d1109cc 100644
+--- a/mkanthydic/Makefile.am
++++ b/mkanthydic/Makefile.am
 @@ -3,12 +3,12 @@ noinst_SCRIPTS =
  CLEANFILES = anthy.dic
  INCLUDES = -I$(top_srcdir)/ -DSRCDIR=\"$(srcdir)\"
@@ -88,19 +99,20 @@  diff -Nurp anthy-9100h.org/mkanthydic/Makefile.am anthy-9100h/mkanthydic/Makefil


  # To install
-diff -Nurp anthy-9100h.org/mkworddic/Makefile.am anthy-9100h/mkworddic/Makefile.am
---- anthy-9100h.org/mkworddic/Makefile.am	2009-01-23 12:31:31.000000000 +0900
-+++ anthy-9100h/mkworddic/Makefile.am	2014-11-11 17:13:31.946999992 +0900
-@@ -26,14 +26,14 @@ DIC_FILES = @top_srcdir@/alt-cannadic/gc
+diff --git a/mkworddic/Makefile.am b/mkworddic/Makefile.am
+index d9b262e..6a8a54c 100644
+--- a/mkworddic/Makefile.am
++++ b/mkworddic/Makefile.am
+@@ -26,14 +26,14 @@ DIC_FILES = @top_srcdir@/alt-cannadic/gcanna.ctd \
  	    @top_srcdir@/mkworddic/udict

  # Generate the dictionary
 -noinst_PROGRAMS = mkworddic
 -mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h
--mkworddic_LDADD = ../src-worddic/libanthydic.la
+-mkworddic_LDADD = ../src-worddic/libanthydic-unicode.la
 +#noinst_PROGRAMS = mkworddic
 +#mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h
-+#mkworddic_LDADD = ../src-worddic/libanthydic.la
++#mkworddic_LDADD = ../src-worddic/libanthydic-unicode.la

  noinst_DATA = anthy.wdic

diff --git a/meta-oe/recipes-support/anthy-unicode/anthy-unicode_1.0.0.20260213.bb b/meta-oe/recipes-support/anthy-unicode/anthy-unicode_1.0.0.20260213.bb
new file mode 100644
index 0000000000..e8c4d9b97c
--- /dev/null
+++ b/meta-oe/recipes-support/anthy-unicode/anthy-unicode_1.0.0.20260213.bb
@@ -0,0 +1,41 @@ 
+DESCRIPTION = "Anthy Unicode is a maintained fork of the Anthy Japanese input \
+method. It converts Hiragana text to Kana Kanji mixed text and works in UTF-8."
+HOMEPAGE = "https://github.com/fujiwarat/anthy-unicode"
+
+LICENSE = "GPL-2.0-only AND LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f37c94ff7ea73f8ed6ce61216611051 \
+    file://alt-cannadic/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \
+"
+
+SRC_URI = "https://github.com/fujiwarat/anthy-unicode/releases/download/${PV}/anthy-unicode-${PV}.tar.gz \
+    file://not_build_elc.patch \
+"
+
+SRC_URI:append:class-target = " file://target-helpers.patch"
+SRC_URI:append:class-native = " file://native-helpers.patch"
+
+SRC_URI[sha256sum] = "666e91b92c76eb5bee7ee88dca1478eb55122c2af2641f055d4e51cf9d904860"
+
+UPSTREAM_CHECK_URI = "https://github.com/fujiwarat/anthy-unicode/releases"
+UPSTREAM_CHECK_REGEX = "anthy-unicode-(?P<pver>\d+(\.\d+)+)"
+
+DEPENDS:class-target = "anthy-unicode-native"
+RDEPENDS:${PN}:class-target = "libanthy-unicode0"
+
+inherit autotools pkgconfig
+
+PACKAGES += "${PN}-el libanthy-unicode0"
+
+FILES:${PN}-dbg += "${libdir}/.debug"
+FILES:libanthy-unicode0 = "${libdir}/libanthy-unicode.so.* \
+    ${libdir}/libanthydic-unicode.so.* \
+    ${libdir}/libanthyinput-unicode.so.* \
+"
+
+FILES:${PN}-el = "${datadir}/emacs/*"
+FILES:${PN} = "${datadir}/* \
+    ${bindir}/* \
+    ${sysconfdir}/anthy-unicode.conf \
+"
+
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch b/meta-oe/recipes-support/anthy/anthy/2ch_t.patch
deleted file mode 100644
index a0d3f9c25e..0000000000
--- a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch
+++ /dev/null
@@ -1,5064 +0,0 @@ 
-Upstream-Status: Pending
-
-source: shamelessly stolen from debian ;-)
-purpose: add some entries particularly useful in Japanese 2channel anonymous website
-         (at least that is my understanding ;-))
-
---- anthy-5414.orig/mkanthydic/2ch.t
-+++ anthy-5414/mkanthydic/2ch.t
-@@ -0,0 +1,5055 @@
-+# 2ch�Ѹ��Canna��������
-+# HARUYAMA Seigo haruyama@unixuser.org
-+# ������ʻ�Ϥ������٤� �ʤ� ���äѤ�����Ϥ��ʤΤ�
-+# ����Ŧ�������
-+# ����: http://freezone.kakiko.com/jiten/index.html
-+#       http://members.tripod.co.jp/maruheso/aadic/index.html
-+#       http://isweb33.infoseek.co.jp/computer/gikosite/ (403 Forbidden)
-+#       http://cannadic.oucrc.org/
-+#       http://www.kyoto.trans-nt.com/anthy/
-+#       http://www.media-k.co.jp/jiten/
-+# ���ͤˤ��Ƥ��뼭������ե饤���