]> code.ossystems Code Review - openembedded-core.git/commitdiff
texinfo: remove enumerate_greater_than_ten.patch
authorRobert Yang <liezhi.yang@windriver.com>
Tue, 28 Apr 2015 03:43:30 +0000 (20:43 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 28 Jun 2015 08:41:51 +0000 (09:41 +0100)
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>
meta/recipes-extended/texinfo/texinfo/enumerate_greater_than_ten.patch [deleted file]

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 (file)
index ef69143..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-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
-