summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch29
-rw-r--r--meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch15
-rw-r--r--meta-oe/recipes-support/uim/uim_1.8.9.bb (renamed from meta-oe/recipes-support/uim/uim_1.8.8.bb)8
3 files changed, 2 insertions, 50 deletions
diff --git a/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch b/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch
deleted file mode 100644
index 34a1ea0fa2..0000000000
--- a/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From f828a89cc1e956d56498422ec158d284fc97de3f Mon Sep 17 00:00:00 2001
2From: OBATA Akio <obache@outlook.com>
3Date: Fri, 10 Aug 2018 18:38:18 +0900
4Subject: [PATCH] Fix to set libedit path from configure option properly
5
6Upstream-Status: Backport [https://github.com/uim/uim/pull/134]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9---
10 configure.ac | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/configure.ac b/configure.ac
14index 00d1b02..9c0a5ec 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -1311,8 +1311,8 @@ if test "x$with_libedit" != xno; then
18 if test "x$with_libedit" = xyes; then
19 libedit_path=/usr
20 else
21- with_libedit=yes
22 libedit_path="$with_libedit"
23+ with_libedit=yes
24 fi
25
26 saved_CPPFLAGS=$CPPFLAGS
27--
282.23.0
29
diff --git a/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch b/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch
deleted file mode 100644
index adb9c4b06b..0000000000
--- a/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Fix error pointed out by gcc10
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5--- a/sigscheme/libgcroots/include/private/gc_priv.h
6+++ b/sigscheme/libgcroots/include/private/gc_priv.h
7@@ -2026,7 +2026,7 @@ void GC_err_puts(const char *s);
8
9 # if defined(NEED_FIND_LIMIT) || \
10 defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS)
11-JMP_BUF GC_jmp_buf;
12+extern JMP_BUF GC_jmp_buf;
13
14 /* Set up a handler for address faults which will longjmp to */
15 /* GC_jmp_buf; */
diff --git a/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-oe/recipes-support/uim/uim_1.8.9.bb
index e0d9d05dce..f78c82f18a 100644
--- a/meta-oe/recipes-support/uim/uim_1.8.8.bb
+++ b/meta-oe/recipes-support/uim/uim_1.8.9.bb
@@ -4,15 +4,11 @@ LICENSE = "BSD-3-Clause & LGPL-2.0-or-later"
4LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" 4LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8"
5SECTION = "inputmethods" 5SECTION = "inputmethods"
6 6
7SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2 \ 7SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2"
8 file://0001-Fix-to-set-libedit-path-from-configure-option-proper.patch \
9 file://JMP_BUF_GC_jmp_buf.patch \
10"
11SRC_URI:append:class-target = "\ 8SRC_URI:append:class-target = "\
12 file://uim-module-manager.patch \ 9 file://uim-module-manager.patch \
13" 10"
14SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b" 11SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4"
15SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc"
16 12
17UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" 13UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
18 14