summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-27 20:43:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-30 23:04:14 +0100
commitddc6d09791999ae62b0ca3ea87f624341553a57d (patch)
tree222764668d580a7689c36152084ae1d8219d4fc3 /meta/recipes-extended
parent1bd0115332650d818449ca29777533818f4aa0ab (diff)
downloadpoky-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>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/texinfo/texinfo/enumerate_greater_than_ten.patch51
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 @@
1From 0e70072ce655a0d053bb7433083ced5e6eac74d4 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Thu, 15 Aug 2013 23:49:47 -0700
4Subject: [PATCH] handle correctly @enumerate specification greater than 10
5
6Upstream-Status: Backport
7
8Revision: 5270
9 http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5270
10Author: pertusus
11Date: 2013-07-29 20:02:23 +0000 (Mon, 29 Jul 2013)
12Log 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
23diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
24index 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
36diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
37index 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--
501.7.1
51