me/guix
Archived
1
0
Fork 0
Code Activity

gnu: poppler: Update to 0.84.0.

Browse source 
* gnu/packages/pdf.scm (poppler): Update to 0.84.0.
* gnu/packages/inkscape.scm (inkscape)[arguments]: Add phase
'adjust-for-new-poppler'.
This commit is contained in:
Marius Bakke 2020-01-09 18:36:50 +01:00
parent 3cc8e029a0
commit 1e5663e2e6
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/inkscape.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2014, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -88,6 +88,19 @@
(substitute* "share/icons/application/CMakeLists.txt" (substitute* "share/icons/application/CMakeLists.txt"
(("gtk-update-icon-cache") "true")) (("gtk-update-icon-cache") "true"))
#t)) #t))
(add-after 'unpack 'adjust-for-new-poppler
(lambda _
(substitute* (find-files "src/extension/internal/pdfinput")
;; Needed for Poppler 0.82.
(("Unicode \\*u") "Unicode const *u")
;; Needed for Poppler 0.83.
(("\\(GfxPath") "(const GfxPath")
(("GfxSubpath") "const GfxSubpath")
(("new GlobalParams\\(\\)")
"std::unique_ptr<GlobalParams>(new GlobalParams())")
(("new GlobalParams\\(poppler_datadir\\)")
"std::unique_ptr<GlobalParams>(new GlobalParams(poppler_datadir))"))
#t))
(add-before 'configure 'dont-use-system-includes (add-before 'configure 'dont-use-system-includes
(lambda _ (lambda _
;; Don't add redundant -isystem includes which confuses GCC7. ;; Don't add redundant -isystem includes which confuses GCC7.

4
gnu/packages/pdf.scm
View file

@ -90,14 +90,14 @@
(define-public poppler (define-public poppler
(package (package
(name "poppler") (name "poppler")
(version "0.79.0") (version "0.84.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://poppler.freedesktop.org/poppler-" (uri (string-append "https://poppler.freedesktop.org/poppler-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1j18jlv1q6h21azb939gqjsgcbsh5qcd8dwxdmad54p5ixha91gr")))) "0ccp2gx05cz5y04k5pgbyi4ikyq60nafa7x2yx4aaf1vfkd318f7"))))
(build-system cmake-build-system) (build-system cmake-build-system)
;; FIXME: ;; FIXME:
;; use libcurl: no ;; use libcurl: no