diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-04-07 23:29:43 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:43 -0700 |
commit | d99400a832e5cea1585cfe273833408723707f74 (patch) | |
tree | 86ea65469c0896b53ddd0f4e5f3ebc43e15462c7 /meta-oe | |
parent | a0cbe9f308356a712eaae426818abcf41f44f29e (diff) | |
download | meta-openembedded-contrib-d99400a832e5cea1585cfe273833408723707f74.tar.gz |
anthy: refresh patches
WARNING: anthy-9100h-r0 do_patch:
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:
Applying patch not_build_elc.patch
patching file src-util/Makefile.am
Hunk #1 succeeded at 8 with fuzz 2 (offset 2 lines).
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/anthy/anthy/native-helpers.patch | 38 | ||||
-rw-r--r-- | meta-oe/recipes-support/anthy/anthy/not_build_elc.patch | 11 |
2 files changed, 29 insertions, 20 deletions
diff --git a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch index 291b66b37b..47ce007b7f 100644 --- a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch +++ b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch @@ -3,20 +3,24 @@ author: pH5 comment: Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic, comment: calctrans and proccorpus. ---- anthy-7811/mkanthydic/Makefile.am~ 2006-05-13 18:28:35.000000000 +0900 -+++ anthy-7811/mkanthydic/Makefile.am 2006-06-18 10:56:25.770000000 +0900 -@@ -3,7 +3,7 @@ +Index: anthy-9100h/mkanthydic/Makefile.am +=================================================================== +--- anthy-9100h.orig/mkanthydic/Makefile.am ++++ anthy-9100h/mkanthydic/Makefile.am +@@ -3,7 +3,7 @@ noinst_SCRIPTS = CLEANFILES = anthy.dic - INCLUDES = -I$(top_srcdir)/include -DSRCDIR=\"$(srcdir)\" + INCLUDES = -I$(top_srcdir)/ -DSRCDIR=\"$(srcdir)\" -noinst_PROGRAMS = mkfiledic +bin_PROGRAMS = mkfiledic mkfiledic_SOURCES = mkfiledic.c mkfiledic_LDADD = ../src-diclib/libdiclib.la ---- anthy-7811/depgraph/Makefile.am~ 2006-06-02 00:20:54.000000000 +0900 -+++ anthy-7811/depgraph/Makefile.am 2006-06-18 10:57:19.420000000 +0900 -@@ -9,7 +9,7 @@ +Index: anthy-9100h/depgraph/Makefile.am +=================================================================== +--- anthy-9100h.orig/depgraph/Makefile.am ++++ anthy-9100h/depgraph/Makefile.am +@@ -9,7 +9,7 @@ CLEANFILES = anthy.dep EXTRA_DIST = indepword.txt $(DEPWORDS) # Generate the dictionary @@ -25,10 +29,12 @@ comment: calctrans and proccorpus. mkdepgraph_SOURCES = mkdepgraph.c mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la ---- anthy-7811/mkworddic/Makefile.am~ 2006-05-13 18:29:07.000000000 +0900 -+++ anthy-7811/mkworddic/Makefile.am 2006-06-18 11:21:56.300000000 +0900 -@@ -16,7 +16,8 @@ - udict dict.args.in +Index: anthy-9100h/mkworddic/Makefile.am +=================================================================== +--- anthy-9100h.orig/mkworddic/Makefile.am ++++ anthy-9100h/mkworddic/Makefile.am +@@ -26,7 +26,8 @@ DIC_FILES = @top_srcdir@/alt-cannadic/gc + @top_srcdir@/mkworddic/udict # Generate the dictionary -noinst_PROGRAMS = mkworddic @@ -36,10 +42,12 @@ comment: calctrans and proccorpus. +bin_PROGRAMS = mkworddic mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h mkworddic_LDADD = ../src-worddic/libanthydic.la - ---- anthy-9100e.orig/calctrans/Makefile.am 2008-05-08 15:04:13.000000000 +0200 -+++ anthy-9100e/calctrans/Makefile.am 2008-05-08 15:04:24.000000000 +0200 -@@ -3,7 +3,7 @@ + +Index: anthy-9100h/calctrans/Makefile.am +=================================================================== +--- anthy-9100h.orig/calctrans/Makefile.am ++++ anthy-9100h/calctrans/Makefile.am +@@ -3,7 +3,7 @@ EXTRA_DIST =\ corpus.3.txt corpus.4.txt corpus.5.txt\ corpus_info weak_words diff --git a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch index bf748f3c60..1c5c494003 100644 --- a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch +++ b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch @@ -1,12 +1,13 @@ upstream: not applicable source: stolen from debian -diff -Naur anthy-7811/src-util.orig/Makefile.am anthy-7811/src-util/Makefile.am ---- anthy-7811/src-util.orig/Makefile.am 2006-06-18 10:47:55.790000000 +0900 -+++ anthy-7811/src-util/Makefile.am 2006-06-18 10:48:23.860000000 +0900 -@@ -6,7 +6,8 @@ +Index: anthy-9100h/src-util/Makefile.am +=================================================================== +--- anthy-9100h.orig/src-util/Makefile.am ++++ anthy-9100h/src-util/Makefile.am +@@ -8,7 +8,8 @@ ELISP_FILES = anthy.el anthy-dic.el anth anthy-isearch.el anthy-azik.el anthy-kyuri.el - EXTRA_DIST = $(ELISP_FILES) typetab dic-tool-usage.txt rcsize.rb + EXTRA_DIST = $(ELISP_FILES) typetab dic-tool-usage.txt anthy.i bin_PROGRAMS = anthy-dic-tool anthy-agent anthy-morphological-analyzer -ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc +#ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc |