[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/94: gnu: ghostscript: Incorporate grafted changes.
From: |
guix-commits |
Subject: |
11/94: gnu: ghostscript: Incorporate grafted changes. |
Date: |
Thu, 5 Dec 2019 12:15:28 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit c751e5c6bba28365073c99bdbebf4c64b382dce5
Author: Marius Bakke <address@hidden>
Date: Fri Nov 29 22:16:56 2019 +0100
gnu: ghostscript: Incorporate grafted changes.
* 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.
---
gnu/packages/ghostscript.scm | 34 ++++++++--------------------------
1 file changed, 8 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 7839ac5..224a836 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -157,12 +157,6 @@ printing, and psresize, for adjusting page sizes.")
(package
(name "ghostscript")
(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
(origin
(method url-fetch)
@@ -205,6 +199,10 @@ printing, and psresize, for adjusting page sizes.")
(string-append "ZLIBDIR="
(assoc-ref %build-inputs "zlib") "/include")
"--enable-dynamic"
+ "--disable-compile-inits"
+ (string-append "--with-fontpath="
+ (assoc-ref %build-inputs "gs-fonts")
+ "/share/fonts/type1/ghostscript")
,@(if (%current-target-system)
'(;; Specify the native compiler, which is used to build
'echogs'
@@ -268,6 +266,7 @@ printing, and psresize, for adjusting page sizes.")
#t))))))
(native-inputs
`(("perl" ,perl)
+ ("pkg-config" ,pkg-config) ;needed for freetype
("python" ,python-wrapper)
("tcl" ,tcl)
@@ -278,7 +277,9 @@ printing, and psresize, for adjusting page sizes.")
("libjpeg/native" ,libjpeg))
'())))
(inputs
- `(("freetype" ,freetype)
+ `(("fontconfig" ,fontconfig)
+ ("freetype" ,freetype)
+ ("gs-fonts" ,gs-fonts)
("jbig2dec" ,jbig2dec)
("libjpeg" ,libjpeg)
("libpaper" ,libpaper)
@@ -294,25 +295,6 @@ output file formats and printers.")
(home-page "https://www.ghostscript.com/")
(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
(package/inherit ghostscript
(name (string-append (package-name ghostscript) "-with-x"))
- 63/94: gnu: libxau: Do not build static libraries., (continued)
- 63/94: gnu: libxau: Do not build static libraries., guix-commits, 2019/12/05
- 84/94: gnu: Remove python-libxml2 workaround., guix-commits, 2019/12/05
- 71/94: gnu: libxcursor: Do not build static libraries., guix-commits, 2019/12/05
- 69/94: gnu: libxcb: Do not build static libraries., guix-commits, 2019/12/05
- 76/94: gnu: xcb-util-image: Do not build static libraries., guix-commits, 2019/12/05
- 85/94: gnu: libx11: Update to 1.6.9., guix-commits, 2019/12/05
- 90/94: gnu: tcsh: Update to 6.22.02., guix-commits, 2019/12/05
- 93/94: gnu: node: Update to 10.17.0., guix-commits, 2019/12/05
- 37/94: gnu: libspiro: Do not build static libraries., guix-commits, 2019/12/05
- 07/94: gnu: expat: Do not build static libraries., guix-commits, 2019/12/05
- 11/94: gnu: ghostscript: Incorporate grafted changes.,
guix-commits <=
- 20/94: gnu: libtiff: Do not build static libraries., guix-commits, 2019/12/05
- 26/94: gnu: Tcl/Tk: Update to 8.6.10., guix-commits, 2019/12/05
- 50/94: gnu: libxdmcp: Do not build static libraries., guix-commits, 2019/12/05
- 56/94: gnu: libxscrnsaver: Do not build static libraries., guix-commits, 2019/12/05
- 51/94: gnu: libxft: Do not build static libraries., guix-commits, 2019/12/05
- 53/94: gnu: libxmu: Do not build static libraries., guix-commits, 2019/12/05
- 61/94: gnu: libxv: Do not build static libraries., guix-commits, 2019/12/05
- 66/94: gnu: libxrandr: Do not build static libraries., guix-commits, 2019/12/05
- 82/94: gnu: cairo: Do not build static libraries., guix-commits, 2019/12/05
- 81/94: gnu: gdbm: Do not build static libraries., guix-commits, 2019/12/05