From 9df397508dc1bc3544534aebc7c658c9754b08b4 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sun, 10 Feb 2019 18:15:10 +0100
Subject: 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'.
---
 gnu/packages/tex.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'gnu/packages/tex.scm')

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 @@ (define-public texlive-bin
             (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:
-- 
cgit v1.2.3