rekahsoft/guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mupdf: Unbundle mujs.

Browse Source 
* gnu/packages/pdf.scm (mupdf)[source]: Remove bundled mujs.
[inputs]: Add mujs.
This commit is contained in:
Efraim Flashner 2017-11-12 18:42:34 +02:00
parent 89ba894eb3
commit 1650cf9284
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/pdf.scm
View File

@ -58,6 +58,7 @@ (define-module (gnu packages pdf)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages imagemagick) #:use-module (gnu packages imagemagick)
#:use-module (gnu packages javascript)
#:use-module (gnu packages lesstif) #:use-module (gnu packages lesstif)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
@ -581,19 +582,7 @@ (define-public mupdf
"mupdf-CVE-2017-14687.patch" "mupdf-CVE-2017-14687.patch"
"mupdf-CVE-2017-15587.patch")) "mupdf-CVE-2017-15587.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(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/libjpeg"
"thirdparty/openjpeg"
"thirdparty/zlib")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("curl" ,curl) `(("curl" ,curl)
@ -603,6 +592,7 @@ (define-public mupdf
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)
("libx11" ,libx11) ("libx11" ,libx11)
("libxext" ,libxext) ("libxext" ,libxext)
("mujs" ,mujs)
("openjpeg" ,openjpeg) ("openjpeg" ,openjpeg)
("openssl" ,openssl) ("openssl" ,openssl)
("zlib" ,zlib))) ("zlib" ,zlib)))