summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2013-08-15 23:55:01 -0700
committerSaul Wold <sgw@linux.intel.com>2013-08-20 07:09:05 -0700
commit9dca06b16fc10743ed879221fadb836733a9332c (patch)
tree98ef9c17f5bbed391b6fe20a5effafbd9affb1ff /meta/recipes-extended
parent01777e78639888d437b103ebafefccd932631bfd (diff)
downloadopenembedded-core-9dca06b16fc10743ed879221fadb836733a9332c.tar.gz
openembedded-core-9dca06b16fc10743ed879221fadb836733a9332c.tar.bz2
openembedded-core-9dca06b16fc10743ed879221fadb836733a9332c.zip
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 Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended')
-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 @@
+From 0e70072ce655a0d053bb7433083ced5e6eac74d4 Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang@windriver.com>
+Date: Thu, 15 Aug 2013 23:49:47 -0700
+Subject: [PATCH] handle correctly @enumerate specification greater than 10
+
+Upstream-Status: Backport
+
+Revision: 5270
+ http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5270
+Author: pertusus
+Date: 2013-07-29 20:02:23 +0000 (Mon, 29 Jul 2013)
+Log Message:
+-----------
+ * tp/Common.pm (enumerate_item_representation), Texinfo/Parser.pm:
+ handle correctly @enumerate specification greater than 10. Report
+ from Dmitry Shachnev.
+
+---
+ tp/Texinfo/Common.pm | 2 +-
+ tp/Texinfo/Parser.pm | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
+index 8aee9f7..bdffeee 100644
+--- a/tp/Texinfo/Common.pm
++++ b/tp/Texinfo/Common.pm
+@@ -1382,7 +1382,7 @@ sub enumerate_item_representation($$)
+ my $specification = shift;
+ my $number = shift;
+
+- if ($specification =~ /^[0-9]$/) {
++ if ($specification =~ /^[0-9]+$/) {
+ return $specification + $number -1;
+ }
+
+diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
+index cf8fa72..8e845e9 100644
+--- a/tp/Texinfo/Parser.pm
++++ b/tp/Texinfo/Parser.pm
+@@ -2973,7 +2973,7 @@ sub _end_line($$$)
+ $current->{'cmdname'});
+ }
+ my $arg = $current->{'extra'}->{'block_command_line_contents'}->[0]->[0];
+- if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^[[:alnum:]]$/) {
++ if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^(([[:digit:]]+)|([[:alpha:]]+))$/) {
+ $self->_command_error($current, $line_nr,
+ $self->__("bad argument to \@%s"),
+ $current->{'cmdname'});
+--
+1.7.1
+
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 \
file://disable-native-tools.patch \
file://link-zip.patch \
file://dont-depend-on-help2man.patch \
+ file://enumerate_greater_than_ten.patch \
${TARGET_PATCH} \
"