Re: TeX Live 2019 wanted

[Marius Bakke]

Andreas Enge <address@hidden> writes:

> I gave it a try, dropped the patches, then the phase use-code-for-new-poppler
> fails for texlive-bin; maybe these poppler phases can be dropped, but I am
> not quite familiar with them.

The 'use-code-for-new-poppler' phase needs to be rewritten along these
lines (for both 2018 and 2019):

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d184d7616b..9184bd1552 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -238,6 +238,15 @@ copied to their outputs; otherwise the 
TEXLIVE-BUILD-SYSTEM is used."
     (sha256 (base32
              "1b8zigzg8raxkhhzphcmynf84rbdbj2ym2qkz24v8n0qx82zmqms"))))
 
+(define (texlive-svn-file name revision hash)
+  (origin
+    (method url-fetch)
+    (uri (string-append "https://tug.org/svn/texlive/trunk/Build/source/";
+                        name "?revision=" revision "&view=co"))
+    (file-name (string-append "texlive-" (match (string-split name #\/)
+                                           ((dirs ... file-name) file-name))))
+    (sha256 (base32 hash))))
+
 (define-public texlive-bin
   (package
    (name "texlive-bin")
@@ -285,6 +294,12 @@ copied to their outputs; otherwise the 
TEXLIVE-BUILD-SYSTEM is used."
           (sha256
            (base32
             "0wrjls1y9b4k1z10l9l8w2l3yjcw7v7by2y16kchdpkiyldlkry6"))))
+      ("pdftosrc-poppler-compat"
+       ,(texlive-svn-file "texk/web2c/pdftexdir/pdftosrc-poppler0.83.0.cc" 
"52959"
+                          
"0iq2cmwvf2lxy32sygrafwqgcwvvbdnvxm5l3mrg9cb2a1g06380"))
+      ("pdftoepdf-poppler-compat"
+       ,(texlive-svn-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.83.0.cc" 
"52959"
+                          
"0981acbsig4pqbhg3a2ghiygd0zv1kqvmncacigfzvpj5r5k8px1"))
       ("cairo" ,cairo)
       ("fontconfig" ,fontconfig)
       ("fontforge" ,fontforge)
@@ -356,10 +371,10 @@ copied to their outputs; otherwise the 
TEXLIVE-BUILD-SYSTEM is used."
                (string-append "\"" (assoc-ref inputs "ghostscript") 
"/bin/gs\"")))
             #t))
         (add-after 'unpack 'use-code-for-new-poppler
-          (lambda _
-            (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc"
+          (lambda* (#:key inputs #:allow-other-keys)
+            (copy-file (assoc-ref inputs "pdftoepdf-poppler-compat")
                        "texk/web2c/pdftexdir/pdftoepdf.cc")
-            (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc"
+            (copy-file (assoc-ref inputs "pdftosrc-poppler-compat")
                        "texk/web2c/pdftexdir/pdftosrc.cc")
             #t))
         (add-after 'use-code-for-new-poppler 'use-code-for-even-newer-poppler

Can you try that?

Wrt the other TeX packages, I think %texlive-tag and %texlive-revision
from (guix build-system texlive) needs to be bumped, and all the hashes
changed accordingly.

Thanks!

signature.asc
Description: PGP signature