me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ghostscript: Incorporate grafted changes.

Browse source 
* gnu/packages/ghostscript.scm (ghostscript)[replacement]: Remove field.
[arguments]: Add "--disable-compile-inits" and "--with-fontpath" in #:configure-flags.
[native-inputs]: Add PKG-CONFIG.
[inputs]: Add FONTCONFIG and GS-FONTS.
(ghostscript/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2019-11-29 22:16:56 +01:00
parent e554eba02c
commit c751e5c6bb
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/ghostscript.scm
View file

@ -157,12 +157,6 @@ printing, and psresize, for adjusting page sizes.")
(package (package
(name "ghostscript") (name "ghostscript")
(version "9.27") (version "9.27")
;; The problems addressed by GHOSTSCRIPT/FIXED are not security-related,
;; but they have a significant impact on usability, hence this graft.
;; TODO: Ungraft on next update cycle.
(replacement ghostscript/fixed)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -205,6 +199,10 @@ printing, and psresize, for adjusting page sizes.")
(string-append "ZLIBDIR=" (string-append "ZLIBDIR="
(assoc-ref %build-inputs "zlib") "/include") (assoc-ref %build-inputs "zlib") "/include")
"--enable-dynamic" "--enable-dynamic"
"--disable-compile-inits"
(string-append "--with-fontpath="
(assoc-ref %build-inputs "gs-fonts")
"/share/fonts/type1/ghostscript")
,@(if (%current-target-system) ,@(if (%current-target-system)
'(;; Specify the native compiler, which is used to build 'echogs' '(;; Specify the native compiler, which is used to build 'echogs'
@ -268,6 +266,7 @@ printing, and psresize, for adjusting page sizes.")
#t)))))) #t))))))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("pkg-config" ,pkg-config) ;needed for freetype
("python" ,python-wrapper) ("python" ,python-wrapper)
("tcl" ,tcl) ("tcl" ,tcl)
@ -278,7 +277,9 @@ printing, and psresize, for adjusting page sizes.")
("libjpeg/native" ,libjpeg)) ("libjpeg/native" ,libjpeg))
'()))) '())))
(inputs (inputs
`(("freetype" ,freetype) `(("fontconfig" ,fontconfig)
("freetype" ,freetype)
("gs-fonts" ,gs-fonts)
("jbig2dec" ,jbig2dec) ("jbig2dec" ,jbig2dec)
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)
("libpaper" ,libpaper) ("libpaper" ,libpaper)
@ -294,25 +295,6 @@ output file formats and printers.")
(home-page "https://www.ghostscript.com/") (home-page "https://www.ghostscript.com/")
(license license:agpl3+))) (license license:agpl3+)))
(define ghostscript/fixed
;; This adds the Freetype dependency (among other things), which fixes the
;; rendering issues described in <https://issues.guix.gnu.org/issue/34877>.
(package/inherit
ghostscript
(arguments
(substitute-keyword-arguments (package-arguments ghostscript)
((#:configure-flags flags ''())
`(append (list "--disable-compile-inits"
(string-append "--with-fontpath="
(assoc-ref %build-inputs "gs-fonts")
"/share/fonts/type1/ghostscript"))
,flags))))
(native-inputs `(("pkg-config" ,pkg-config) ;needed for freetype
,@(package-native-inputs ghostscript)))
(inputs `(("gs-fonts" ,gs-fonts)
("fontconfig" ,fontconfig)
,@(package-inputs ghostscript)))))
(define-public ghostscript/x (define-public ghostscript/x
(package/inherit ghostscript (package/inherit ghostscript
(name (string-append (package-name ghostscript) "-with-x")) (name (string-append (package-name ghostscript) "-with-x"))