gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

texinfoInteractive: add patch for perl 5.42

Browse Source 
Add patch for perl 5.42 from Debian that fixes syntax warnings causing test
failures via Texinfo::Convert::Coverter and Texinfo::Convert::LaTeX

The patch is only applied if:

- Versions =< 7.2, since this is fixed in later git releases of texinfo

- interactive = true, since tests are disabled for other cases, and
  applying it for all cases causes a mass rebuild.
This commit is contained in:
Stig Palmquist
2025-11-30 16:47:16 +01:00
parent 21e7891af4
commit 668b0b4e48
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/texinfo/common.nix
+7 -1
View File
@@ -38,6 +38,7 @@ let
optional
optionals
optionalString
versionAtLeast
versionOlder
;
crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform;
@@ -52,7 +53,12 @@ stdenv.mkDerivation {
inherit hash;
};
patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch;
patches =
patches
++ optional (
interactive && versionAtLeast version "7.2"
) ./fix-test-suite-failures-with-perl-5.42.patch
++ optional crossBuildTools ./cross-tools-flags.patch;
postPatch = ''
patchShebangs tp/maintain/regenerate_commands_perl_info.pl
pkgs/development/tools/misc/texinfo/fix-test-suite-failures-with-perl-5.42.patch
+41
View File
@@ -0,0 +1,41 @@
>From 1af3c9b91625e4d115ea979c45a75752b872c10f Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Sat, 13 Sep 2025 08:57:55 +0100
Subject: [PATCH] Fix test suite failures with Perl 5.42
The precedence issues here were flagged by new diagnostics in Perl 5.42,
and the resulting warnings caused test failures.
---
tp/Texinfo/Convert/Converter.pm | 2 +-
tp/Texinfo/Convert/LaTeX.pm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 5e14a9e..89e623b 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -386,7 +386,7 @@ sub output_tree($$)
my $fh;
my $encoded_output_file;
- if (! $output_file eq '') {
+ if ($output_file ne '') {
my $path_encoding;
($encoded_output_file, $path_encoding)
= $self->encoded_output_file_name($output_file);
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index ae947d1..f4ba076 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1085,7 +1085,7 @@ sub output($$)
my $fh;
my $encoded_output_file;
- if (! $output_file eq '') {
+ if ($output_file ne '') {
my $path_encoding;
($encoded_output_file, $path_encoding)
= $self->encoded_output_file_name($output_file);
--
2.51.0