diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-04-27 20:43:30 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-30 23:04:14 +0100 |
| commit | ddc6d09791999ae62b0ca3ea87f624341553a57d (patch) | |
| tree | 222764668d580a7689c36152084ae1d8219d4fc3 | |
| parent | 1bd0115332650d818449ca29777533818f4aa0ab (diff) | |
| download | poky-ddc6d09791999ae62b0ca3ea87f624341553a57d.tar.gz | |
texinfo: remove enumerate_greater_than_ten.patch
It is a backport patch, and verified that the patch is in the source.
(From OE-Core rev: a46976b9de5a2270f041a73661a6ed635bf4eb43)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/texinfo/texinfo/enumerate_greater_than_ten.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo/enumerate_greater_than_ten.patch b/meta/recipes-extended/texinfo/texinfo/enumerate_greater_than_ten.patch deleted file mode 100644 index ef69143bf3..0000000000 --- a/meta/recipes-extended/texinfo/texinfo/enumerate_greater_than_ten.patch +++ /dev/null | |||
| @@ -1,51 +0,0 @@ | |||
| 1 | From 0e70072ce655a0d053bb7433083ced5e6eac74d4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
| 3 | Date: Thu, 15 Aug 2013 23:49:47 -0700 | ||
| 4 | Subject: [PATCH] handle correctly @enumerate specification greater than 10 | ||
| 5 | |||
| 6 | Upstream-Status: Backport | ||
| 7 | |||
| 8 | Revision: 5270 | ||
| 9 | http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5270 | ||
| 10 | Author: pertusus | ||
| 11 | Date: 2013-07-29 20:02:23 +0000 (Mon, 29 Jul 2013) | ||
| 12 | Log Message: | ||
| 13 | ----------- | ||
| 14 | * tp/Common.pm (enumerate_item_representation), Texinfo/Parser.pm: | ||
| 15 | handle correctly @enumerate specification greater than 10. Report | ||
| 16 | from Dmitry Shachnev. | ||
| 17 | |||
| 18 | --- | ||
| 19 | tp/Texinfo/Common.pm | 2 +- | ||
| 20 | tp/Texinfo/Parser.pm | 2 +- | ||
| 21 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 22 | |||
| 23 | diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm | ||
| 24 | index 8aee9f7..bdffeee 100644 | ||
| 25 | --- a/tp/Texinfo/Common.pm | ||
| 26 | +++ b/tp/Texinfo/Common.pm | ||
| 27 | @@ -1382,7 +1382,7 @@ sub enumerate_item_representation($$) | ||
| 28 | my $specification = shift; | ||
| 29 | my $number = shift; | ||
| 30 | |||
| 31 | - if ($specification =~ /^[0-9]$/) { | ||
| 32 | + if ($specification =~ /^[0-9]+$/) { | ||
| 33 | return $specification + $number -1; | ||
| 34 | } | ||
| 35 | |||
| 36 | diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm | ||
| 37 | index cf8fa72..8e845e9 100644 | ||
| 38 | --- a/tp/Texinfo/Parser.pm | ||
| 39 | +++ b/tp/Texinfo/Parser.pm | ||
| 40 | @@ -2973,7 +2973,7 @@ sub _end_line($$$) | ||
| 41 | $current->{'cmdname'}); | ||
| 42 | } | ||
| 43 | my $arg = $current->{'extra'}->{'block_command_line_contents'}->[0]->[0]; | ||
| 44 | - if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^[[:alnum:]]$/) { | ||
| 45 | + if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^(([[:digit:]]+)|([[:alpha:]]+))$/) { | ||
| 46 | $self->_command_error($current, $line_nr, | ||
| 47 | $self->__("bad argument to \@%s"), | ||
| 48 | $current->{'cmdname'}); | ||
| 49 | -- | ||
| 50 | 1.7.1 | ||
| 51 | |||
