gnu: mupdf: Update to 1.14.

* gnu/packages/pdf.scm (mupdf): Update to 1.14.
[source]: Don't remove all the bundled libraries.
[arguments]: Add 'configure-flags to use system libraries.
This commit is contained in:
Efraim Flashner 2018-10-30 11:06:25 +02:00
parent f8ddf719f3
commit b1435fe735
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 13 additions and 3 deletions

View File

@ -596,7 +596,7 @@ extracting content or merging files.")
(define-public mupdf (define-public mupdf
(package (package
(name "mupdf") (name "mupdf")
(version "1.13.0") (version "1.14.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -604,9 +604,17 @@ extracting content or merging files.")
name "-" version "-source.tar.xz")) name "-" version "-source.tar.xz"))
(sha256 (sha256
(base32 (base32
"0129k92bav692l6lyw10ryldx7h2f9khjpgnp3f3n4fdsph9hrkl")) "1psnz02w5p7wc1s1ma7vvjmkjfy641xvsh9ykaqzkk84dflnjgk0"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(begin (delete-file-recursively "thirdparty") #t)))) (snippet
;; We keep lcms2 since it is different than our lcms.
'(begin
(for-each
(lambda (dir)
(delete-file-recursively (string-append "thirdparty/" dir)))
'("curl" "freeglut" "freetype" "harfbuzz" "jbig2dec"
"libjpeg" "mujs" "openjpeg" "zlib"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("curl" ,curl) `(("curl" ,curl)
@ -627,6 +635,8 @@ extracting content or merging files.")
'(#:tests? #f ; no check target '(#:tests? #f ; no check target
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
"XCFLAGS=-fpic" "XCFLAGS=-fpic"
"USE_SYSTEM_LIBS=yes"
"USE_SYSTEM_MUJS=yes"
(string-append "prefix=" (assoc-ref %outputs "out"))) (string-append "prefix=" (assoc-ref %outputs "out")))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'configure)))) (delete 'configure))))