diff options
Diffstat (limited to 'gnu/packages/fontutils.scm')
| -rw-r--r-- | gnu/packages/fontutils.scm | 72 |
1 files changed, 45 insertions, 27 deletions
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 46279301d6..96557b963c 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Nikita <nikita@n0.is> @@ -100,7 +100,7 @@ anti-aliased glyph bitmap generation with 256 gray levels.") (define-public ttfautohint (package (name "ttfautohint") - (version "1.5") + (version "1.8.3") (source (origin (method url-fetch) @@ -108,8 +108,7 @@ anti-aliased glyph bitmap generation with 256 gray levels.") version ".tar.gz")) (sha256 (base32 - "1lgghck46p33z3hg8dnl76jryig4fh6d8rhzms837zp7x4hyfkv4")) - (patches (list (search-patch "ttfautohint-source-date-epoch.patch"))))) + "0zpqgihn3yh3v51ynxwr8asqrijvs4gv686clwv7bm8sawr4kfw7")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) @@ -119,7 +118,8 @@ anti-aliased glyph bitmap generation with 256 gray levels.") `(("freetype" ,freetype) ("harfbuzz" ,harfbuzz))) (arguments - `(#:configure-flags '("--with-qt=no"))) ;no gui + `(#:configure-flags '("--disable-static" + "--with-qt=no"))) ;no gui (synopsis "Automated font hinting") (description "ttfautohint provides a 99% automated hinting process and a platform for @@ -263,32 +263,50 @@ work with most software requiring Type 1 fonts.") (package (name "woff2") (version "1.0.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/woff2") - (commit (string-append "v" version)))) - (file-name (string-append name "-" version ".git")) - (sha256 - (base32 - "13l4g536h0pr84ww4wxs2za439s0xp1va55g6l478rfbb1spp44y")))) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/google/woff2.git") + (commit (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "13l4g536h0pr84ww4wxs2za439s0xp1va55g6l478rfbb1spp44y")))) (build-system cmake-build-system) + (outputs '("out" "bin")) + (arguments + `(#:tests? #f ; No target + #:configure-flags + (list + (string-append "-DCMAKE_INSTALL_BINDIR=" + (assoc-ref %outputs "bin") + "/bin") + (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" + (assoc-ref %outputs "out") + "/include") + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") + "/lib")) + #:phases + (modify-phases %standard-phases + ;; To install both binaries and libraries. + (add-after 'unpack 'patch-installation + (lambda _ + (substitute* "CMakeLists.txt" + (("NOT BUILD_SHARED_LIBS") + "BUILD_SHARED_LIBS")) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("google-brotli" ,google-brotli))) - (arguments - ;; package has no tests - `(#:tests? #f - ;; we can’t have both, shared libraries and binaries, so turn off the - ;; former - #:configure-flags (list "-DBUILD_SHARED_LIBS=OFF"))) - (synopsis "Compress TrueType fonts to WOFF2") - (description - "This package provides utilities for compressing/decompressing TrueType -fonts to/from the WOFF2 format.") - (license license:asl2.0) - (home-page "https://github.com/google/woff2"))) + `(("brotli" ,google-brotli))) + (synopsis "Libraries and tools for WOFF2 font format") + (description "WOFF2 provides libraires and tools to handle the Web Open +Font Format (WOFF).") + (home-page "https://w3c.github.io/woff/woff2/") + (license license:expat))) (define-public fontconfig (package |