[oe-commits] [meta-openembedded] 13/66: uim: refresh patches

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch master
in repository meta-openembedded.

commit b25363f0cd017d26df733f44849aacfb331e680d
Author: Armin Kuster <akuster808 at gmail.com>
AuthorDate: Sat Apr 7 14:08:03 2018 -0700

    uim: refresh patches
    
    WARNING:
    Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
    The context lines in the patches can be updated with devtool:
    
        devtool modify <recipe>
        devtool finish --force-patch-refresh <recipe> <layer_path>
    
    Then the updated patches and the source tree (in devtool's workspace)
    should be reviewed to make sure the patches apply in the correct place
    and don't introduce duplicate lines (which can, and does happen
    when some of the context is ignored). Further information:
    http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
    https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
    Details:
    checking file scm/Makefile.am
    Hunk #1 succeeded at 119 with fuzz 2 (offset 61 lines).
    
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../uim/uim/0001-Add-support-for-aarch64.patch       |  6 ++----
 .../uim/uim/0001-fix-bug-for-cross-compile.patch     |  6 ++----
 .../recipes-support/uim/uim/uim-module-manager.patch | 20 +++++++++++++++-----
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch b/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch
index 4b12494..391b0e6 100644
--- a/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch
+++ b/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch
@@ -1,9 +1,10 @@
-From 24fd52cc45f7b5ff45afe072f5fbe66485df8c8e Mon Sep 17 00:00:00 2001
+From 82f44f53b9a9766c2ec816f237506beb953eb332 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab at suse.de>
 Date: Wed, 29 Oct 2014 14:18:28 +0100
 Subject: [PATCH] Add support for aarch64
 
 * include/private/gcconfig.h: Add support for aarch64.
+
 ---
  sigscheme/libgcroots/include/private/gcconfig.h | 37 +++++++++++++++++++++++++
  1 file changed, 37 insertions(+)
@@ -77,6 +78,3 @@ index 4d42b03..0f13db6 100644
  # ifdef ARM32
  #   define CPP_WORDSZ 32
  #   define MACH_TYPE "ARM32"
--- 
-2.13.2
-
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 df82b07..0c8f02d 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,9 +1,10 @@
-From 2918196ba782dfa4401bdca917ad4de1910505e0 Mon Sep 17 00:00:00 2001
+From 08b5e51224ed95b1e76e99873b5f9f59840b0a74 Mon Sep 17 00:00:00 2001
 From: Lei Maohui <leimaohui at cn.fujitsu.com>
 Date: Fri, 21 Aug 2015 15:58:42 +0900
 Subject: [PATCH] fix bug for cross compile
 
 Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
+
 ---
  configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -23,6 +24,3 @@ index 9be879c..9249bfd 100644
      AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
          [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
              AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
--- 
-1.8.4.2
-
diff --git a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch
index 8569bf3..3078af0 100644
--- a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch
+++ b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch
@@ -1,11 +1,21 @@
---- uim-1.1.0/scm/Makefile.am~	2006-06-09 10:46:12.000000000 +0900
-+++ uim-1.1.0/scm/Makefile.am	2006-06-19 23:00:15.620000000 +0900
-@@ -58,7 +58,7 @@
-   module_names += "scim"
+From d61495d3fb039842b82df44184c67eb3c1256136 Mon Sep 17 00:00:00 2001
+From: Bian Naimeng <biannm at cn.fujitsu.com>
+Date: Fri, 26 Jun 2015 12:57:48 +0900
+
+---
+ scm/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scm/Makefile.am b/scm/Makefile.am
+index 14d9393..e8a1083 100644
+--- a/scm/Makefile.am
++++ b/scm/Makefile.am
+@@ -119,7 +119,7 @@ if EXPAT
+   module_names += "yahoo-jp"
  endif
  
 -UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager
 +UIM_MODULE_MANAGER = uim-module-manager
  UIM_MODULE_MANAGER_ENV = \
+         LIBUIM_SYSTEM_SCM_FILES=$(abs_top_srcdir)/sigscheme/lib \
          LIBUIM_SCM_FILES=$(abs_srcdir) \
-         LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.