* [PATCH 0/1] texinfo: handle correctly @enumerate specification greater than 10 @ 2013-08-16 7:16 jackie.huang 2013-08-16 7:16 ` [PATCH 1/1] " jackie.huang 2013-08-16 8:45 ` [PATCH 0/1] " jhuang0 0 siblings, 2 replies; 4+ messages in thread From: jackie.huang @ 2013-08-16 7:16 UTC (permalink / raw) To: openembedded-core From: Jackie Huang <jackie.huang@windriver.com> The following changes since commit 57662d4f813d5795cac1529633db80a09efdb089: meta-skeleton: Add busybox config fragment example (2013-08-13 23:03:44 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib jhuang0/d_texinfo_mpatrol_0816_1 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_texinfo_mpatrol_0816_1 Jackie Huang (1): texinfo: handle correctly @enumerate specification greater than 10 .../texinfo-5.1/enumerate_greater_than_ten.patch | 51 ++++++++++++++++++++ meta/recipes-extended/texinfo/texinfo_5.1.bb | 1 + 2 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch -- 1.7.4.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] texinfo: handle correctly @enumerate specification greater than 10 2013-08-16 7:16 [PATCH 0/1] texinfo: handle correctly @enumerate specification greater than 10 jackie.huang @ 2013-08-16 7:16 ` jackie.huang 2013-08-16 8:45 ` [PATCH 0/1] " jhuang0 1 sibling, 0 replies; 4+ messages in thread From: jackie.huang @ 2013-08-16 7:16 UTC (permalink / raw) To: openembedded-core From: Jackie Huang <jackie.huang@windriver.com> 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> --- .../texinfo-5.1/enumerate_greater_than_ten.patch | 51 ++++++++++++++++++++ meta/recipes-extended/texinfo/texinfo_5.1.bb | 1 + 2 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch 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 0000000..f07693e --- /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 0f4b4af..5b3d729 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} \ " -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/1] texinfo: handle correctly @enumerate specification greater than 10 2013-08-16 7:16 [PATCH 0/1] texinfo: handle correctly @enumerate specification greater than 10 jackie.huang 2013-08-16 7:16 ` [PATCH 1/1] " jackie.huang @ 2013-08-16 8:45 ` jhuang0 2013-08-20 10:52 ` jhuang0 1 sibling, 1 reply; 4+ messages in thread From: jhuang0 @ 2013-08-16 8:45 UTC (permalink / raw) To: openembedded-core On 8/16/2013 3:16 PM, jackie.huang@windriver.com wrote: > From: Jackie Huang <jackie.huang@windriver.com> > > The following changes since commit 57662d4f813d5795cac1529633db80a09efdb089: > > meta-skeleton: Add busybox config fragment example (2013-08-13 23:03:44 +0100) > > are available in the git repository at: > git://git.pokylinux.org/poky-contrib jhuang0/d_texinfo_mpatrol_0816_1 > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_texinfo_mpatrol_0816_1 Sorry that the removing of a trailing white space in the patch would cause patching fail, plase use the updated one: The following changes since commit 57662d4f813d5795cac1529633db80a09efdb089: meta-skeleton: Add busybox config fragment example (2013-08-13 23:03:44 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib jhuang0/d_texinfo_mpatrol_0816_2 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_texinfo_mpatrol_0816_2 Jackie Huang (1): texinfo: handle correctly @enumerate specification greater than 10 .../texinfo-5.1/enumerate_greater_than_ten.patch | 51 ++++++++++++++++++++ meta/recipes-extended/texinfo/texinfo_5.1.bb | 1 + 2 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch -- 1.7.4.1 Thanks, Jackie > > Jackie Huang (1): > texinfo: handle correctly @enumerate specification greater than 10 > > .../texinfo-5.1/enumerate_greater_than_ten.patch | 51 ++++++++++++++++++++ > meta/recipes-extended/texinfo/texinfo_5.1.bb | 1 + > 2 files changed, 52 insertions(+), 0 deletions(-) > create mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch > -- Jackie Huang WIND RIVER | China Development Center MSN:jackielily@hotmail.com Tel: +86 8477 8594 Mobile: +86 138 1027 4745 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 0/1] texinfo: handle correctly @enumerate specification greater than 10 2013-08-16 8:45 ` [PATCH 0/1] " jhuang0 @ 2013-08-20 10:52 ` jhuang0 0 siblings, 0 replies; 4+ messages in thread From: jhuang0 @ 2013-08-20 10:52 UTC (permalink / raw) To: openembedded-core Added signed-off in the patch: The following changes since commit 57662d4f813d5795cac1529633db80a09efdb089: meta-skeleton: Add busybox config fragment example (2013-08-13 23:03:44 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib jhuang0/d_texinfo_mpatrol_0820_0 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_texinfo_mpatrol_0820_0 Jackie Huang (1): texinfo: handle correctly @enumerate specification greater than 10 .../texinfo-5.1/enumerate_greater_than_ten.patch | 53 ++++++++++++++++++++ meta/recipes-extended/texinfo/texinfo_5.1.bb | 1 + 2 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch Thanks, Jackie On 8/16/2013 4:45 PM, jhuang0 wrote: > > > On 8/16/2013 3:16 PM, jackie.huang@windriver.com wrote: >> From: Jackie Huang <jackie.huang@windriver.com> >> >> The following changes since commit >> 57662d4f813d5795cac1529633db80a09efdb089: >> >> meta-skeleton: Add busybox config fragment example (2013-08-13 >> 23:03:44 +0100) >> >> are available in the git repository at: >> git://git.pokylinux.org/poky-contrib jhuang0/d_texinfo_mpatrol_0816_1 >> >> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_texinfo_mpatrol_0816_1 >> > > Sorry that the removing of a trailing white space in the patch would > cause patching fail, plase use the updated one: > > The following changes since commit > 57662d4f813d5795cac1529633db80a09efdb089: > > meta-skeleton: Add busybox config fragment example (2013-08-13 > 23:03:44 +0100) > > are available in the git repository at: > git://git.pokylinux.org/poky-contrib jhuang0/d_texinfo_mpatrol_0816_2 > > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_texinfo_mpatrol_0816_2 > > > Jackie Huang (1): > texinfo: handle correctly @enumerate specification greater than 10 > > .../texinfo-5.1/enumerate_greater_than_ten.patch | 51 > ++++++++++++++++++++ > meta/recipes-extended/texinfo/texinfo_5.1.bb | 1 + > 2 files changed, 52 insertions(+), 0 deletions(-) > create mode 100644 > meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch > > -- > 1.7.4.1 > > Thanks, > Jackie > >> >> Jackie Huang (1): >> texinfo: handle correctly @enumerate specification greater than 10 >> >> .../texinfo-5.1/enumerate_greater_than_ten.patch | 51 >> ++++++++++++++++++++ >> meta/recipes-extended/texinfo/texinfo_5.1.bb | 1 + >> 2 files changed, 52 insertions(+), 0 deletions(-) >> create mode 100644 >> meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch >> >> > -- Jackie Huang WIND RIVER | China Development Center MSN:jackielily@hotmail.com Tel: +86 8477 8594 Mobile: +86 138 1027 4745 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-20 10:52 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-08-16 7:16 [PATCH 0/1] texinfo: handle correctly @enumerate specification greater than 10 jackie.huang 2013-08-16 7:16 ` [PATCH 1/1] " jackie.huang 2013-08-16 8:45 ` [PATCH 0/1] " jhuang0 2013-08-20 10:52 ` jhuang0
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox