mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 23:06:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: fontutils: Add 'bash' input for 'wrap-program'.

Browse source 
It is required for cross-compilation.

* gnu/packages/fontutils.scm
(fontforge): Adjust indentation.
[inputs]: Add 'bash-minimal'.  Remove labels.
(fntsample)[inputs]: Add 'bash-minimal'.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Ib3498e8ab1e499db6bc512da31718690e46f90f1
This commit is contained in:
Maxime Devos 2021-07-02 12:07:02 +02:00 committed by Maxim Cournoyer
parent 71dcacac0c
commit 3f2c6cc393
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 48 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
gnu/packages/fontutils.scm
View file

@ -1510,44 +1510,46 @@ (define-public libuninameslist
(define-public fontforge (define-public fontforge
(package (package
(name "fontforge") (name "fontforge")
(version "20220308") (version "20220308")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/fontforge/fontforge/releases/download/" "https://github.com/fontforge/fontforge/releases/download/"
version "/fontforge-" version ".tar.xz")) version "/fontforge-" version ".tar.xz"))
(sha256 (sha256
(base32 "0ncfc4ajwy4ng6b6h79w52jh9z3lngvf3f3ldi1wzkhcg9zh3r01")))) (base32 "0ncfc4ajwy4ng6b6h79w52jh9z3lngvf3f3ldi1wzkhcg9zh3r01"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs `(("cairo" ,cairo) (inputs
("fontconfig" ,fontconfig) ;dlopen'd (list cairo
("freetype" ,freetype) bash-minimal
("gettext" ,gettext-minimal) fontconfig ;dlopen'd
("libICE" ,libice) freetype
("libSM" ,libsm) gettext-minimal
("libX11" ,libx11) libice
("libXi" ,libxi) libsm
("libjpeg" ,libjpeg-turbo) libx11
("libltdl" ,libltdl) libxi
("libpng" ,libpng) libjpeg-turbo
("libspiro" ,libspiro) libltdl
("libtiff" ,libtiff) libpng
("libungif" ,libungif) libspiro
("libxft" ,libxft) libtiff
("libxml2" ,libxml2) libungif
("pango" ,pango) libxft
("potrace" ,potrace) libxml2
("python" ,python) pango
("zlib" ,zlib))) potrace
(arguments python
(list zlib))
#:configure-flags #~'( ;; TODO: Provide GTK+ for the Wayland-friendly GDK (arguments
;; backend, instead of the legacy X11 backend. (list
;; Currently it introduces a circular dependency. #:configure-flags #~'( ;; TODO: Provide GTK+ for the Wayland-friendly GDK
"-DENABLE_X11=ON") ;; backend, instead of the legacy X11 backend.
;; Currently it introduces a circular dependency.
"-DENABLE_X11=ON")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'do-not-override-RPATH (add-after 'unpack 'do-not-override-RPATH
@ -1556,8 +1558,7 @@ (define-public fontforge
;; already does the right thing. ;; already does the right thing.
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("^set_default_rpath\\(\\)") (("^set_default_rpath\\(\\)")
"")) ""))))
#t))
#$@(if (target-hurd?) #$@(if (target-hurd?)
#~((add-after 'unpack 'apply-hurd-patch #~((add-after 'unpack 'apply-hurd-patch
(lambda _ (lambda _
@ -1600,15 +1601,14 @@ (define-public fontforge
"libxml2" "zlib" "libspiro" "freetype" "libxml2" "zlib" "libspiro" "freetype"
"pango" "cairo" "fontconfig"))) "pango" "cairo" "fontconfig")))
;; Checks for potrace program at runtime ;; Checks for potrace program at runtime
`("PATH" ":" prefix (,potrace))) `("PATH" ":" prefix (,potrace)))))))))
#t)))))) (synopsis "Outline font editor")
(synopsis "Outline font editor") (description
(description "FontForge allows you to create and modify postscript, truetype and
"FontForge allows you to create and modify postscript, truetype and
opentype fonts. You can save fonts in many different outline formats, and opentype fonts. You can save fonts in many different outline formats, and
generate bitmaps.") generate bitmaps.")
(license license:gpl3+) (license license:gpl3+)
(home-page "https://fontforge.github.io"))) (home-page "https://fontforge.github.io")))
;; This is the last version that supports Python 2, which is needed for ;; This is the last version that supports Python 2, which is needed for
;; GNU FreeFont. Remove once no longer required. ;; GNU FreeFont. Remove once no longer required.
@ -1923,6 +1923,7 @@ (define-public fntsample
("gettext" ,gettext-minimal))) ("gettext" ,gettext-minimal)))
(inputs (inputs
`(("cairo" ,cairo) `(("cairo" ,cairo)
("bash-minimal", bash-minimal)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("glib" ,glib) ("glib" ,glib)