From c41d97bed6ee1765e0845567444d4d2af1a4d373 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 9 Sep 2016 16:08:02 -0400 Subject: gnu: mupdf: Update to 1.9a. * gnu/packages/pdf.scm (mupdf): Update to 1.9a. [source]: Use "mupdf-build-with-openjpeg-2.1.patch". Adjust snippet to preserve bundled 'thirdparty/mujs'. [inputs]: Add harfbuzz. Replace openjpeg-2.0 with openjpeg. * gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/packages/pdf.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 74e89070b84..98cc92e5a8d 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages tls) + #:use-module (gnu packages javascript) #:use-module (srfi srfi-1)) (define-public poppler @@ -466,29 +467,42 @@ extracting content or merging files.") (define-public mupdf (package (name "mupdf") - (version "1.8") + (version "1.9a") (source (origin (method url-fetch) (uri (string-append "http://mupdf.com/downloads/archive/" name "-" version "-source.tar.gz")) (sha256 - (base32 "01n26cy41lc2fjri63s4js23ixxb4nd37aafry3hz4i4id6wd8x2")) - (patches (search-patches "mupdf-CVE-2016-6265.patch" + (base32 + "1k64pdapyj8a336jw3j61fhn0rp4q6az7d0dqp9r5n3d9rgwa5c0")) + (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch" + "mupdf-CVE-2016-6265.patch" "mupdf-CVE-2016-6525.patch")) (modules '((guix build utils))) (snippet - ;; Don't build the bundled-in third party libraries. - '(delete-file-recursively "thirdparty")))) + ;; Delete all the bundled libraries except for mujs, which is + ;; developed by the same team as mupdf and has no releases. + ;; TODO Package mujs and don't use the bundled copy. + '(for-each delete-file-recursively + '("thirdparty/curl" + "thirdparty/freetype" + "thirdparty/glfw" + "thirdparty/harfbuzz" + "thirdparty/jbig2dec" + "thirdparty/jpeg" + "thirdparty/openjpeg" + "thirdparty/zlib"))))) (build-system gnu-build-system) (inputs `(("curl" ,curl) ("freetype" ,freetype) + ("harfbuzz" ,harfbuzz) ("jbig2dec" ,jbig2dec) ("libjpeg" ,libjpeg) ("libx11" ,libx11) ("libxext" ,libxext) - ("openjpeg" ,openjpeg-2.0) + ("openjpeg" ,openjpeg) ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs -- cgit v1.2.3 From e71479747b3610cc7d992f2b38c6fa825ee44ad1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 10 Sep 2016 01:14:32 -0400 Subject: gnu: pdf: Remove erroneous module import. This is a followup to commit c41d97bed6ee1765e0845567444d4d2af1a4d373. * gnu/packages/pdf.scm: Don't import (gnu packages javascript). --- gnu/packages/pdf.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 98cc92e5a8d..69be8ac9137 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -53,7 +53,6 @@ #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages tls) - #:use-module (gnu packages javascript) #:use-module (srfi srfi-1)) (define-public poppler -- cgit v1.2.3 From 8d4169a1d1a379ce450ca4920eadadd86dd1ef9a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 12 Sep 2016 00:57:46 +0200 Subject: gnu: Add Impressive. * gnu/packages/pdf.scm (impressive): New variable. --- gnu/packages/pdf.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 69be8ac9137..61fe84eed98 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Roel Janssen ;;; Coypright © 2016 ng0 ;;; Coypright © 2016 Marius Bakke +;;; Coypright © 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,10 +31,14 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system python) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) + #:use-module (gnu packages game-development) #:use-module (gnu packages ghostscript) #:use-module (gnu packages databases) #:use-module (gnu packages djvu) @@ -52,6 +57,7 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages sdl) #:use-module (gnu packages tls) #:use-module (srfi srfi-1)) @@ -636,3 +642,57 @@ vector formats.") (inherit (package-with-python2 (strip-python2-variant python-reportlab))) (native-inputs `(("python2-pip" ,python2-pip))))) + +(define-public impressive + (package + (name "impressive") + (version "0.11.1") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/impressive/Impressive/" + version "/Impressive-" version ".tar.gz")) + (sha256 + (base32 + "0b3rmy6acp2vmf5nill3aknxvr9a5aawk1vnphkah61anxp62gsr")))) + (build-system python-build-system) + + ;; TODO: Add dependency on pdftk. + (inputs `(("python-pygame" ,python-pygame) + ("python2-pillow" ,python2-pillow) + ("sdl" ,sdl) + ("xpdf" ,xpdf))) + + (arguments + `(#:python ,python-2 + #:phases (modify-phases %standard-phases + (delete 'build) + (delete 'configure) + (delete 'check) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; There's no 'setup.py' so install things manually. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man1 (string-append out "/share/man/man1")) + (sdl (assoc-ref inputs "sdl")) + (xpdf (assoc-ref inputs "xpdf"))) + (mkdir-p bin) + (copy-file "impressive.py" + (string-append bin "/impressive")) + (wrap-program (string-append bin "/impressive") + `("LIBRARY_PATH" ":" prefix ;for ctypes + (,(string-append sdl "/lib"))) + `("PATH" ":" prefix ;for pdftoppm + (,(string-append xpdf "/bin")))) + (mkdir-p man1) + (install-file "impressive.1" man1) + #t)))))) + (home-page "http://impressive.sourceforge.net") + (synopsis "PDF presentation tool with visual effects") + (description + "Impressive is a tool to display PDF files that provides visual effects +such as smooth alpha-blended slide transitions. It provides additional tools +such as zooming, highlighting an area of the screen, and a tool to navigate +the PDF pages.") + (license license:gpl2))) -- cgit v1.2.3