diff mbox series

[meta-oe,2/2] uim: Upgrade to 1.8.9

Message ID 20240523143951.2957739-2-raj.khem@gmail.com
State New
Headers show
Series [meta-multimedia,1/2] oscam: Upgrade to 1.20 | expand

Commit Message

Khem Raj May 23, 2024, 2:39 p.m. UTC 
Drop upstreamed patch and second patch is no longer needed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...it-path-from-configure-option-proper.patch | 29 -------------------
 .../uim/uim/JMP_BUF_GC_jmp_buf.patch          | 15 ----------
 .../uim/{uim_1.8.8.bb => uim_1.8.9.bb}        |  8 ++---
 3 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch
 delete mode 100644 meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch
 rename meta-oe/recipes-support/uim/{uim_1.8.8.bb => uim_1.8.9.bb} (94%)
diff mbox series

Patch

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 @@ 
-From f828a89cc1e956d56498422ec158d284fc97de3f Mon Sep 17 00:00:00 2001
-From: OBATA Akio <obache@outlook.com>
-Date: Fri, 10 Aug 2018 18:38:18 +0900
-Subject: [PATCH] Fix to set libedit path from configure option properly
-
-Upstream-Status: Backport [https://github.com/uim/uim/pull/134]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 00d1b02..9c0a5ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1311,8 +1311,8 @@ if test "x$with_libedit" != xno; then
-   if test "x$with_libedit" = xyes; then
-     libedit_path=/usr
-   else
--    with_libedit=yes
-     libedit_path="$with_libedit"
-+    with_libedit=yes
-   fi
- 
-   saved_CPPFLAGS=$CPPFLAGS
--- 
-2.23.0
-
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 @@ 
-Fix error pointed out by gcc10
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/sigscheme/libgcroots/include/private/gc_priv.h
-+++ b/sigscheme/libgcroots/include/private/gc_priv.h
-@@ -2026,7 +2026,7 @@ void GC_err_puts(const char *s);
- 
- # if defined(NEED_FIND_LIMIT) || \
-      defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS)
--JMP_BUF GC_jmp_buf;
-+extern JMP_BUF GC_jmp_buf;
- 
- /* Set up a handler for address faults which will longjmp to	*/
- /* 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
similarity index 94%
rename from meta-oe/recipes-support/uim/uim_1.8.8.bb
rename to 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"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8"
 SECTION = "inputmethods"
 
-SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2 \
-    file://0001-Fix-to-set-libedit-path-from-configure-option-proper.patch \
-    file://JMP_BUF_GC_jmp_buf.patch \
-"
+SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2"
 SRC_URI:append:class-target = "\
     file://uim-module-manager.patch \
 "
-SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b"
-SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc"
+SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"