diff options
Diffstat (limited to 'gnu/packages/fontutils.scm')
| -rw-r--r-- | gnu/packages/fontutils.scm | 130 |
1 files changed, 76 insertions, 54 deletions
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 2775ebdab9..7ede94717c 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Roel Janssen <roel@gnu.org> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> @@ -30,29 +30,34 @@ (define-module (gnu packages fontutils) #:use-module (gnu packages) - #:use-module (gnu packages compression) + #:use-module (gnu packages autotools) + #:use-module (gnu packages bison) + #:use-module (gnu packages build-tools) ;for meson-0.55 #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages datastructures) + #:use-module (gnu packages flex) + #:use-module (gnu packages fonts) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages fribidi) + #:use-module (gnu packages gcc) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gperf) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) #:use-module (gnu packages linux) + #:use-module (gnu packages man) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages autotools) - #:use-module (gnu packages fonts) - #:use-module (gnu packages gettext) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages image) - #:use-module (gnu packages bison) - #:use-module (gnu packages flex) - #:use-module (gnu packages glib) - #:use-module (gnu packages gperf) - #:use-module (gnu packages xorg) - #:use-module (gnu packages fribidi) - #:use-module (gnu packages gtk) - #:use-module (gnu packages xml) #:use-module (gnu packages sqlite) - #:use-module (gnu packages gnome) - #:use-module (gnu packages freedesktop) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -68,14 +73,14 @@ (define-public freetype (package (name "freetype") - (version "2.10.1") - (replacement freetype/fixed) - (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah/freetype/freetype-" - version ".tar.xz")) - (sha256 (base32 - "0vx2dg1jh5kq34dd6ifpjywkpapp8a7p1bvyq9yq5zi1i94gmnqn")))) + (version "2.10.4") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://savannah/freetype/freetype-" + version ".tar.xz")) + (sha256 + (base32 "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46")))) (build-system gnu-build-system) (arguments ;; The use of "freetype-config" is deprecated, but other packages still @@ -98,19 +103,6 @@ anti-aliased glyph bitmap generation with 256 gray levels.") (license license:freetype) ; some files have other licenses (home-page "https://www.freetype.org/"))) -(define freetype/fixed - ;; Security fix for CVE-2020-15999. - (package - (inherit freetype) - (version "2.10.4") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://savannah/freetype/freetype-" - version ".tar.xz")) - (sha256 - (base32 "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46")))))) - (define-public ttfautohint (package (name "ttfautohint") @@ -583,16 +575,15 @@ using the above tables.") (define-public libspiro (package (name "libspiro") - (version "20190731") - (replacement libspiro-20200505) + (version "20200505") (source (origin (method url-fetch) (uri (string-append "https://github.com/fontforge/libspiro/releases" - "/download/" version "/libspiro-" version ".tar.gz")) + "/download/" version "/libspiro-dist-" version ".tar.gz")) (sha256 (base32 - "0m63x97b7aciviijprvy85gm03p2jsgslxn323zl9zn7qz6d3ir4")))) + "0j8fmyj4wz6mqk17dqs6f8jx0i52n68gv5px17qbrjnbilg9mih6")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) @@ -603,19 +594,6 @@ smooth contours with constant curvature at the spline joins.") (license license:gpl2+) (home-page "http://libspiro.sourceforge.net/"))) -(define libspiro-20200505 - (package - (inherit libspiro) - (version "20200505") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/fontforge/libspiro/releases" - "/download/" version "/libspiro-dist-" version ".tar.gz")) - (sha256 - (base32 - "0j8fmyj4wz6mqk17dqs6f8jx0i52n68gv5px17qbrjnbilg9mih6")))))) - (define-public libuninameslist (package (name "libuninameslist") @@ -841,6 +819,50 @@ maintain the Noto Fonts project.") "file://sample_texts/attributions.txt" "See sample_texts/attributions.txt in the distribution."))))) +(define-public fcft + (package + (name "fcft") + (version "2.3.2") + (home-page "https://codeberg.org/dnkl/fcft") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0k2i57rakm4g86f7hbhkby8af0vv7v63a70lk3m58mkycpy5q2rm")))) + (build-system meson-build-system) + (arguments + `(#:meson ,meson-0.55)) + (native-inputs + `(("check" ,check) + ("gcc" ,gcc-10) ;TODO: Remove when the default compiler is > GCC 7. + ("pkg-config" ,pkg-config) + ("scdoc" ,scdoc))) + (propagated-inputs + `(;; Required by fcft.pc. + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("harfbuzz" ,harfbuzz) + ("pixman" ,pixman) + ("tllist" ,tllist))) + (synopsis "Font loading and glyph rasterization library") + (description + "@code{fcft} is a small font loading and glyph rasterization library +built on-top of FontConfig, FreeType2 and pixman. + +It can load and cache fonts from a fontconfig-formatted name string, e.g. +@code{Monospace:size=12}, optionally with user configured fallback fonts. + +After a font has been loaded, you can rasterize glyphs. When doing so, the +primary font is first considered. If it does not have the requested glyph, +the user configured fallback fonts (if any) are considered. If none of the +user configured fallback fonts has the requested glyph, the FontConfig +generated list of fallback fonts are checked.") + ;; The code is distributed under the Expat license, but embeds Unicode + ;; data files carrying the Unicode license. + (license (list license:expat license:unicode)))) + (define-public fontmanager (package (name "fontmanager") |