commit 196dd692bbcb699db20baf7dc3c4298ca53f660a Author: Tim Biermann <tbier@posteo.de> Date: Tue Jan 3 13:20:36 2023 +0000 biber: cherry picked commit for perl 5.36 diff --git a/biber/.signature b/biber/.signature index b665763c8..7a7231c06 100644 --- a/biber/.signature +++ b/biber/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wr2tm0uNyncMrpuHUVZFwWFrX9uDXj1cSob5b1zCrBjZa5jUzBes2rru6ISv91SmhnblomGQfkC9d10fEhV/wM= -SHA256 (Pkgfile) = 36ca60b7b7fe49c340c8c840a6557672e4c65bf74aacb61c9517fa9743febd95 +RWSagIOpLGJF37Wq79dJFMq3m0ObxSiLZBqZ3S3DBSRFudVN9pfVw3LZtYWHF3RRQuJgRkn2yxWOTCXmMeQnwx1Wz/6XiPLl4wU= +SHA256 (Pkgfile) = e31e4011c348b4d1bdab2821ad080a9fedc57ae07cf1718c91c39a36250e261d SHA256 (.footprint) = 9f5881d20498274226db0b107c3b8d21c80124a8f3fd6a85c88f05ad442fb5b9 SHA256 (biber-2.17.tar.gz) = 1ee7efdd8343e982046f2301c1b0dcf09e1f9a997ac86ed1018dcb41d04c9e88 +SHA256 (perl5.36.patch) = 9d40d6c346770bc509f4e251a17da652b21c5069168102d8117b2b5236f6918d diff --git a/biber/Pkgfile b/biber/Pkgfile index fa870e609..e82e8ed6f 100644 --- a/biber/Pkgfile +++ b/biber/Pkgfile @@ -1,17 +1,22 @@ # Description: tex bibtex plugin biber # URL: http://biblatex-biber.sourceforge.net # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: p5-autovivification p5-business-isbn p5-business-ismn p5-business-issn p5-data-compare p5-data-dump p5-file-find-rule p5-data-uniqid p5-datetime-calendar-julian p5-datetime-format-builder p5-file-slurper p5-class-accessor p5-io-string p5-ipc-run3 p5-lingua-translit p5-list-allutils p5-log-log4perl p5-lwp-protocol-https p5-mozilla-ca p5-perlio-utf8-strict p5-regexp-common p5-sort-key p5-text-bibtex p5-text-csv p5-text-roman p5-unicode-linebreak p5-xml-libxml-simple p5-xml-libxslt p5-xml-writer p5-module-build p5-test-differences p5-parse-recdescent +# Depends on: p5-autovivification p5-business-isbn p5-business-ismn p5-business-issn p5-class-accessor p5-data-compare p5-data-dump p5-data-uniqid p5-datetime-calendar-julian p5-datetime-format-builder p5-file-find-rule p5-file-slurper p5-io-string p5-ipc-run3 p5-lingua-translit p5-log-log4perl p5-lwp-protocol-https p5-mozilla-ca p5-parse-recdescent p5-perlio-utf8-strict p5-regexp-common p5-sort-key p5-test-differences p5-text-bibtex p5-text-csv p5-text-roman p5-unicode-linebreak p5-xml-libxml-simple p5-xml-libxslt p5-xml-writer name=biber version=2.17 -release=1 -source=(https://github.com/plk/biber/archive/v$version/$name-$version.tar.gz) +release=2 +source=(https://github.com/plk/biber/archive/v$version/$name-$version.tar.gz + perl5.36.patch) build() { cd $name-$version + + patch -Np1 -i $SRC/perl5.36.patch + perl ./Build.PL ./Build ./Build install destdir=$PKG + find $PKG -name .packlist | xargs rm } diff --git a/biber/perl5.36.patch b/biber/perl5.36.patch new file mode 100644 index 000000000..895813c1f --- /dev/null +++ b/biber/perl5.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?= <ppisar@redhat.com> +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; + }