[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/08: gnu: poppler: Update to 0.84.0.
From: |
guix-commits |
Subject: |
02/08: gnu: poppler: Update to 0.84.0. |
Date: |
Mon, 13 Jan 2020 18:19:25 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 1e5663e2e63e1e1dab116d3e84a7e5852922ed31
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Jan 9 18:36:50 2020 +0100
gnu: poppler: Update to 0.84.0.
* gnu/packages/pdf.scm (poppler): Update to 0.84.0.
* gnu/packages/inkscape.scm (inkscape)[arguments]: Add phase
'adjust-for-new-poppler'.
---
gnu/packages/inkscape.scm | 15 ++++++++++++++-
gnu/packages/pdf.scm | 4 ++--
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index 1ad23a9..0bd8b94 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2014 John Darrington <address@hidden>
;;; Copyright © 2014, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2016, 2018 Ricardo Wurmus <address@hidden>
-;;; Copyright © 2017 Marius Bakke <address@hidden>
+;;; Copyright © 2017, 2020 Marius Bakke <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -88,6 +88,19 @@
(substitute* "share/icons/application/CMakeLists.txt"
(("gtk-update-icon-cache") "true"))
#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
(lambda _
;; Don't add redundant -isystem includes which confuses GCC7.
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 368b2ce..32a45ed 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -90,14 +90,14 @@
(define-public poppler
(package
(name "poppler")
- (version "0.79.0")
+ (version "0.84.0")
(source (origin
(method url-fetch)
(uri (string-append "https://poppler.freedesktop.org/poppler-"
version ".tar.xz"))
(sha256
(base32
- "1j18jlv1q6h21azb939gqjsgcbsh5qcd8dwxdmad54p5ixha91gr"))))
+ "0ccp2gx05cz5y04k5pgbyi4ikyq60nafa7x2yx4aaf1vfkd318f7"))))
(build-system cmake-build-system)
;; FIXME:
;; use libcurl: no
- branch core-updates updated (3963fc7 -> 8589294), guix-commits, 2020/01/13
- 01/08: gnu: Add ruby-hydra., guix-commits, 2020/01/13
- 05/08: gnu: texlive-bin: Do not build static libraries., guix-commits, 2020/01/13
- 03/08: build-system/texlive: Update to texlive-2019.3, revision 51265., guix-commits, 2020/01/13
- 06/08: gnu: texlive-bin: Purge unused bundled software from the source., guix-commits, 2020/01/13
- 07/08: gnu: Add texlive-hyphen-pali., guix-commits, 2020/01/13
- 02/08: gnu: poppler: Update to 0.84.0.,
guix-commits <=
- 04/08: gnu: texlive-bin: Update to 20190410., guix-commits, 2020/01/13
- 08/08: gnu: TeX Live: Update packages to 2019.3., guix-commits, 2020/01/13