summary refs log tree commit diff
path: root/gnu/packages/tex.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-02-10 18:15:10 +0100
committerMarius Bakke <mbakke@fastmail.com>2019-02-11 19:48:31 +0100
commit9df397508dc1bc3544534aebc7c658c9754b08b4 (patch)
tree7a59d005f6f8c691e35e37b6f20a5b5a5bcabfa9 /gnu/packages/tex.scm
parent35b259eed055e288eadb2365b5ab4e8b15f363a7 (diff)
downloadguix-9df397508dc1bc3544534aebc7c658c9754b08b4.tar.gz
gnu: poppler: Update to 0.74.0.
* gnu/packages/patches/scribus-poppler-0.73.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/scribus.scm (scribus)[source](patches): Add it.
* gnu/packages/pdf.scm (poppler): Update to 0.74.0.
[arguments]: Adjust renamed configure flag.
* gnu/packages/tex.scm (texlive-bin)[arguments]: Add phase 'use-code-for-even-newer-poppler'.
Diffstat (limited to 'gnu/packages/tex.scm')
-rw-r--r--gnu/packages/tex.scm9
1 files changed, 9 insertions, 0 deletions
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 5f294dc84c..631fb8319f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -200,6 +200,15 @@
             (copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc"
                        "texk/web2c/pdftexdir/pdftosrc.cc")
             #t))
+        (add-after 'use-code-for-new-poppler 'use-code-for-even-newer-poppler
+          (lambda _
+            ;; Adjust for deprecated types in Poppler 0.73.
+            (substitute* (append
+                          (find-files "texk/web2c/luatexdir/" "\\.(cc|w)$")
+                          '("texk/web2c/pdftexdir/pdftosrc.cc"))
+              (("Guint") "unsigned int")
+              (("Guchar") "unsigned char"))
+            #t))
         (add-after 'unpack 'disable-failing-test
           (lambda _
             ;; FIXME: This test fails on 32-bit architectures since Glibc 2.28: