guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit c85d512612d129d499a5785ad830ae03aa9496a2 Author: Yelninei <[email protected]> AuthorDate: Fri Nov 14 10:17:06 2025 +0000 gnu: texinfo-6: Fix tests with newer perl. * gnu/packages/patches/texinfo-6-perl-compat.patch: New patch. * gnu/local.mk (dist-patch_DATA): Add it. * gnu/packages/texinfo.scm (texinfo@6): Add patch. Change-Id: Ic06af1efdfbb8e151c1485d59990bc948c57de66 --- gnu/local.mk | 1 + gnu/packages/patches/texinfo-6-perl-compat.patch | 56 ++++++++++++++++++++++++ gnu/packages/texinfo.scm | 3 +- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/gnu/local.mk b/gnu/local.mk index 6b101b9e300..4a45459af62 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2558,6 +2558,7 @@ dist_patch_DATA = \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-headings-single.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/texinfo-6-perl-compat.patch \ %D%/packages/patches/telegram-desktop-hashmap-incomplete-value.patch \ %D%/packages/patches/telegram-desktop-qguiapp.patch \ %D%/packages/patches/telegram-desktop-unbundle-cppgir.patch \ diff --git a/gnu/packages/patches/texinfo-6-perl-compat.patch b/gnu/packages/patches/texinfo-6-perl-compat.patch new file mode 100644 index 00000000000..1332e57b9a7 --- /dev/null +++ b/gnu/packages/patches/texinfo-6-perl-compat.patch @@ -0,0 +1,56 @@ +Adapted from https://cgit.git.savannah.gnu.org/cgit/texinfo.git/commit/?id=f4ac5b857cf59a58d13e103fe5b7d0d5fe2a52a7 +for texinfo 6. + + +diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm +index 258ef30..c4752bc 100644 +--- a/tp/Texinfo/Convert/Converter.pm ++++ b/tp/Texinfo/Convert/Converter.pm +@@ -1089,7 +1089,7 @@ sub output_no_split($$) + return undef unless $self->_create_destination_directory(); + + my $fh; +- if (! $self->{'output_file'} eq '') { ++ if ($self->{'output_file'} ne '') { + $fh = $self->Texinfo::Common::open_out($self->{'output_file'}); + if (!$fh) { + $self->document_error(sprintf(__("could not open %s for writing: %s"), +diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm +index a689976..8658dbd 100644 +--- a/tp/Texinfo/Convert/DocBook.pm ++++ b/tp/Texinfo/Convert/DocBook.pm +@@ -312,7 +312,7 @@ sub output($$) + return undef unless $self->_create_destination_directory(); + + my $fh; +- if (! $self->{'output_file'} eq '') { ++ if ($self->{'output_file'} ne '') { + $fh = $self->Texinfo::Common::open_out ($self->{'output_file'}); + if (!$fh) { + $self->document_error(sprintf(__("could not open %s for writing: %s"), +diff --git a/tp/Texinfo/Convert/Info.pm b/tp/Texinfo/Convert/Info.pm +index af4fbee..aa8282e 100644 +--- a/tp/Texinfo/Convert/Info.pm ++++ b/tp/Texinfo/Convert/Info.pm +@@ -89,7 +89,7 @@ sub output($) + my $elements = Texinfo::Structuring::split_by_node($root); + + my $fh; +- if (! $self->{'output_file'} eq '') { ++ if ($self->{'output_file'} ne '') { + if ($self->get_conf('VERBOSE')) { + print STDERR "Output file $self->{'output_file'}\n"; + } +diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm +index 5a962a4..217e810 100644 +--- a/tp/Texinfo/Convert/TexinfoXML.pm ++++ b/tp/Texinfo/Convert/TexinfoXML.pm +@@ -454,7 +454,7 @@ sub output($$) + return undef unless $self->_create_destination_directory(); + + my $fh; +- if (! $self->{'output_file'} eq '') { ++ if ($self->{'output_file'} ne '') { + $fh = $self->Texinfo::Common::open_out($self->{'output_file'}); + if (!$fh) { + $self->document_error(sprintf(__("could not open %s for writing: %s"), diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index eef029a0d00..e02843b47f8 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -58,7 +58,8 @@ (method url-fetch) (uri (string-append "mirror://gnu/texinfo/texinfo-" version ".tar.xz")) - (patches (search-patches "texinfo-headings-single.patch")) + (patches (search-patches "texinfo-headings-single.patch" + "texinfo-6-perl-compat.patch")) (sha256 (base32 "1i7yb7mrp3inz25zbzv2pllr4y7d58v818f1as7iz8mw53nm7dwf"))))
