diff options
4 files changed, 207 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/uim/uim/0001-fix-bug-about-stdlib.patch b/meta-oe/recipes-support/uim/uim/0001-fix-bug-about-stdlib.patch new file mode 100644 index 0000000000..9e6368394c --- /dev/null +++ b/meta-oe/recipes-support/uim/uim/0001-fix-bug-about-stdlib.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | From e0e3f82bd2918fdcc722918c108bc33647a4805f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Leimaohui <leimaohui@cn.fujitsu.com> | ||
| 3 | Date: Fri, 25 Oct 2013 18:31:22 +0900 | ||
| 4 | Subject: [PATCH] fix bug about stdlib | ||
| 5 | |||
| 6 | Signed-off-by: leimaohui <leimaohui@cn.fujitsu.com> | ||
| 7 | --- | ||
| 8 | xim/locale.cpp | 3 ++- | ||
| 9 | xim/ximserver.cpp | 1 + | ||
| 10 | 2 files changed, 3 insertions(+), 1 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/xim/locale.cpp b/xim/locale.cpp | ||
| 13 | index 380e945..edfaf03 100644 | ||
| 14 | --- a/xim/locale.cpp | ||
| 15 | +++ b/xim/locale.cpp | ||
| 16 | @@ -35,7 +35,8 @@ | ||
| 17 | #ifdef HAVE_CONFIG_H | ||
| 18 | # include <config.h> | ||
| 19 | #endif | ||
| 20 | - | ||
| 21 | +#include <string.h> | ||
| 22 | +#include <stdlib.h> | ||
| 23 | #include <stdio.h> | ||
| 24 | #include <locale.h> | ||
| 25 | #include <iconv.h> | ||
| 26 | diff --git a/xim/ximserver.cpp b/xim/ximserver.cpp | ||
| 27 | index 245c5f8..cde9918 100644 | ||
| 28 | --- a/xim/ximserver.cpp | ||
| 29 | +++ b/xim/ximserver.cpp | ||
| 30 | @@ -34,6 +34,7 @@ | ||
| 31 | # include <config.h> | ||
| 32 | #endif | ||
| 33 | |||
| 34 | +#include <stdlib.h> | ||
| 35 | #include <stdio.h> | ||
| 36 | #include <ctype.h> | ||
| 37 | #include <locale.h> | ||
| 38 | -- | ||
| 39 | 1.7.1 | ||
| 40 | |||
diff --git a/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch b/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch new file mode 100644 index 0000000000..61392c94da --- /dev/null +++ b/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From 2e87c39ae3a00b8231ee21a54c47361c1bf502f7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Leimaohui <leimaohui@cn.fujitsu.com> | ||
| 3 | Date: Fri, 25 Oct 2013 18:23:12 +0900 | ||
| 4 | Subject: [PATCH] fix bug for cross compile | ||
| 5 | |||
| 6 | Signed-off-by: leimaohui <leimaohui@cn.fujitsu.com> | ||
| 7 | --- | ||
| 8 | configure.ac | 4 ++-- | ||
| 9 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/configure.ac b/configure.ac | ||
| 12 | index 3b64593..57395d4 100644 | ||
| 13 | --- a/configure.ac | ||
| 14 | +++ b/configure.ac | ||
| 15 | @@ -601,8 +601,8 @@ AC_HELP_STRING([--with-libedit[=DIR], Enable libedit support | ||
| 16 | if test "x$use_libedit" != "xno"; then | ||
| 17 | saved_CPPFLAGS=$CPPFLAGS | ||
| 18 | saved_LDFLAGS=$LDFLAGS | ||
| 19 | - CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" | ||
| 20 | - LDFLAGS="${LDFLAGS} -L$libedit_path/lib" | ||
| 21 | + CPPFLAGS="${CPPFLAGS} " | ||
| 22 | + LDFLAGS="${LDFLAGS} " | ||
| 23 | AC_CHECK_LIB(edit, el_init, | ||
| 24 | [ | ||
| 25 | LIBEDIT_LIBS="-ledit -lcurses -l$libedit_path/lib" | ||
| 26 | -- | ||
| 27 | 1.7.1 | ||
| 28 | |||
diff --git a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch new file mode 100644 index 0000000000..8569bf39ef --- /dev/null +++ b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | --- uim-1.1.0/scm/Makefile.am~ 2006-06-09 10:46:12.000000000 +0900 | ||
| 2 | +++ uim-1.1.0/scm/Makefile.am 2006-06-19 23:00:15.620000000 +0900 | ||
| 3 | @@ -58,7 +58,7 @@ | ||
| 4 | module_names += "scim" | ||
| 5 | endif | ||
| 6 | |||
| 7 | -UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager | ||
| 8 | +UIM_MODULE_MANAGER = uim-module-manager | ||
| 9 | UIM_MODULE_MANAGER_ENV = \ | ||
| 10 | LIBUIM_SCM_FILES=$(abs_srcdir) \ | ||
| 11 | LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs | ||
diff --git a/meta-oe/recipes-support/uim/uim_1.3.1.bb b/meta-oe/recipes-support/uim/uim_1.3.1.bb new file mode 100644 index 0000000000..01657dfed0 --- /dev/null +++ b/meta-oe/recipes-support/uim/uim_1.3.1.bb | |||
| @@ -0,0 +1,128 @@ | |||
| 1 | DESCRIPTION = "A multilingual user input method library" | ||
| 2 | HOMEPAGE = "http://uim.freedesktop.org/" | ||
| 3 | LICENSE = "BSD" | ||
| 4 | SECTION = "inputmethods" | ||
| 5 | |||
| 6 | SRC_URI = "http://uim.googlecode.com/files/uim-${PV}.tar.bz2 \ | ||
| 7 | file://0001-fix-bug-about-stdlib.patch " | ||
| 8 | |||
| 9 | SRC_URI_append_class-target = "file://uim-module-manager.patch \ | ||
| 10 | file://0001-fix-bug-for-cross-compile.patch" | ||
| 11 | |||
| 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=9c372efbeca58ce22017a29c1ebf8bf0" | ||
| 13 | SRC_URI[md5sum] = "2832e23d4778bbacbfa4b49bf642d667" | ||
| 14 | SRC_URI[sha256sum] = "ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256" | ||
| 15 | |||
| 16 | DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool" | ||
| 17 | DEPENDS_class-target += "gtk+ uim-native takao-fonts" | ||
| 18 | |||
| 19 | RDEPENDS_uim = "libuim0 libedit" | ||
| 20 | RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0" | ||
| 21 | |||
| 22 | LEAD_SONAME = "libuim.so.1" | ||
| 23 | |||
| 24 | inherit autotools pkgconfig gettext | ||
| 25 | |||
| 26 | EXTRA_OECONF += "--disable-emacs \ | ||
| 27 | --without-scim \ | ||
| 28 | --without-m17nlib \ | ||
| 29 | --without-prime \ | ||
| 30 | --without-canna \ | ||
| 31 | --without-mana \ | ||
| 32 | --without-eb" | ||
| 33 | |||
| 34 | CONFIGUREOPTS_class-target := "${@d.getVar('CONFIGUREOPTS', True).replace('--disable-silent-rules', ' ')}" | ||
| 35 | |||
| 36 | PACKAGES += "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy libuim0 libuim-dev" | ||
| 37 | |||
| 38 | FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ | ||
| 39 | ${libdir}/libuim-custom.so.* \ | ||
| 40 | ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ | ||
| 41 | ${datadir}/locale/fr/LC_MESSAGES/uim.mo \ | ||
| 42 | ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ | ||
| 43 | ${libdir}/libuim.so.*" | ||
| 44 | |||
| 45 | FILES_libuim-dev = "${libdir}/libuim*.a \ | ||
| 46 | ${libdir}/libuim*.la \ | ||
| 47 | ${libdir}/libuim*.so \ | ||
| 48 | ${includedir}/uim \ | ||
| 49 | ${libdir}/pkgconfig/uim.pc" | ||
| 50 | |||
| 51 | FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ | ||
| 52 | ${datadir}/uim/anthy*.scm" | ||
| 53 | |||
| 54 | FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" | ||
| 55 | FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" | ||
| 56 | |||
| 57 | FILES_uim-utils = "${bindir}/uim-sh \ | ||
| 58 | ${bindir}/uim-module-manager \ | ||
| 59 | ${libexecdir}/uim-helper-server" | ||
| 60 | |||
| 61 | FILES_uim-xim = "${bindir}/uim-xim \ | ||
| 62 | ${libexecdir}/uim-candwin-gtk \ | ||
| 63 | ${datadir}/man/man1/uim-xim.1 \ | ||
| 64 | ${sysconfdir}/X11/xinit/xinput.d/uim*" | ||
| 65 | |||
| 66 | FILES_uim-common = "${datadir}/uim/pixmaps/*.png \ | ||
| 67 | ${datadir}/uim" | ||
| 68 | |||
| 69 | FILES_uim-fep = "${bindir}/uim-fep*" | ||
| 70 | FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \ | ||
| 71 | ${bindir}/uim-toolbar-gtk* \ | ||
| 72 | ${bindir}/uim-*-gtk \ | ||
| 73 | ${bindir}/uim-input-pad-ja \ | ||
| 74 | ${datadir}/uim/helperdata/uim-dict-ui.xml" | ||
| 75 | |||
| 76 | FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ | ||
| 77 | ${datadir}/uim/skk*.scm" | ||
| 78 | |||
| 79 | pkg_postinst_uim-anthy() { | ||
| 80 | if [ -f /usr/bin/uim-module-manager ]; then | ||
| 81 | /usr/bin/uim-module-manager --register anthy --path /etc/uim | ||
| 82 | fi | ||
| 83 | } | ||
| 84 | |||
| 85 | pkg_postrm_uim-anthy() { | ||
| 86 | if [ -f /usr/bin/uim-module-manager ]; then | ||
| 87 | /usr/bin/uim-module-manager --path /etc/uim --unregister anthy | ||
| 88 | fi | ||
| 89 | } | ||
| 90 | |||
| 91 | pkg_prerm_uim-anthy() { | ||
| 92 | if [ -f /usr/bin/uim-module-manager ]; then | ||
| 93 | /usr/bin/uim-module-manager --register anthy --path /etc/uim | ||
| 94 | fi | ||
| 95 | } | ||
| 96 | |||
| 97 | pkg_postinst_uim-gtk2.0() { | ||
| 98 | gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules | ||
| 99 | } | ||
| 100 | |||
| 101 | pkg_postinst_uim-skk() { | ||
| 102 | if [ -f /usr/bin/uim-module-manager ]; then | ||
| 103 | /usr/bin/uim-module-manager --register skk --path /etc/uim | ||
| 104 | fi | ||
| 105 | } | ||
| 106 | |||
| 107 | pkg_postrm_uim-skk() { | ||
| 108 | if [ -f /usr/bin/uim-module-manager ]; then | ||
| 109 | /usr/bin/uim-module-manager --path /etc/uim --unregister skk | ||
| 110 | fi | ||
| 111 | } | ||
| 112 | |||
| 113 | pkg_postinst_uim-common() { | ||
| 114 | if [ -f /usr/bin/uim-module-manager ]; then | ||
| 115 | /usr/bin/uim-module-manager --path /etc/uim --register \ | ||
| 116 | tutcode tcode hangul viqr \ | ||
| 117 | ipa-x-sampa latin byeoru | ||
| 118 | fi | ||
| 119 | } | ||
| 120 | |||
| 121 | pkg_prerm_uim-common() { | ||
| 122 | if [ -f /usr/bin/uim-module-manager ]; then | ||
| 123 | /usr/bin/uim-module-manager --path /etc/uim --register \ | ||
| 124 | tutcode tcode hangul viqr ipa-x-sampa latin byeoru | ||
| 125 | fi | ||
| 126 | } | ||
| 127 | |||
| 128 | BBCLASSEXTEND = "native" | ||
