From: Ross Burton <[email protected]> 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 <[email protected]> Signed-off-by: Alexander Kanavin <[email protected]> --- .../intltool/intltool/perl-522-deprecations.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch index eb52172e10b..f1049e433e2 100644 --- a/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch +++ b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch @@ -10,9 +10,11 @@ Take a patch from Debian to solve this. Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1465010) Signed-off-by: Ross Burton <[email protected]> ---- intltool-0.51.0-ORIG/intltool-update.in 2015-05-27 00:20:43.038379963 +0200 -+++ intltool-0.51.0/intltool-update.in 2015-05-27 00:23:53.309078052 +0200 -@@ -1062,7 +1062,7 @@ +Index: intltool-0.51.0/intltool-update.in +=================================================================== +--- intltool-0.51.0.orig/intltool-update.in ++++ intltool-0.51.0/intltool-update.in +@@ -1062,7 +1062,7 @@ sub SubstituteVariable } } @@ -21,7 +23,7 @@ Signed-off-by: Ross Burton <[email protected]> { my $rest = $3; my $untouched = $1; -@@ -1190,10 +1190,10 @@ +@@ -1190,10 +1190,10 @@ sub FindPackageName $name =~ s/\(+$//g; $version =~ s/\(+$//g; @@ -36,7 +38,7 @@ Signed-off-by: Ross Burton <[email protected]> } if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) -@@ -1219,11 +1219,11 @@ +@@ -1219,11 +1219,11 @@ sub FindPackageName $version =~ s/\(+$//g; $bugurl =~ s/\(+$//g if (defined $bugurl); @@ -52,4 +54,4 @@ Signed-off-by: Ross Burton <[email protected]> + $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/); } - # \s makes this not work, why? \ No newline at end of file + # \s makes this not work, why? -- 2.16.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
