[oe-commits] [openembedded-core] 31/43: gtk-doc: refresh patches

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 3277e60b6eefb3a1c858462bc89244f6577dca52
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Fri Mar 9 20:56:04 2018 +0200

    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.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 .../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 bf03c8f..bfbc777 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 at intel.com>
  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
-

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.