From patchwork Tue Nov 19 15:13:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Hinsen X-Patchwork-Id: 16145 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 2A5CC1777A; Tue, 19 Nov 2019 15:19:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D46D217777 for ; Tue, 19 Nov 2019 15:19:13 +0000 (GMT) Received: from localhost ([::1]:46542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iX5Hc-0001FE-UZ for patchwork@mira.cbaines.net; Tue, 19 Nov 2019 10:19:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50680) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iX5HU-0001F1-MG for guix-patches@gnu.org; Tue, 19 Nov 2019 10:19:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iX5HT-00049u-GX for guix-patches@gnu.org; Tue, 19 Nov 2019 10:19:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39402) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iX5HT-00049o-Dd for guix-patches@gnu.org; Tue, 19 Nov 2019 10:19:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iX5HT-0006xU-77 for guix-patches@gnu.org; Tue, 19 Nov 2019 10:19:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38271] [PATCH] gnu: biber: Update to 2.13. Resent-From: Konrad Hinsen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2019 15:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38271 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38271@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157417670326687 (code B ref -1); Tue, 19 Nov 2019 15:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2019 15:18:23 +0000 Received: from localhost ([127.0.0.1]:48219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iX5Gp-0006wN-FC for submit@debbugs.gnu.org; Tue, 19 Nov 2019 10:18:23 -0500 Received: from lists.gnu.org ([209.51.188.17]:37201) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iX5Gn-0006wF-Gy for submit@debbugs.gnu.org; Tue, 19 Nov 2019 10:18:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50601) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iX5Gl-0001DU-QK for guix-patches@gnu.org; Tue, 19 Nov 2019 10:18:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iX5Gk-0003vX-BK for guix-patches@gnu.org; Tue, 19 Nov 2019 10:18:19 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:40489) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iX5Gj-0003uk-Qo for guix-patches@gnu.org; Tue, 19 Nov 2019 10:18:18 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 32CA351B; Tue, 19 Nov 2019 10:18:15 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Tue, 19 Nov 2019 10:18:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.net; h= from:to:subject:date:message-id:mime-version:content-type; s= fm2; bh=lf3ld5Ym4S1qmli5Aeqwxp6g9ABF6nu7aN9ZLdejb4I=; b=JTPdp7X3 MR0oInCmXoR2WBN7L3bECjqus6/UFUYxbtNHMU1/PtcPhPAuY8CPk5G3uz35o84c L7U53g6G6gpTXY32EjKU9f23CimKfeMmkLOIqKpSIyk5HcjKqUbtWtEleS7JbiV9 GWr5qbKFSaqdkNHAWv5hWKRqWJzAseBPDcnRg5G+X5FFrntLFZP0kEf6Z84zicZu AhT9QZ6mBdOCVN7KdZY/bdf5cgCehQuFWORIWoKNSz2Yl6HlDf36nRdErhNqFv+7 +bzTfTyr8TMIwRSanfAYmRKxDrd5N6vvskmmJIT70Mruv7FURNBIN6dWwRC0wzGl J2Kbuc6KfBCTGw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=lf3ld5Ym4S1qmli5Aeqwxp6g9ABF6 nu7aN9ZLdejb4I=; b=bDXaH0sbTGhrpiZD8bZtPwFYmW5iiRNuoJGV+3kkEcAAN kXFyXrxD6fY+Bi9Y8sqTflt42jkekokmZmxsynDRYLRpVx1K5tlkGXpwrURexzx2 vUc/hoPlw5/hu1pepsH4y6bdm6j1khN+elGQoZ94P9U+svzBveSnpew6K7yK3UDv k/Xz4SgItfE9fTfTR2nghwHUhmWX/7etiB0poM8JCLOreP9XFWqvINRJ6Zcwl1Hs A6pxEXia3+rDpeJcb1/uEpWGcywdNiZRHFA5qfhsUGzC1VgQegT0p+AW4S+vo8rp NJkQnuyazNCt3jn8xpcXurjdEYAf6hs8D9FhCeKmQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrudegkedgjeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkgggtsehttdertddttd dtnecuhfhrohhmpefmohhnrhgrugcujfhinhhsvghnuceokhhonhhrrggurdhhihhnshgv nhesfhgrshhtmhgrihhlrdhnvghtqeenucffohhmrghinhepghhithhhuhgsrdgtohhmne cukfhppeelvddrudeiledrjedruddtudenucfrrghrrghmpehmrghilhhfrhhomhepkhho nhhrrggurdhhihhnshgvnhesfhgrshhtmhgrihhlrdhnvghtnecuvehluhhsthgvrhfuih iivgeptd X-ME-Proxy: Received: from kh-macbookpro.home (lfbn-1-4320-101.w92-169.abo.wanadoo.fr [92.169.7.101]) by mail.messagingengine.com (Postfix) with ESMTPA id 090CD8006A; Tue, 19 Nov 2019 10:18:13 -0500 (EST) From: Konrad Hinsen Date: Tue, 19 Nov 2019 16:13:47 +0100 Message-ID: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tex.scm (biber): Update to 2.13. --- .../patches/biber-fix-encoding-write.patch | 31 ------------------- gnu/packages/tex.scm | 7 ++--- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 gnu/packages/patches/biber-fix-encoding-write.patch diff --git a/gnu/packages/patches/biber-fix-encoding-write.patch b/gnu/packages/patches/biber-fix-encoding-write.patch deleted file mode 100644 index 56cd11212e..0000000000 --- a/gnu/packages/patches/biber-fix-encoding-write.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2a9b15aefb842a734637f3d230936ea1b7c60096 Mon Sep 17 00:00:00 2001 -From: Philip Kime -Date: Thu, 8 Nov 2018 22:02:09 +0100 -Subject: [PATCH] Fix to address #239 - ---- - lib/Biber.pm | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/Biber.pm b/lib/Biber.pm -index 8b1f80a5..d97fca29 100644 ---- a/lib/Biber.pm -+++ b/lib/Biber.pm -@@ -311,6 +311,8 @@ sub parse_ctrlfile { - unless (eval {$checkbuf = File::Slurper::read_text($ctrl_file_path, 'latin1')}) { - biber_error("$ctrl_file_path is not UTF-8 or even latin1, how horrible."); - } -+ # Write ctrl file as UTF-8 -+ File::Slurper::write_text($ctrl_file_path, NFC($checkbuf));# Unicode NFC boundary - } - - $checkbuf = NFD($checkbuf);# Unicode NFD boundary -@@ -319,8 +321,6 @@ sub parse_ctrlfile { - unlink($output) unless $output eq '-';# ignore deletion of STDOUT marker - biber_error("$ctrl_file_path is malformed, last biblatex run probably failed. Deleted $output"); - } -- # Write ctrl file as UTF-8 -- File::Slurper::write_text($ctrl_file_path, NFC($checkbuf));# Unicode NFC boundary - - # Validate if asked to - if (Biber::Config->getoption('validate_control')) { diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d184d7616b..6a81ba7bbd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6035,19 +6035,16 @@ values (strings, macros, or numbers) pasted together.") (define-public biber (package (name "biber") - (version "2.12") + (version "2.13") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/plk/biber/") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - ;; TODO: Patch awaiting inclusion upstream (see: - ;; https://github.com/plk/biber/issues/239). - (patches (search-patches "biber-fix-encoding-write.patch")) (sha256 (base32 - "1g1hi6zvf2hmrjly1sidjaxy5440gfqm4p7p3n7kayshnjsmlskx")))) + "0855nw7cci3812lys20vb3zckyvs5axmyiqa8zf0afsj70kvzj2d")))) (build-system perl-build-system) (arguments `(#:phases