summaryrefslogtreecommitdiff
path: root/gnu/packages/ghostscript.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-31 20:40:58 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-04-02 02:22:23 +0200
commit68ab0ad58b37ce24f9e0b6f1864d58066308230d (patch)
tree88b7c6ae081c0dffbea6037223aaa0869b4cefa0 /gnu/packages/ghostscript.scm
parent33f3da11b5b3d50fa90d24bf3b36ee7358a5ab6c (diff)
downloadpatches-68ab0ad58b37ce24f9e0b6f1864d58066308230d.tar
patches-68ab0ad58b37ce24f9e0b6f1864d58066308230d.tar.gz
gnu: ghostscript: Update to 9.23.
* gnu/packages/ghostscript.scm (ghostscript): Update to 9.23. [source](snippet): Adjust to removed LCMS2 library. [arguments]: Remove FIX-DOC-DIR-PHASE. Prevent docdir compatibility symlink. [inputs]: Remove LCMS2. * gnu/packages/patches/ghostscript-no-header-id.patch: Adjust context.
Diffstat (limited to 'gnu/packages/ghostscript.scm')
-rw-r--r--gnu/packages/ghostscript.scm23
1 files changed, 9 insertions, 14 deletions
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 25d210e9d2..0a6043ba65 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -132,7 +132,7 @@ printing, and psresize, for adjusting page sizes.")
(define-public ghostscript
(package
(name "ghostscript")
- (version "9.22")
+ (version "9.23")
(source
(origin
(method url-fetch)
@@ -142,7 +142,7 @@ printing, and psresize, for adjusting page sizes.")
"/ghostscript-" version ".tar.xz"))
(sha256
(base32
- "1fyi4yvdj39bjgs10klr31cda1fbx1ar7a7b7yz7v68gykk65y61"))
+ "1ng8d9fm5lza7k1f7ybc791275c07z5hcmpkrl2i226nshkxrkhz"))
(patches (search-patches "ghostscript-runpath.patch"
"ghostscript-no-header-creationdate.patch"
"ghostscript-no-header-id.patch"
@@ -152,10 +152,10 @@ printing, and psresize, for adjusting page sizes.")
;; Remove bundled libraries. The bundled OpenJPEG is a patched fork so
;; we leave it, at least for now.
;; TODO Try unbundling ijs, which is developed alongside Ghostscript.
+ ;; Likewise for the thread-safe lcms2 fork called "lcms2art".
'(begin
(for-each delete-file-recursively '("freetype" "jbig2dec" "jpeg"
- "lcms2" "libpng"
- "tiff" "zlib"))
+ "libpng" "tiff" "zlib"))
#t))))
(build-system gnu-build-system)
(outputs '("out" "doc")) ;19 MiB of HTML/PS doc + examples
@@ -180,13 +180,6 @@ printing, and psresize, for adjusting page sizes.")
'()))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-doc-dir
- (lambda _
- ;; Honor --docdir.
- (substitute* "Makefile.in"
- (("^docdir=.*$") "docdir = @docdir@\n")
- (("^exdir=.*$") "exdir = $(docdir)/examples\n"))
- #t))
(add-after 'configure 'remove-doc-reference
(lambda _
;; Don't retain a reference to the 'doc' output in 'gs'.
@@ -195,6 +188,10 @@ printing, and psresize, for adjusting page sizes.")
(substitute* "base/gscdef.c"
(("GS_DOCDIR")
"\"~/.guix-profile/share/doc/ghostscript\""))
+ ;; The docdir default changed in 9.23 and a compatibility
+ ;; symlink was added from datadir->docdir. Remove it.
+ (substitute* "base/unixinst.mak"
+ (("ln -s \\$\\(DESTDIR\\)\\$\\(docdir\\).*") ""))
#t))
(add-after 'configure 'patch-config-files
(lambda _
@@ -234,13 +231,11 @@ printing, and psresize, for adjusting page sizes.")
;; these libraries.
,@(if (%current-target-system)
`(("zlib/native" ,zlib)
- ("libjpeg/native" ,libjpeg)
- ("lcms2/native" ,lcms))
+ ("libjpeg/native" ,libjpeg))
'())))
(inputs
`(("freetype" ,freetype)
("jbig2dec" ,jbig2dec)
- ("lcms2" ,lcms)
("libjpeg" ,libjpeg)
("libpaper" ,libpaper)
("libpng" ,libpng)