From patchwork Tue Apr 25 16:18:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 49505 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B301327BBEA; Tue, 25 Apr 2023 17:19:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5A43F27BBE2 for ; Tue, 25 Apr 2023 17:19:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prLNg-0006nX-JO; Tue, 25 Apr 2023 12:19:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prLNe-0006js-OV for guix-patches@gnu.org; Tue, 25 Apr 2023 12:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1prLNe-00052H-G7 for guix-patches@gnu.org; Tue, 25 Apr 2023 12:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1prLNe-0003Wn-BO for guix-patches@gnu.org; Tue, 25 Apr 2023 12:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63070] [PATCH] gnu: biber: Fix build with new Perl. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Apr 2023 16:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63070 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63070@debbugs.gnu.org Cc: Josselin Poiret X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168243952913537 (code B ref -1); Tue, 25 Apr 2023 16:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Apr 2023 16:18:49 +0000 Received: from localhost ([127.0.0.1]:53434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prLNM-0003WB-Tk for submit@debbugs.gnu.org; Tue, 25 Apr 2023 12:18:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:37608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prLNH-0003Vu-Is for submit@debbugs.gnu.org; Tue, 25 Apr 2023 12:18:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prLNG-0004bu-TA for guix-patches@gnu.org; Tue, 25 Apr 2023 12:18:38 -0400 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prLNB-0004uM-VF for guix-patches@gnu.org; Tue, 25 Apr 2023 12:18:38 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 555EE184F2B; Tue, 25 Apr 2023 16:18:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682439511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=gEnJvs2o9vEQ3/xJRtWBItD4fvZK+c1Q33oraMIlCao=; b=vDujuF7X3feg25OhbvmC2WGt6hy13d6+DgbexKu2hBVhqGSkxwnnVvVFEyfCpEwOSTdsA+ IZxZkP6IYpFp59J+9OKPgJCbxm3JhpYwlK8dN79kcjAtKgu32jJHB1otBVPRNAhZEeN4wm PBoKujd6Z2ddex/u04MFVHP9G1iIE1BnAMb+4/6B6qFYMUYY2li6jjm4tImHGrDflOWBkR ck5CDis7s/IsgVWbpRkTy05cr0EuGrSRunb4QpEpvOkKATrtfj3qgYVPcMfeNfEU9mdVCK /ggQrPxtNBN1yvcow0vBiJyYz025swUttds1BFSGMOByeA2lcTwLiTsCZYp5fg== Date: Tue, 25 Apr 2023 18:18:30 +0200 Message-Id: <7983a6e0e6aab37e0a449d061d8377b3d9fb9bbf.1682439510.git.dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: ++++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/biber-adapt-perl-5.36.patch: Backport patch from upstream's 760e6e4ec08a3097f7e6136331541a7b8c1c9df7. * gnu/packages/tex.scm (biber): Use it. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../patches/biber-adapt-perl-5.36.patch | 40 +++++++++++++++++++ gnu/packages/tex.scm | 3 +- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/biber-adapt-perl-5.36.patch base-commit: 3a37e3ecd8ae0bcc0e5d00393fa9365d611bcb71 diff --git a/gnu/local.mk b/gnu/local.mk index 66dd240ba9..a714734bca 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -944,6 +944,7 @@ dist_patch_DATA = \ %D%/packages/patches/bsd-games-stdio.h.patch \ %D%/packages/patches/beancount-disable-googleapis-fonts.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ + %D%/packages/patches/biber-adapt-perl-5.36.patch \ %D%/packages/patches/bidiv-update-fribidi.patch \ %D%/packages/patches/binutils-boot-2.20.1a.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ diff --git a/gnu/packages/patches/biber-adapt-perl-5.36.patch b/gnu/packages/patches/biber-adapt-perl-5.36.patch new file mode 100644 index 0000000000..895813c1f2 --- /dev/null +++ b/gnu/packages/patches/biber-adapt-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/gnu/packages/tex.scm b/gnu/packages/tex.scm index 79c791c89d..a2f1de4e35 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8832,7 +8832,8 @@ (define-public biber (file-name (git-file-name name version)) (sha256 (base32 - "0586q8y1f2k23mvb02ccm3qsb35cwskafksixsjaih7a7xcf5gxx")))) + "0586q8y1f2k23mvb02ccm3qsb35cwskafksixsjaih7a7xcf5gxx")) + (patches (search-patches "biber-adapt-perl-5.36.patch")))) (build-system perl-build-system) (arguments `(#:phases