From 912be8ec342a04bd4f50c353f2776408fbcfea74 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 31 May 2020 18:55:51 +0200
Subject: gnu: biber: Update to 2.12.

Fixes <https://bugs.gnu.org/41400>.
Reported by Mikhail Tsykalov <tsymsh@gmail.com>.

This essentially reverts 40fd909e3ddee2c46a27a4fe92ed49d3e7ffb413.
This is a followup to the TeX Live 2019 update in
85892948bd9fb5fcc3409a60204cc8b14a4eb030.

* gnu/packages/tex.scm (biber): Update to 2.12.
---
 gnu/packages/patches/biber-sortinithash.patch | 9 +++++++++
 gnu/packages/tex.scm                          | 7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/patches/biber-sortinithash.patch b/gnu/packages/patches/biber-sortinithash.patch
index 1f054d25e4..5a626705e6 100644
--- a/gnu/packages/patches/biber-sortinithash.patch
+++ b/gnu/packages/patches/biber-sortinithash.patch
@@ -17,6 +17,15 @@ index b4f641e..c6f86c7 100644
        \field{extraname}{1}
        \field{sortinit}{L}
 -      \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
++      \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
+       \field{labelnamesource}{author}
+       \field{labeltitlesource}{title}
+       \field{title}{The Title}
+@@ -116,7 +116,7 @@ my $ann2 = q|    \entry{ann2}{misc}{}
+       \strng{authorfullhash}{90ae96c82de92e36949bc64254bbde0c}
+       \field{extraname}{2}
+       \field{sortinit}{L}
+-      \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
 +      \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
        \field{labelnamesource}{author}
        \field{labeltitlesource}{title}
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 683f9d7283..137e000bc5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5916,8 +5916,11 @@ values (strings, macros, or numbers) pasted together.")
 
 (define-public biber
   (package
+    ;; Note: When updating Biber, make sure it matches our BibLaTeX version by
+    ;; checking the Biber/BibLaTeX compatibility matrix in the BibLaTeX manual
+    ;; at <https://ctan.org/pkg/biblatex>.
     (name "biber")
-    (version "2.11")
+    (version "2.12")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -5930,7 +5933,7 @@ values (strings, macros, or numbers) pasted together.")
                                        "biber-sortinithash.patch"))
               (sha256
                (base32
-                "0qgkc1k9n36yfmndwz879pak6mjphld0p85lzn9g2ng0vhxsifzz"))))
+                "1g1hi6zvf2hmrjly1sidjaxy5440gfqm4p7p3n7kayshnjsmlskx"))))
     (build-system perl-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3