core/texinfo to 7.1-1

This commit is contained in:
Kevin Mihelich 2023-10-25 12:56:19 +00:00
parent 6d04342c6f
commit a8014fadae
2 changed files with 16 additions and 14 deletions

View file

@ -7,7 +7,7 @@
# - perl patch to fix a2ps FTBFS
pkgname=texinfo
pkgver=7.0.3
pkgver=7.1
pkgrel=1
pkgdesc='GNU documentation system for on-line information and printed output'
arch=(x86_64)
@ -19,11 +19,11 @@ source=(https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
texinfo-install.hook
texinfo-remove.hook
perl.patch)
sha256sums=('74b420d09d7f528e84f97aa330f0dd69a98a6053e7a4e01767eed115038807bf'
sha256sums=('deeec9f19f159e046fdf8ad22231981806dac332cc372f1c763504ad82b30953'
'SKIP'
'5409fc3aa8a35e8f3d901e96bc50c986f204d90ce6bface0a7d79d99b487f801'
'913ca8aac84386399b0a83ed0f6b04b5e6322da62f5c1d7ed31e1050ed37c1a9'
'fbd35efe4a3000612ca120ba95af555dd2244c40280b2ef78f55d786bb6131cd')
'c079f32e2b4fa0b6e4baab230943101435c15ad8417d171ac50587d16ed8d926')
validpgpkeys=('EAF669B31E31E1DECBD11513DDBC579DAB37FBA9') # Gavin Smith
prepare() {

View file

@ -1,11 +1,13 @@
--- texinfo-7.0.1/tp/Texinfo/ParserNonXS.pm.orig 2022-11-30 18:06:28.000000000 +0100
+++ texinfo-7.0.1/tp/Texinfo/ParserNonXS.pm 2022-12-13 11:17:37.240447516 +0100
@@ -4357,7 +4357,7 @@
and ($current->{'parent'}->{'type'} eq 'menu_comment'
or $current->{'parent'}->{'type'} eq 'menu_entry_description')
and $asterisk
- and @{$current->{'contents'}}
+ and ref($current->{'contents'}) eq "ARRAY"
and $current->{'contents'}->[-1]->{'type'}
and $current->{'contents'}->[-1]->{'type'} eq 'empty_line'
and $current->{'contents'}->[-1]->{'text'} eq '') {
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 7aafb825e0..9510f12ddf 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -5030,7 +5030,7 @@ sub _handle_menu_entry_separators($$$$$$)
and ($current->{'parent'}->{'type'} eq 'menu_comment'
or $current->{'parent'}->{'type'} eq 'menu_entry_description')
and $asterisk
- and $current->{'contents'}
+ and ref($current->{'contents'}) eq "ARRAY"
and $current->{'contents'}->[-1]->{'type'}
and $current->{'contents'}->[-1]->{'type'} eq 'empty_line'
and $current->{'contents'}->[-1]->{'text'} eq '') {