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-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 291b66b37..47ce007b7 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 | |||
3 | comment: Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic, | 3 | comment: Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic, |
4 | comment: calctrans and proccorpus. | 4 | comment: calctrans and proccorpus. |
5 | 5 | ||
6 | --- anthy-7811/mkanthydic/Makefile.am~ 2006-05-13 18:28:35.000000000 +0900 | 6 | Index: anthy-9100h/mkanthydic/Makefile.am |
7 | +++ anthy-7811/mkanthydic/Makefile.am 2006-06-18 10:56:25.770000000 +0900 | 7 | =================================================================== |
8 | @@ -3,7 +3,7 @@ | 8 | --- anthy-9100h.orig/mkanthydic/Makefile.am |
9 | +++ anthy-9100h/mkanthydic/Makefile.am | ||
10 | @@ -3,7 +3,7 @@ noinst_SCRIPTS = | ||
9 | CLEANFILES = anthy.dic | 11 | CLEANFILES = anthy.dic |
10 | INCLUDES = -I$(top_srcdir)/include -DSRCDIR=\"$(srcdir)\" | 12 | INCLUDES = -I$(top_srcdir)/ -DSRCDIR=\"$(srcdir)\" |
11 | 13 | ||
12 | -noinst_PROGRAMS = mkfiledic | 14 | -noinst_PROGRAMS = mkfiledic |
13 | +bin_PROGRAMS = mkfiledic | 15 | +bin_PROGRAMS = mkfiledic |
14 | mkfiledic_SOURCES = mkfiledic.c | 16 | mkfiledic_SOURCES = mkfiledic.c |
15 | mkfiledic_LDADD = ../src-diclib/libdiclib.la | 17 | mkfiledic_LDADD = ../src-diclib/libdiclib.la |
16 | 18 | ||
17 | --- anthy-7811/depgraph/Makefile.am~ 2006-06-02 00:20:54.000000000 +0900 | 19 | Index: anthy-9100h/depgraph/Makefile.am |
18 | +++ anthy-7811/depgraph/Makefile.am 2006-06-18 10:57:19.420000000 +0900 | 20 | =================================================================== |
19 | @@ -9,7 +9,7 @@ | 21 | --- anthy-9100h.orig/depgraph/Makefile.am |
22 | +++ anthy-9100h/depgraph/Makefile.am | ||
23 | @@ -9,7 +9,7 @@ CLEANFILES = anthy.dep | ||
20 | EXTRA_DIST = indepword.txt $(DEPWORDS) | 24 | EXTRA_DIST = indepword.txt $(DEPWORDS) |
21 | 25 | ||
22 | # Generate the dictionary | 26 | # Generate the dictionary |
@@ -25,10 +29,12 @@ comment: calctrans and proccorpus. | |||
25 | mkdepgraph_SOURCES = mkdepgraph.c | 29 | mkdepgraph_SOURCES = mkdepgraph.c |
26 | mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la | 30 | mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la |
27 | 31 | ||
28 | --- anthy-7811/mkworddic/Makefile.am~ 2006-05-13 18:29:07.000000000 +0900 | 32 | Index: anthy-9100h/mkworddic/Makefile.am |
29 | +++ anthy-7811/mkworddic/Makefile.am 2006-06-18 11:21:56.300000000 +0900 | 33 | =================================================================== |
30 | @@ -16,7 +16,8 @@ | 34 | --- anthy-9100h.orig/mkworddic/Makefile.am |
31 | udict dict.args.in | 35 | +++ anthy-9100h/mkworddic/Makefile.am |
36 | @@ -26,7 +26,8 @@ DIC_FILES = @top_srcdir@/alt-cannadic/gc | ||
37 | @top_srcdir@/mkworddic/udict | ||
32 | 38 | ||
33 | # Generate the dictionary | 39 | # Generate the dictionary |
34 | -noinst_PROGRAMS = mkworddic | 40 | -noinst_PROGRAMS = mkworddic |
@@ -36,10 +42,12 @@ comment: calctrans and proccorpus. | |||
36 | +bin_PROGRAMS = mkworddic | 42 | +bin_PROGRAMS = mkworddic |
37 | mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h | 43 | mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h |
38 | mkworddic_LDADD = ../src-worddic/libanthydic.la | 44 | mkworddic_LDADD = ../src-worddic/libanthydic.la |
39 | 45 | ||
40 | --- anthy-9100e.orig/calctrans/Makefile.am 2008-05-08 15:04:13.000000000 +0200 | 46 | Index: anthy-9100h/calctrans/Makefile.am |
41 | +++ anthy-9100e/calctrans/Makefile.am 2008-05-08 15:04:24.000000000 +0200 | 47 | =================================================================== |
42 | @@ -3,7 +3,7 @@ | 48 | --- anthy-9100h.orig/calctrans/Makefile.am |
49 | +++ anthy-9100h/calctrans/Makefile.am | ||
50 | @@ -3,7 +3,7 @@ EXTRA_DIST =\ | ||
43 | corpus.3.txt corpus.4.txt corpus.5.txt\ | 51 | corpus.3.txt corpus.4.txt corpus.5.txt\ |
44 | corpus_info weak_words | 52 | corpus_info weak_words |
45 | 53 | ||
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 bf748f3c6..1c5c49400 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 @@ | |||
1 | upstream: not applicable | 1 | upstream: not applicable |
2 | source: stolen from debian | 2 | source: stolen from debian |
3 | 3 | ||
4 | diff -Naur anthy-7811/src-util.orig/Makefile.am anthy-7811/src-util/Makefile.am | 4 | Index: anthy-9100h/src-util/Makefile.am |
5 | --- anthy-7811/src-util.orig/Makefile.am 2006-06-18 10:47:55.790000000 +0900 | 5 | =================================================================== |
6 | +++ anthy-7811/src-util/Makefile.am 2006-06-18 10:48:23.860000000 +0900 | 6 | --- anthy-9100h.orig/src-util/Makefile.am |
7 | @@ -6,7 +6,8 @@ | 7 | +++ anthy-9100h/src-util/Makefile.am |
8 | @@ -8,7 +8,8 @@ ELISP_FILES = anthy.el anthy-dic.el anth | ||
8 | anthy-isearch.el anthy-azik.el anthy-kyuri.el | 9 | anthy-isearch.el anthy-azik.el anthy-kyuri.el |
9 | EXTRA_DIST = $(ELISP_FILES) typetab dic-tool-usage.txt rcsize.rb | 10 | EXTRA_DIST = $(ELISP_FILES) typetab dic-tool-usage.txt anthy.i |
10 | bin_PROGRAMS = anthy-dic-tool anthy-agent anthy-morphological-analyzer | 11 | bin_PROGRAMS = anthy-dic-tool anthy-agent anthy-morphological-analyzer |
11 | -ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc | 12 | -ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc |
12 | +#ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc | 13 | +#ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc |