diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:29:02 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:43:21 -0400 |
commit | 4920f6e634eeecb37b501bdc024dfe0aab849ed0 (patch) | |
tree | c7dd5859715071cb602133b67449a29488027f70 /gnu/packages/pdf.scm | |
parent | 513091dbd2eeba138b558f5f9bb1ee6e68eee01d (diff) | |
parent | 3d297a0017210f1dd135592efb10846840a8af88 (diff) | |
download | guix-4920f6e634eeecb37b501bdc024dfe0aab849ed0.tar guix-4920f6e634eeecb37b501bdc024dfe0aab849ed0.tar.gz |
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/sdl.scm
pango-next, vala-next and librsvg-bootstrap were removed in the process.
Diffstat (limited to 'gnu/packages/pdf.scm')
-rw-r--r-- | gnu/packages/pdf.scm | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 09ecd252bc..3580476e33 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -315,6 +315,25 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (license (list license:bsd-3 license:gpl2)))) +;; XXX: Remove it on core-updates. It is only needed for evince 42.3 that +;; requires a recent poppler. +(define-public poppler-next + (package/inherit poppler + (name "poppler-next") + (version "22.09.0") + (source (origin + (method url-fetch) + (uri (string-append "https://poppler.freedesktop.org/poppler-" + version ".tar.xz")) + (sha256 + (base32 + "0bhyli95h3dkirjc0ibh08s4nim6rn7f38sbfzdwln8k454gga6p")))) + (native-inputs + (list pkg-config + `(,glib "bin") ; glib-mkenums, etc. + gobject-introspection + python)) )) + (define-public poppler-qt5 (package/inherit poppler (name "poppler-qt5") |