[oe] [meta-oe][PATCH] uim: add support for anthy
Martin Jansa
martin.jansa at gmail.com
Mon Aug 8 11:45:18 UTC 2016
On Thu, Apr 28, 2016 at 10:02:14AM +0300, Dai Caiyun wrote:
> make uim support anthy.
>
> Signed-off-by: Dai Caiyun <daicy.fnst at cn.fujitsu.com>
> ---
> .../uim/uim/0001-configure.ac-Error-Fix.patch | 29 +++++++++++++++++++++
> .../uim/uim/0001-fep-uim-fep.c-Error-Fix.patch | 30 ++++++++++++++++++++++
> meta-oe/recipes-support/uim/uim_1.8.6.bb | 11 +++++++-
> 3 files changed, 69 insertions(+), 1 deletion(-)
> create mode 100644 meta-oe/recipes-support/uim/uim/0001-configure.ac-Error-Fix.patch
> create mode 100644 meta-oe/recipes-support/uim/uim/0001-fep-uim-fep.c-Error-Fix.patch
>
> diff --git a/meta-oe/recipes-support/uim/uim/0001-configure.ac-Error-Fix.patch b/meta-oe/recipes-support/uim/uim/0001-configure.ac-Error-Fix.patch
> new file mode 100644
> index 0000000..1e992d9
> --- /dev/null
> +++ b/meta-oe/recipes-support/uim/uim/0001-configure.ac-Error-Fix.patch
> @@ -0,0 +1,29 @@
> +From 843155bb61729d5fa0513b0cc967f5ed34124848 Mon Sep 17 00:00:00 2001
> +From: Li Xin <lixin.fnst at cn.fujitsu.com>
> +Date: Fri, 26 Feb 2016 15:14:30 +0900
> +Subject: [PATCH] configure.ac: Error Fix
> +
> +ERROR: QA Issue: uim: The compile log indicates that host
> +include and/or library paths were used.
> +
> +Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 9249bfd..be03d74 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -1216,7 +1216,7 @@ if test "x$use_libedit" != "xno"; then
> + use_libedit="no")])
> + if test "x$use_libedit" != "xno"; then
> + AC_CHECK_LIB(edit, el_init,
> +- [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"
> ++ [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS"
> + AC_SUBST(LIBEDIT_LIBS)],
> + [AC_MSG_WARN("libedit not found. Disabled...")
> + use_libedit="no"])
> +--
> +1.8.4.2
> +
> diff --git a/meta-oe/recipes-support/uim/uim/0001-fep-uim-fep.c-Error-Fix.patch b/meta-oe/recipes-support/uim/uim/0001-fep-uim-fep.c-Error-Fix.patch
> new file mode 100644
> index 0000000..2ca21b0
> --- /dev/null
> +++ b/meta-oe/recipes-support/uim/uim/0001-fep-uim-fep.c-Error-Fix.patch
> @@ -0,0 +1,30 @@
> +From db57f34cf8e6483866ff7df7e65bc015a86cc71c Mon Sep 17 00:00:00 2001
> +From: Li Xin <lixin.fnst at cn.fujitsu.com>
> +Date: Thu, 3 Mar 2016 15:23:59 +0900
> +Subject: [PATCH] fep/uim-fep.c: Error Fix
> +
> +uim-1.8.6/fep/uim-fep.c:93:21: error: stropts.h: No such file or directory
> +
> +Upstream-Status: pending
> +
> +Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
> +---
> + fep/uim-fep.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/fep/uim-fep.c b/fep/uim-fep.c
> +index 55dbf7c..3fb62bf 100644
> +--- a/fep/uim-fep.c
> ++++ b/fep/uim-fep.c
> +@@ -90,7 +90,7 @@
> + #include <sys/time.h>
> + #endif
> + #ifdef HAVE_STROPTS_H
> +-#include <stropts.h>
> ++//#include <stropts.h>
> + #endif
> + #ifdef HAVE_SYS_PARAM_H
> + #include <sys/param.h>
> +--
> +1.8.4.2
> +
> diff --git a/meta-oe/recipes-support/uim/uim_1.8.6.bb b/meta-oe/recipes-support/uim/uim_1.8.6.bb
> index ae193b2..acb9443 100644
> --- a/meta-oe/recipes-support/uim/uim_1.8.6.bb
> +++ b/meta-oe/recipes-support/uim/uim_1.8.6.bb
> @@ -3,11 +3,15 @@ HOMEPAGE = "http://uim.freedesktop.org/"
> LICENSE = "BSD-3-Clause & LGPLv2+"
> SECTION = "inputmethods"
>
> +PARALLEL_MAKEINST = ""
> +
> SRC_URI = "http://uim.googlecode.com/files/uim-${PV}.tar.bz2 \
> "
>
> SRC_URI_append_class-target = "file://uim-module-manager.patch \
> - file://0001-fix-bug-for-cross-compile.patch"
> + file://0001-fix-bug-for-cross-compile.patch \
> + file://0001-configure.ac-Error-Fix.patch"
> +SRC_URI_append_class-native = "file://0001-fep-uim-fep.c-Error-Fix.patch"
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=32463fd29aa303fb2360faeeae17256b"
> SRC_URI[md5sum] = "ecea4c597bab1fd4ba98ea84edcece59"
> @@ -19,6 +23,8 @@ DEPENDS_class-target += "intltool-native gtk+ gtk+3 uim-native takao-fonts"
> RDEPENDS_uim = "libuim0 libedit"
> RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0"
>
> +do_configure[depends] += "anthy:do_populate_sysroot"
NAK, how this differs from having anthy in DEPENDS?
Using this strange construct also causes native uim to depends on target
anthy as reported in last status e-mail:
http://lists.openembedded.org/pipermail/openembedded-core/2016-August/124846.html
== Incorrect PACKAGE_ARCH or sstate signatures (2) ===
Complete log: http://logs.nslu2-linux.org/buildlogs/oe/world/log.signatures.20160806_024813.log/
* ERROR: 2 issues were found in these recipes: uim-native
* ERROR: 1 errors found in signatures.qemuarm.do_configure.sigdata.log
* ERROR: 1 errors found in signatures.qemuarm.do_populate_sysroot.sigdata.log
* ERROR: uim-native different signature for task do_configure.sigdata between qemux86copy and qemuarm
* ERROR: 1 errors found in /home/jenkins/oe/world/shr-core/tmp-glibc/sstate-diff/1470487693/signatures.qemuarm.do_configure.sigdata.log
* ERROR: uim-native different signature for task do_populate_sysroot.sigdata between qemux86copy and qemuarm
* ERROR: 1 errors found in /home/jenkins/oe/world/shr-core/tmp-glibc/sstate-diff/1470487693/signatures.qemuarm.do_populate_sysroot.sigdata.log
* ERROR: 2 issues were found in these recipes: uim-native
> +
> LEAD_SONAME = "libuim.so.1"
>
> inherit autotools pkgconfig gettext
> @@ -31,6 +37,8 @@ EXTRA_OECONF += "--disable-emacs \
> --without-mana \
> --without-eb"
>
> +EXTRA_OECONF_append_class-target = " --with-anthy"
> +
> CONFIGUREOPTS_remove_class-target = "--disable-silent-rules"
>
> #Because m4 file's find maxdepth=2, so copy the m4 files of the deep depth.
> @@ -40,6 +48,7 @@ do_configure_prepend () {
>
> do_install_append() {
> rm -rf ${D}/${datadir}/applications
> + rm -f ${D}${datadir}/uim/elatin-rules.scm
> }
>
> PACKAGES += "uim-xim uim-utils uim-skk uim-gtk2.0 uim-gtk3 uim-fep uim-common uim-anthy libuim0 libuim-dev"
> --
> 2.7.4
>
>
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20160808/bdfe1c5e/attachment-0002.sig>
More information about the Openembedded-devel
mailing list