summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/uim
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 14:08:03 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:38 -0700
commitb25363f0cd017d26df733f44849aacfb331e680d (patch)
tree8171019b6cd80413d054d214b4da578f133e73b1 /meta-oe/recipes-support/uim
parent843dbb093d8691d459876ebf35be0a6cb183606c (diff)
downloadmeta-openembedded-b25363f0cd017d26df733f44849aacfb331e680d.tar.gz
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@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/uim')
-rw-r--r--meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch6
-rw-r--r--meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch6
-rw-r--r--meta-oe/recipes-support/uim/uim/uim-module-manager.patch20
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 4b1249436..391b0e68b 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 @@
1From 24fd52cc45f7b5ff45afe072f5fbe66485df8c8e Mon Sep 17 00:00:00 2001 1From 82f44f53b9a9766c2ec816f237506beb953eb332 Mon Sep 17 00:00:00 2001
2From: Andreas Schwab <schwab@suse.de> 2From: Andreas Schwab <schwab@suse.de>
3Date: Wed, 29 Oct 2014 14:18:28 +0100 3Date: Wed, 29 Oct 2014 14:18:28 +0100
4Subject: [PATCH] Add support for aarch64 4Subject: [PATCH] Add support for aarch64
5 5
6* include/private/gcconfig.h: Add support for aarch64. 6* include/private/gcconfig.h: Add support for aarch64.
7
7--- 8---
8 sigscheme/libgcroots/include/private/gcconfig.h | 37 +++++++++++++++++++++++++ 9 sigscheme/libgcroots/include/private/gcconfig.h | 37 +++++++++++++++++++++++++
9 1 file changed, 37 insertions(+) 10 1 file changed, 37 insertions(+)
@@ -77,6 +78,3 @@ index 4d42b03..0f13db6 100644
77 # ifdef ARM32 78 # ifdef ARM32
78 # define CPP_WORDSZ 32 79 # define CPP_WORDSZ 32
79 # define MACH_TYPE "ARM32" 80 # define MACH_TYPE "ARM32"
80--
812.13.2
82
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 df82b07aa..0c8f02d6c 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 @@
1From 2918196ba782dfa4401bdca917ad4de1910505e0 Mon Sep 17 00:00:00 2001 1From 08b5e51224ed95b1e76e99873b5f9f59840b0a74 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com> 2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Fri, 21 Aug 2015 15:58:42 +0900 3Date: Fri, 21 Aug 2015 15:58:42 +0900
4Subject: [PATCH] fix bug for cross compile 4Subject: [PATCH] fix bug for cross compile
5 5
6Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> 6Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
7
7--- 8---
8 configure.ac | 4 ++-- 9 configure.ac | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-) 10 1 file changed, 2 insertions(+), 2 deletions(-)
@@ -23,6 +24,3 @@ index 9be879c..9249bfd 100644
23 AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", 24 AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
24 [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", 25 [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
25 AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") 26 AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
26--
271.8.4.2
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
index 8569bf39e..3078af058 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 @@
1--- uim-1.1.0/scm/Makefile.am~ 2006-06-09 10:46:12.000000000 +0900 1From d61495d3fb039842b82df44184c67eb3c1256136 Mon Sep 17 00:00:00 2001
2+++ uim-1.1.0/scm/Makefile.am 2006-06-19 23:00:15.620000000 +0900 2From: Bian Naimeng <biannm@cn.fujitsu.com>
3@@ -58,7 +58,7 @@ 3Date: Fri, 26 Jun 2015 12:57:48 +0900
4 module_names += "scim" 4
5---
6 scm/Makefile.am | 2 +-
7 1 file changed, 1 insertion(+), 1 deletion(-)
8
9diff --git a/scm/Makefile.am b/scm/Makefile.am
10index 14d9393..e8a1083 100644
11--- a/scm/Makefile.am
12+++ b/scm/Makefile.am
13@@ -119,7 +119,7 @@ if EXPAT
14 module_names += "yahoo-jp"
5 endif 15 endif
6 16
7-UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager 17-UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager
8+UIM_MODULE_MANAGER = uim-module-manager 18+UIM_MODULE_MANAGER = uim-module-manager
9 UIM_MODULE_MANAGER_ENV = \ 19 UIM_MODULE_MANAGER_ENV = \
20 LIBUIM_SYSTEM_SCM_FILES=$(abs_top_srcdir)/sigscheme/lib \
10 LIBUIM_SCM_FILES=$(abs_srcdir) \ 21 LIBUIM_SCM_FILES=$(abs_srcdir) \
11 LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs