From c47e5edb67689310c3d49f4e2e20dbeaab7689a8 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 9 Mar 2018 20:56:04 +0200 Subject: [PATCH] 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 Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../gtk-doc/files/pkg-config-native.patch | 18 ++++++++---------- 1 file 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 gtk-doc.m4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/gtk-doc.m4 b/gtk-doc.m4 -index 3675543..2590e2a 100644 ---- a/gtk-doc.m4 -+++ b/gtk-doc.m4 -@@ -1,6 +1,6 @@ - dnl -*- mode: autoconf -*- +Index: gtk-doc-1.27/gtk-doc.m4 +=================================================================== +--- gtk-doc-1.27.orig/gtk-doc.m4 ++++ gtk-doc-1.27/gtk-doc.m4 +@@ -25,7 +25,7 @@ + # Macro appear in them. The GNU General Public License (GPL) does govern + # all other use of the material that constitutes the Autoconf Macro. -# serial 2 +# serial 2.1 dnl Usage: dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -@@ -10,11 +10,16 @@ AC_DEFUN([GTK_DOC_CHECK], +@@ -35,11 +35,16 @@ AC_DEFUN([GTK_DOC_CHECK], AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first @@ -39,6 +40,3 @@ index 3675543..2590e2a 100644 if test "$have_gtk_doc" = "no"; then AC_MSG_WARN([ You will not be able to create source packages with 'make dist' --- -2.15.1 -