diff options
-rw-r--r-- | meta-oe/recipes-support/uim/uim/0001-fix-bug-about-stdlib.patch | 40 | ||||
-rw-r--r-- | meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch | 38 | ||||
-rw-r--r-- | meta-oe/recipes-support/uim/uim_1.8.6.bb (renamed from meta-oe/recipes-support/uim/uim_1.3.1.bb) | 15 |
3 files changed, 29 insertions, 64 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 deleted file mode 100644 index 9e6368394c..0000000000 --- a/meta-oe/recipes-support/uim/uim/0001-fix-bug-about-stdlib.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
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 index 61392c94da..df82b07aac 100644 --- 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 | |||
@@ -1,28 +1,28 @@ | |||
1 | From 2e87c39ae3a00b8231ee21a54c47361c1bf502f7 Mon Sep 17 00:00:00 2001 | 1 | From 2918196ba782dfa4401bdca917ad4de1910505e0 Mon Sep 17 00:00:00 2001 |
2 | From: Leimaohui <leimaohui@cn.fujitsu.com> | 2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> |
3 | Date: Fri, 25 Oct 2013 18:23:12 +0900 | 3 | Date: Fri, 21 Aug 2015 15:58:42 +0900 |
4 | Subject: [PATCH] fix bug for cross compile | 4 | Subject: [PATCH] fix bug for cross compile |
5 | 5 | ||
6 | Signed-off-by: leimaohui <leimaohui@cn.fujitsu.com> | 6 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> |
7 | --- | 7 | --- |
8 | configure.ac | 4 ++-- | 8 | configure.ac | 4 ++-- |
9 | 1 files changed, 2 insertions(+), 2 deletions(-) | 9 | 1 file changed, 2 insertions(+), 2 deletions(-) |
10 | 10 | ||
11 | diff --git a/configure.ac b/configure.ac | 11 | diff --git a/configure.ac b/configure.ac |
12 | index 3b64593..57395d4 100644 | 12 | index 9be879c..9249bfd 100644 |
13 | --- a/configure.ac | 13 | --- a/configure.ac |
14 | +++ b/configure.ac | 14 | +++ b/configure.ac |
15 | @@ -601,8 +601,8 @@ AC_HELP_STRING([--with-libedit[=DIR], Enable libedit support | 15 | @@ -1208,8 +1208,8 @@ AC_HELP_STRING([--with-libedit[=DIR], Enable libedit support |
16 | if test "x$use_libedit" != "xno"; then | 16 | if test "x$use_libedit" != "xno"; then |
17 | saved_CPPFLAGS=$CPPFLAGS | 17 | saved_CPPFLAGS=$CPPFLAGS |
18 | saved_LDFLAGS=$LDFLAGS | 18 | saved_LDFLAGS=$LDFLAGS |
19 | - CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" | 19 | - CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" |
20 | - LDFLAGS="${LDFLAGS} -L$libedit_path/lib" | 20 | - LDFLAGS="${LDFLAGS} -L$libedit_path/lib" |
21 | + CPPFLAGS="${CPPFLAGS} " | 21 | + CPPFLAGS="${CPPFLAGS} " |
22 | + LDFLAGS="${LDFLAGS} " | 22 | + LDFLAGS="${LDFLAGS} " |
23 | AC_CHECK_LIB(edit, el_init, | 23 | AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", |
24 | [ | 24 | [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", |
25 | LIBEDIT_LIBS="-ledit -lcurses -l$libedit_path/lib" | 25 | AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") |
26 | -- | 26 | -- |
27 | 1.7.1 | 27 | 1.8.4.2 |
28 | 28 | ||
diff --git a/meta-oe/recipes-support/uim/uim_1.3.1.bb b/meta-oe/recipes-support/uim/uim_1.8.6.bb index 2232405bf1..8f3797f46f 100644 --- a/meta-oe/recipes-support/uim/uim_1.3.1.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.6.bb | |||
@@ -1,17 +1,17 @@ | |||
1 | DESCRIPTION = "A multilingual user input method library" | 1 | DESCRIPTION = "A multilingual user input method library" |
2 | HOMEPAGE = "http://uim.freedesktop.org/" | 2 | HOMEPAGE = "http://uim.freedesktop.org/" |
3 | LICENSE = "BSD" | 3 | LICENSE = "BSD-3-Clause & LGPLv2+" |
4 | SECTION = "inputmethods" | 4 | SECTION = "inputmethods" |
5 | 5 | ||
6 | SRC_URI = "http://uim.googlecode.com/files/uim-${PV}.tar.bz2 \ | 6 | SRC_URI = "http://uim.googlecode.com/files/uim-${PV}.tar.bz2 \ |
7 | file://0001-fix-bug-about-stdlib.patch " | 7 | " |
8 | 8 | ||
9 | SRC_URI_append_class-target = "file://uim-module-manager.patch \ | 9 | SRC_URI_append_class-target = "file://uim-module-manager.patch \ |
10 | file://0001-fix-bug-for-cross-compile.patch" | 10 | file://0001-fix-bug-for-cross-compile.patch" |
11 | 11 | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=9c372efbeca58ce22017a29c1ebf8bf0" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=32463fd29aa303fb2360faeeae17256b" |
13 | SRC_URI[md5sum] = "2832e23d4778bbacbfa4b49bf642d667" | 13 | SRC_URI[md5sum] = "ecea4c597bab1fd4ba98ea84edcece59" |
14 | SRC_URI[sha256sum] = "ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256" | 14 | SRC_URI[sha256sum] = "7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f" |
15 | 15 | ||
16 | DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool" | 16 | DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool" |
17 | DEPENDS_class-target += "gtk+ uim-native takao-fonts" | 17 | DEPENDS_class-target += "gtk+ uim-native takao-fonts" |
@@ -33,6 +33,11 @@ EXTRA_OECONF += "--disable-emacs \ | |||
33 | 33 | ||
34 | CONFIGUREOPTS_remove_class-target = "--disable-silent-rules" | 34 | CONFIGUREOPTS_remove_class-target = "--disable-silent-rules" |
35 | 35 | ||
36 | #Because m4 file's find maxdepth=2, so copy the m4 files of the deep depth. | ||
37 | do_configure_prepend () { | ||
38 | cp ${S}/sigscheme/m4/* ${S}/m4/ | ||
39 | } | ||
40 | |||
36 | PACKAGES += "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy libuim0 libuim-dev" | 41 | PACKAGES += "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy libuim0 libuim-dev" |
37 | 42 | ||
38 | FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ | 43 | FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ |