diff options
Diffstat (limited to 'gnu/packages/tex.scm')
| -rw-r--r-- | gnu/packages/tex.scm | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ec35315f22..765eaf4be4 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -111,12 +111,12 @@ "&id=" revision)) (file-name (string-append "texlive-bin-" name)) (sha256 (base32 hash))))) - (arch-revision "e1975bce0b9d270d7c9773c5beb7e87d61ee8f57")) + (arch-revision "418dd6f008c3d41a461353fdb60f2d73d87c58ed")) (append (search-patches "texlive-bin-CVE-2018-17407.patch" "texlive-bin-luatex-poppler-compat.patch") (list - (arch-patch "pdftex-poppler0.72.patch" arch-revision - "0p46b6xxxg2s3hx67r0wpz16g3qygx65hpc581xs3jz5pvsiq3y7") + (arch-patch "pdftex-poppler0.75.patch" arch-revision + "1cqpcp7h1qyxyp3wjbpcmx2wgvj9ywpz60hvy280mp9w633yzyg3") (arch-patch "xetex-poppler-fixes.patch" arch-revision "1jj1p5zkjljb7id9pjv29cw0cf8mwrgrh4ackgzz9c200vaqpsvx"))))))) (build-system gnu-build-system) @@ -197,11 +197,24 @@ #t)) (add-after 'unpack 'use-code-for-new-poppler (lambda _ - (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc" "texk/web2c/pdftexdir/pdftoepdf.cc") - (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.75.0.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 and later. + (substitute* (append + (find-files "texk/web2c/luatexdir/" "\\.(cc|w)$") + '("texk/web2c/pdftexdir/pdftosrc.cc")) + (("GBool") "bool") + (("gFalse") "false") + (("gTrue") "true") + (("getCString") "c_str") + (("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: |