diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-03-08 20:17:54 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-09 09:17:03 -0800 |
| commit | ed9924f814be50b56670fa43ca137eb3c7e19c2d (patch) | |
| tree | 5ed00cc02b5bc0d4b680eba0a1684d7fd9cdbdff /meta/recipes-devtools | |
| parent | 08e76acbafde2ff2c32d334cbffa3e7dad29554b (diff) | |
| download | poky-ed9924f814be50b56670fa43ca137eb3c7e19c2d.tar.gz | |
intltool: 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: 1fa0faebd24740556816042f54d399baf84731b2)
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>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch | 14 |
1 files 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 eb52172e10..f1049e433e 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. | |||
| 10 | Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1465010) | 10 | Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1465010) |
| 11 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 11 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 12 | 12 | ||
| 13 | --- intltool-0.51.0-ORIG/intltool-update.in 2015-05-27 00:20:43.038379963 +0200 | 13 | Index: intltool-0.51.0/intltool-update.in |
| 14 | +++ intltool-0.51.0/intltool-update.in 2015-05-27 00:23:53.309078052 +0200 | 14 | =================================================================== |
| 15 | @@ -1062,7 +1062,7 @@ | 15 | --- intltool-0.51.0.orig/intltool-update.in |
| 16 | +++ intltool-0.51.0/intltool-update.in | ||
| 17 | @@ -1062,7 +1062,7 @@ sub SubstituteVariable | ||
| 16 | } | 18 | } |
| 17 | } | 19 | } |
| 18 | 20 | ||
| @@ -21,7 +23,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
| 21 | { | 23 | { |
| 22 | my $rest = $3; | 24 | my $rest = $3; |
| 23 | my $untouched = $1; | 25 | my $untouched = $1; |
| 24 | @@ -1190,10 +1190,10 @@ | 26 | @@ -1190,10 +1190,10 @@ sub FindPackageName |
| 25 | $name =~ s/\(+$//g; | 27 | $name =~ s/\(+$//g; |
| 26 | $version =~ s/\(+$//g; | 28 | $version =~ s/\(+$//g; |
| 27 | 29 | ||
| @@ -36,7 +38,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
| 36 | } | 38 | } |
| 37 | 39 | ||
| 38 | if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) | 40 | if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) |
| 39 | @@ -1219,11 +1219,11 @@ | 41 | @@ -1219,11 +1219,11 @@ sub FindPackageName |
| 40 | $version =~ s/\(+$//g; | 42 | $version =~ s/\(+$//g; |
| 41 | $bugurl =~ s/\(+$//g if (defined $bugurl); | 43 | $bugurl =~ s/\(+$//g if (defined $bugurl); |
| 42 | 44 | ||
| @@ -52,4 +54,4 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
| 52 | + $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/); | 54 | + $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/); |
| 53 | } | 55 | } |
| 54 | 56 | ||
| 55 | # \s makes this not work, why? \ No newline at end of file | 57 | # \s makes this not work, why? |