From 472c6fbd0fbcdee3634de26dee10ab9dad4805d7 Mon Sep 17 00:00:00 2001 From: PoroCYon Date: Mon, 3 Oct 2022 23:12:54 +0200 Subject: [PATCH] biber: add patch to fix biber on perl 5.36 --- .../patches/0001-Adapt_to_Perl_5.36.patch | 40 +++++++++++++++++++ srcpkgs/biber/template | 7 ++-- 2 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/biber/patches/0001-Adapt_to_Perl_5.36.patch diff --git a/srcpkgs/biber/patches/0001-Adapt_to_Perl_5.36.patch b/srcpkgs/biber/patches/0001-Adapt_to_Perl_5.36.patch new file mode 100644 index 00000000000..895813c1f29 --- /dev/null +++ b/srcpkgs/biber/patches/0001-Adapt_to_Perl_5.36.patch @@ -0,0 +1,40 @@ +From d9e961710074d266ad6bdf395c98868d91952088 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 25 May 2022 12:41:59 +0200 +Subject: [PATCH] Adapt to Perl 5.36 + +A developmental release of Perl 5.36.0 fails to run tests with: + + $ perl -Ilib t/basic-misc.t + 1..72 + Can't modify undef operator in scalar assignment at lib/Biber/Section.pm line 433, near "undef;" + Compilation failed in require at lib/Biber.pm line 24. + BEGIN failed--compilation aborted at lib/Biber.pm line 24. + Compilation failed in require at t/basic-misc.t line 11. + BEGIN failed--compilation aborted at t/basic-misc.t line 11. + # Looks like your test exited with 255 before it could output anything. + +This is because of a missing semicolon between commands in +del_everykeys(). The new perl is more strict and raises a compile-time +error: + + $ perl -e '$a = undef $b = undef;' + Can't modify undef operator in scalar assignment at -e line 1, near "undef;" + Execution of -e aborted due to compilation errors. +--- + lib/Biber/Section.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Biber/Section.pm b/lib/Biber/Section.pm +index 03ed69a51..a78942f57 100644 +--- a/lib/Biber/Section.pm ++++ b/lib/Biber/Section.pm +@@ -429,7 +429,7 @@ sub add_everykey { + + sub del_everykeys { + my $self = shift; +- $self->{everykey} = undef ++ $self->{everykey} = undef; + $self->{everykey_lc} = undef; + return; + } diff --git a/srcpkgs/biber/template b/srcpkgs/biber/template index cb5a3a076c2..a0f35b1b7d8 100644 --- a/srcpkgs/biber/template +++ b/srcpkgs/biber/template @@ -1,8 +1,7 @@ # Template file for 'biber' pkgname=biber version=2.16 -revision=1 -wrksrc="${pkgname}-${version}" +revision=2 build_style=perl-ModuleBuild hostmakedepends="perl-Module-Build" makedepends="perl-ExtUtils-LibBuilder" @@ -20,13 +19,13 @@ depends="perl-autovivification perl-Encode-EUCJPASCII perl-Encode-HanExtra perl-Encode-JIS2K - perl-ExtUtils-LibBuilder + perl-ExtUtils-LibBuilder perl-File-Slurper perl-IO-String perl-IPC-Run3 perl-Lingua-Translit perl-List-AllUtils - perl-List-MoreUtils + perl-List-MoreUtils perl-List-MoreUtils-XS perl-Log-Log4perl perl-LWP-Protocol-https