summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2013-08-15 23:55:01 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-20 15:31:24 +0100
commitdd1f60ce1a2d20fdd52b566f3a37f63bb3c92bcf (patch)
tree6bc75de948a083f0ead5cc96ca37cf546672d284
parent5cecdfe0551a5a2c573335f74f1c5607a08d0822 (diff)
downloadpoky-dd1f60ce1a2d20fdd52b566f3a37f63bb3c92bcf.tar.gz
texinfo: handle correctly @enumerate specification greater than 10
Backport the patch to fix the error when @enumerate is greater than 10: mpatrol.texi:6356: bad argument to @enumerate (From OE-Core rev: 9dca06b16fc10743ed879221fadb836733a9332c) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch51
-rw-r--r--meta/recipes-extended/texinfo/texinfo_5.1.bb1
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch b/meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch
new file mode 100644
index 0000000000..ef69143bf3
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch
@@ -0,0 +1,51 @@
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
diff --git a/meta/recipes-extended/texinfo/texinfo_5.1.bb b/meta/recipes-extended/texinfo/texinfo_5.1.bb
index 5b38fcca7c..9a56a1c070 100644
--- a/meta/recipes-extended/texinfo/texinfo_5.1.bb
+++ b/meta/recipes-extended/texinfo/texinfo_5.1.bb
@@ -19,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
19 file://disable-native-tools.patch \ 19 file://disable-native-tools.patch \
20 file://link-zip.patch \ 20 file://link-zip.patch \
21 file://dont-depend-on-help2man.patch \ 21 file://dont-depend-on-help2man.patch \
22 file://enumerate_greater_than_ten.patch \
22 ${TARGET_PATCH} \ 23 ${TARGET_PATCH} \
23 " 24 "
24 25