diff options
author | Ross Burton <ross.burton@intel.com> | 2018-03-09 20:56:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-11 06:27:01 -0700 |
commit | c47e5edb67689310c3d49f4e2e20dbeaab7689a8 (patch) | |
tree | 1183a55e0d4f851254e5018ae450385e990d8a61 | |
parent | 7ef4dd124eed7e52ca4fffed8b79e076ab3592fd (diff) | |
download | poky-c47e5edb67689310c3d49f4e2e20dbeaab7689a8.tar.gz |
gtk-doc: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.
Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450). This is obviously bad.
We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.
(From OE-Core rev: 3277e60b6eefb3a1c858462bc89244f6577dca52)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch index bf03c8f613..bfbc777ff8 100644 --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | |||
@@ -10,19 +10,20 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
10 | gtk-doc.m4 | 7 ++++++- | 10 | gtk-doc.m4 | 7 ++++++- |
11 | 1 file changed, 6 insertions(+), 1 deletion(-) | 11 | 1 file changed, 6 insertions(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/gtk-doc.m4 b/gtk-doc.m4 | 13 | Index: gtk-doc-1.27/gtk-doc.m4 |
14 | index 3675543..2590e2a 100644 | 14 | =================================================================== |
15 | --- a/gtk-doc.m4 | 15 | --- gtk-doc-1.27.orig/gtk-doc.m4 |
16 | +++ b/gtk-doc.m4 | 16 | +++ gtk-doc-1.27/gtk-doc.m4 |
17 | @@ -1,6 +1,6 @@ | 17 | @@ -25,7 +25,7 @@ |
18 | dnl -*- mode: autoconf -*- | 18 | # Macro appear in them. The GNU General Public License (GPL) does govern |
19 | # all other use of the material that constitutes the Autoconf Macro. | ||
19 | 20 | ||
20 | -# serial 2 | 21 | -# serial 2 |
21 | +# serial 2.1 | 22 | +# serial 2.1 |
22 | 23 | ||
23 | dnl Usage: | 24 | dnl Usage: |
24 | dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) | 25 | dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) |
25 | @@ -10,11 +10,16 @@ AC_DEFUN([GTK_DOC_CHECK], | 26 | @@ -35,11 +35,16 @@ AC_DEFUN([GTK_DOC_CHECK], |
26 | AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first | 27 | AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
27 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first | 28 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
28 | 29 | ||
@@ -39,6 +40,3 @@ index 3675543..2590e2a 100644 | |||
39 | if test "$have_gtk_doc" = "no"; then | 40 | if test "$have_gtk_doc" = "no"; then |
40 | AC_MSG_WARN([ | 41 | AC_MSG_WARN([ |
41 | You will not be able to create source packages with 'make dist' | 42 | You will not be able to create source packages with 'make dist' |
42 | -- | ||
43 | 2.15.1 | ||
44 | |||