From 927e176d2ac1ecaf470833f8b664f6c06f552e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?al=C3=ADrio=20eyng?= Date: Thu, 7 Apr 2016 19:04:07 +0000 Subject: gnu: fontforge: Update to 20160404. * gnu/packages/fontutils.scm (fontforge): Update to 20160404. [source](snippet): Remove tottf.c modification. Update date strings. Co-authored-by: Eric Bavier --- gnu/packages/fontutils.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index ff10a4ac73..d64ed71bbf 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -341,30 +341,25 @@ definitions.") (define-public fontforge (package (name "fontforge") - (version "20150824") + (version "20160404") (source (origin (method url-fetch) (uri (string-append "https://github.com/fontforge/fontforge/releases/download/" - version "/fontforge-" version ".tar.gz")) + version "/fontforge-dist-" version ".tar.gz")) (sha256 (base32 - "0gfcm8yn1d30giqhdwbchnfnspcqypqdzrxlhqhwy1i18wgl0v2v")) + "1kavnhbkzc1hk6f39fynq9s0haama81ddrbld4b5x60d0dbaawvc")) (modules '((guix build utils))) (snippet '(begin ;; Make builds bit-reproducible by using fixed date strings. (substitute* "configure" (("^FONTFORGE_MODTIME=.*$") - "FONTFORGE_MODTIME=\"1458399002\"\n") + "FONTFORGE_MODTIME=\"1459819518L\"\n") (("^FONTFORGE_MODTIME_STR=.*$") - "FONTFORGE_MODTIME_STR=\"15:50 CET 19-Mar-2016\"\n") + "FONTFORGE_MODTIME_STR=\"20:25 CDT 4-Apr-2016\"\n") (("^FONTFORGE_VERSIONDATE=.*$") - "FONTFORGE_VERSIONDATE=\"20160319\"\n")) - - ;; Make TTF builds bit-reproducible by clearing the timestamp - ;; that goes in TTF files. - (substitute* "fontforge/tottf.c" - (("cvt_unix_to_1904\\(now") "cvt_unix_to_1904(0")))))) + "FONTFORGE_VERSIONDATE=\"20160404\"\n")))))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 1e69db8f1487ec61007099b3664e771094b8470b Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 31 Mar 2016 00:36:22 -0500 Subject: gnu: Add ttfautohint. * gnu/packages/fontutils.scm (ttfautohint): New variable. * gnu/packages/patches/ttfautohint-source-date-epoch.patch: New patch. * gnu-system.am (dist_patch_DATA): Add it. --- gnu/packages/fontutils.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index d64ed71bbf..c7cd519f65 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge -;;; Copyright © 2014 Eric Bavier +;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner ;;; @@ -29,6 +29,8 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages python) #:use-module (gnu packages image) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) #:use-module (gnu packages glib) #:use-module (gnu packages xorg) #:use-module (gnu packages gtk) @@ -70,6 +72,37 @@ anti-aliased glyph bitmap generation with 256 gray levels.") (license license:freetype) ; some files have other licenses (home-page "http://www.freetype.org/"))) +(define-public ttfautohint + (package + (name "ttfautohint") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://savannah/freetype/ttfautohint-" + version ".tar.gz")) + (sha256 + (base32 + "1lgghck46p33z3hg8dnl76jryig4fh6d8rhzms837zp7x4hyfkv4")) + (patches (list (search-patch "ttfautohint-source-date-epoch.patch"))))) + (build-system gnu-build-system) + (native-inputs + `(("flex" ,flex) + ("bison" ,bison) + ("pkg-config" ,pkg-config))) + (inputs + `(("freetype" ,freetype) + ("harfbuzz" ,harfbuzz))) + (arguments + `(#:configure-flags '("--with-qt=no"))) ;no gui + (synopsis "Automated font hinting") + (description + "ttfautohint provides a 99% automated hinting process and a platform for +finely hand-hinting the last 1%. It is ideal for web fonts and supports many +scripts.") + (license (list license:gpl2+ license:freetype)) ;choose one or the other + (home-page "http://www.freetype.org/ttfautohint/"))) + (define-public fontconfig (package (name "fontconfig") -- cgit v1.2.3 From 508a85dfd6a0f10b460020535ee5d13e5d304089 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 31 Mar 2016 00:50:47 -0500 Subject: gnu: Add woff-tools. * gnu/packages/fontutils.scm (woff-tools): New variable. --- gnu/packages/fontutils.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index c7cd519f65..a413e86ec6 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -103,6 +103,47 @@ scripts.") (license (list license:gpl2+ license:freetype)) ;choose one or the other (home-page "http://www.freetype.org/ttfautohint/"))) +(define-public woff-tools + (package + (name "woff-tools") + (version "2009.10.04") + (source + (origin + (method url-fetch) + ;; Upstream source is unversioned, so use Debian's versioned tarball + (uri (string-append "mirror://debian/pool/main/w/woff-tools/" + "woff-tools_" version ".orig.tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1i97gkqa6jfzlslsngqf556kx60knlgf7yc9pzsq2pizc6f0d4zl")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib))) + (arguments + `(#:make-flags '("CC=gcc") + #:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configuration + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "sfnt2woff" bin) + (install-file "woff2sfnt" bin))))))) + (synopsis "Convert between OpenType and WOFF fonts") + (description + "This package provides two tools: +@table @code +@item sfnt2woff +Converts OpenType fonts to WOFF fonts +@item woff2sfnt +Converts WOFF fonts to OpenType fonts +@end table") + (license (list license:mpl1.1 license:gpl2+ license:lgpl2.1+)) + (home-page "https://people.mozilla.com/~jkew/woff/"))) + (define-public fontconfig (package (name "fontconfig") -- cgit v1.2.3 From 1555aee7d03fc9931eb870bdfb272a889f0cadc4 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 31 Mar 2016 01:11:19 -0500 Subject: gnu: Add ttf2eot. * gnu/packages/fontutils.scm (ttf2eot): New variable. * gnu/packages/patches/ttf2eot-cstddef.patch: New patch. * gnu-system.am (dist_patch_DATA): Add it. --- gnu/packages/fontutils.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index a413e86ec6..dc18daaeb6 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -144,6 +144,43 @@ Converts WOFF fonts to OpenType fonts (license (list license:mpl1.1 license:gpl2+ license:lgpl2.1+)) (home-page "https://people.mozilla.com/~jkew/woff/"))) +(define-public ttf2eot + (package + (name "ttf2eot") + (version "0.0.2-2") + (source + (origin + (method url-fetch) + (uri (string-append "https://storage.googleapis.com/" + "google-code-archive-downloads/v2/" + "code.google.com/ttf2eot/" + "ttf2eot-" version ".tar.gz")) + (sha256 + (base32 + "1f4dzzmhn0208dvbm3ia5ar6ls9apwc6ampy5blmfxkigi6z0g02")) + (patches (list (search-patch "ttf2eot-cstddef.patch"))))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configuration + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "ttf2eot" bin))))))) + (synopsis "Convert from TrueType to Embeddable Open Type") + (description + "This package contains a commandline wrapper around OpenTypeUtilities.cpp +from Chromium, used to make EOT (Embeddable Open Type) files from +TTF (TrueType/OpenType Font) files.") + ;; While the README states "License: Derived from WebKit, so BSD/LGPL + ;; 2/LGPL 2.1", the single derived source file includes only BSD in its + ;; license header, and the wrapper source contains no license header. + (license license:bsd-2) + (home-page "https://code.google.com/archive/p/ttf2eot/"))) + (define-public fontconfig (package (name "fontconfig") -- cgit v1.2.3 From 579760d06e11d24ef280e5af16a2e02a98c1d77d Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 2 Apr 2016 01:50:14 -0500 Subject: gnu: Add woff2. * gnu/packages/fontutils.scm (woff2): New variable. * gnu/packages/patches/woff2-libbrotli.patch: New patch. * gnu-system.am (dist_patch_DATA): Add it. --- gnu/packages/fontutils.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index dc18daaeb6..a16e9dddcf 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -39,6 +39,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix svn-download) + #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu)) @@ -181,6 +182,46 @@ TTF (TrueType/OpenType Font) files.") (license license:bsd-2) (home-page "https://code.google.com/archive/p/ttf2eot/"))) +(define-public woff2 + (let ((commit "4e698b8c6c5e070d53c340db9ddf160e21070ede") + (revision "1")) + (package + (name "woff2") + (version (string-append "20160306-" revision "." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/woff2.git") + (commit commit))) + (file-name (string-append name "-" version ".tar.xz")) + (sha256 + (base32 + "0wka0yhf0cjmd4rv2jckxpyv6lb5ckj4nj0k1ajq5hrjy7f30lcp")) + (patches (list (search-patch "woff2-libbrotli.patch"))))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("brotli" ,brotli))) + (arguments + `(#:tests? #f ;no tests + #:phases (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "woff2_compress" bin) + (install-file "woff2_decompress" bin) + #t)))))) + (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")))) + (define-public fontconfig (package (name "fontconfig") -- cgit v1.2.3 From 5391be116ec454dc563d0f92aa2485e017cfbf5b Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 5 Apr 2016 22:34:54 -0500 Subject: gnu: fontforge: Make SVG builds reproducible. * gnu/packages/patches/fontforge-svg-modtime.patch: New file. * gnu/packages/fontutils.scm (fontforge)[source]: Use it. * gnu-system.am (dist_patch_DATA): Add it. --- gnu/packages/fontutils.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index a16e9dddcf..f37f343d52 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -511,7 +511,8 @@ definitions.") (("^FONTFORGE_MODTIME_STR=.*$") "FONTFORGE_MODTIME_STR=\"20:25 CDT 4-Apr-2016\"\n") (("^FONTFORGE_VERSIONDATE=.*$") - "FONTFORGE_VERSIONDATE=\"20160404\"\n")))))) + "FONTFORGE_VERSIONDATE=\"20160404\"\n")))) + (patches (list (search-patch "fontforge-svg-modtime.patch"))))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 5ab869f962e767110530e79b50d08421ff7411ab Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 5 Apr 2016 22:51:53 -0500 Subject: gnu: fontforge: Use modify-phases. * gnu/packages/fontutils.scm (fontforge)[arguments]: Use modify-phases. --- gnu/packages/fontutils.scm | 64 ++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 33 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index f37f343d52..e438aaf422 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -541,39 +541,37 @@ definitions.") (arguments '(#:tests? #f #:phases - (alist-cons-before - 'configure 'patch-configure - (lambda* (#:key inputs #:allow-other-keys) - (let ((libxml2 (assoc-ref inputs "libxml2")) - (cairo (assoc-ref inputs "cairo")) - (pango (assoc-ref inputs "pango"))) - (substitute* "configure" - ;; configure looks for a directory to be present to determine - ;; whether libxml2 is available, rather than checking for the - ;; library or headers. Point it to the correct directory. - (("/usr/include/libxml2") - (string-append libxml2 "/include/libxml2")) - ;; Similary, the search directories for cairo and pango are - ;; hard-coded. - (("gww_prefix in.*") (string-append "gww_prefix in " - cairo " " pango "\n"))))) - (alist-cons-after - 'install 'set-library-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (potrace (string-append (assoc-ref inputs "potrace") "/bin"))) - (wrap-program (string-append out "/bin/fontforge") - ;; Fontforge dynamically opens libraries. - `("LD_LIBRARY_PATH" ":" prefix - ,(map (lambda (input) - (string-append (assoc-ref inputs input) - "/lib")) - '("libtiff" "libjpeg" "libpng" "giflib" - "libxml2" "zlib" "libspiro" "freetype" - "pango" "cairo" "fontconfig"))) - ;; Checks for potrace program at runtime - `("PATH" ":" prefix (,potrace))))) - %standard-phases)))) + (modify-phases %standard-phases + (add-before 'configure 'patch-configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((libxml2 (assoc-ref inputs "libxml2")) + (cairo (assoc-ref inputs "cairo")) + (pango (assoc-ref inputs "pango"))) + (substitute* "configure" + ;; configure looks for a directory to be present to determine + ;; whether libxml2 is available, rather than checking for the + ;; library or headers. Point it to the correct directory. + (("/usr/include/libxml2") + (string-append libxml2 "/include/libxml2")) + ;; Similary, the search directories for cairo and pango are + ;; hard-coded. + (("gww_prefix in.*") (string-append "gww_prefix in " + cairo " " pango "\n")))))) + (add-after 'install 'set-library-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (potrace (string-append (assoc-ref inputs "potrace") "/bin"))) + (wrap-program (string-append out "/bin/fontforge") + ;; Fontforge dynamically opens libraries. + `("LD_LIBRARY_PATH" ":" prefix + ,(map (lambda (input) + (string-append (assoc-ref inputs input) + "/lib")) + '("libtiff" "libjpeg" "libpng" "giflib" + "libxml2" "zlib" "libspiro" "freetype" + "pango" "cairo" "fontconfig"))) + ;; Checks for potrace program at runtime + `("PATH" ":" prefix (,potrace))))))))) (synopsis "Outline font editor") (description "FontForge allows you to create and modify postscript, truetype and -- cgit v1.2.3 From 5f031ed242f979a9687f14fac9c311068f6b437b Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 5 Apr 2016 22:52:58 -0500 Subject: gnu: fontforge: Install 'showttf' tool. * gnu/packages/fontutils.scm (fontforge)[arguments]: Add 'build-contrib' phase. --- gnu/packages/fontutils.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index e438aaf422..7141f188ee 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -557,6 +557,14 @@ definitions.") ;; hard-coded. (("gww_prefix in.*") (string-append "gww_prefix in " cairo " " pango "\n")))))) + (add-after 'build 'build-contrib + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (and (zero? (system* "make" "-Ccontrib/fonttools" + "CC=gcc" "showttf")) + (begin (install-file "contrib/fonttools/showttf" bin) + #t))))) (add-after 'install 'set-library-path (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 17b974f71c1cfb6309200e3ad7cbb63a17181092 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 15 Apr 2016 00:07:15 -0500 Subject: gnu: fontforge: Remove 'patch-configure' phase. * gnu/packages/fontutils.scm (fontforge)[arguments]: Remove 'patch-configure' phase, which became unnecessary in the latest versions. --- gnu/packages/fontutils.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 7141f188ee..51638e0ec1 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -542,21 +542,6 @@ definitions.") '(#:tests? #f #:phases (modify-phases %standard-phases - (add-before 'configure 'patch-configure - (lambda* (#:key inputs #:allow-other-keys) - (let ((libxml2 (assoc-ref inputs "libxml2")) - (cairo (assoc-ref inputs "cairo")) - (pango (assoc-ref inputs "pango"))) - (substitute* "configure" - ;; configure looks for a directory to be present to determine - ;; whether libxml2 is available, rather than checking for the - ;; library or headers. Point it to the correct directory. - (("/usr/include/libxml2") - (string-append libxml2 "/include/libxml2")) - ;; Similary, the search directories for cairo and pango are - ;; hard-coded. - (("gww_prefix in.*") (string-append "gww_prefix in " - cairo " " pango "\n")))))) (add-after 'build 'build-contrib (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From de946028beb4e90495c77bd08b86f75765095b42 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 15 Apr 2016 00:08:53 -0500 Subject: gnu: fontforge: Swap giflib input for libungif. * gnu/packages/fontutils.scm (fontforge)[inputs]: Remove giflib, add libungif. [arguments]: Adjust 'set-library-path' phase accordingly. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 51638e0ec1..5f6ff15935 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -520,7 +520,6 @@ definitions.") ("fontconfig" ,fontconfig) ;dlopen'd ("freetype" ,freetype) ("gettext" ,gnu-gettext) - ("giflib" ,giflib) ;needs giflib 4.* ("glib" ,glib) ;needed for pango detection ("libICE" ,libice) ("libSM" ,libsm) @@ -531,6 +530,7 @@ definitions.") ("libpng" ,libpng) ("libspiro" ,libspiro) ("libtiff" ,libtiff) + ("libungif" ,libungif) ("libuninameslist" ,libuninameslist) ("libxft" ,libxft) ("libxml2" ,libxml2) @@ -560,7 +560,7 @@ definitions.") ,(map (lambda (input) (string-append (assoc-ref inputs input) "/lib")) - '("libtiff" "libjpeg" "libpng" "giflib" + '("libtiff" "libjpeg" "libpng" "libungif" "libxml2" "zlib" "libspiro" "freetype" "pango" "cairo" "fontconfig"))) ;; Checks for potrace program at runtime -- cgit v1.2.3 From a1713f18d0e8b1349b7c4fa73d04be3e29ceadd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 2 Apr 2016 09:47:55 +0800 Subject: gnu: freetype: Update to 2.6.3. * gnu/packages/fontutils.scm (freetype): Update to 2.6.3. --- gnu/packages/fontutils.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 5f6ff15935..bbad103535 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -46,23 +46,14 @@ (define-public freetype (package (name "freetype") - (version "2.6") + (version "2.6.3") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/freetype/freetype-" version ".tar.bz2")) (sha256 (base32 - "0zilx15fwcpa8hmcxpc423jwb8ijw4qpq968kh18akvn4j0znsc4")))) + "18k3b026762lmyrxfil5xv8qwnvj7hc12gz9bjqzbb12lmx707ip")))) (build-system gnu-build-system) - (arguments - `(#:phases - ;; This should not be necessary; reported upstream as - ;; https://savannah.nongnu.org/bugs/index.php?44261 - (alist-cons-before - 'configure 'set-paths - (lambda _ - (setenv "CONFIG_SHELL" (which "bash"))) - %standard-phases))) (synopsis "Font rendering library") (description "Freetype is a library that can be used by applications to access the -- cgit v1.2.3 From 944504b32ded87ea539667e30d8b770d6165367e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 2 Apr 2016 10:05:19 +0800 Subject: gnu: freetype: Add libpng and zlib to propagated-inputs. * gnu/packages/fontutils.scm (freetype)[propagated-inputs]: New field. [native-inputs]: New field. --- gnu/packages/fontutils.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index bbad103535..b075353d64 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -54,6 +54,13 @@ (sha256 (base32 "18k3b026762lmyrxfil5xv8qwnvj7hc12gz9bjqzbb12lmx707ip")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + ;; These are all in the Requires.private field of freetype2.pc. + ;; XXX: add harfbuzz. + `(("libpng" ,libpng) + ("zlib" ,zlib))) (synopsis "Font rendering library") (description "Freetype is a library that can be used by applications to access the -- cgit v1.2.3 From 07a048f61b1356244ed81e9bddcebc80cb1d9764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Tue, 5 Apr 2016 20:21:35 +0800 Subject: gnu: graphite2: Update to 1.3.8. * gnu/packages/fontutils.scm (graphite2): Update to 1.3.8. --- gnu/packages/fontutils.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index b075353d64..05adc71212 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -359,16 +359,15 @@ applications should be.") (define-public graphite2 (package (name "graphite2") - (version "1.3.6") + (version "1.3.8") (source (origin (method url-fetch) - (uri (string-append "https://github.com/silnrsi/graphite/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append "https://github.com/silnrsi/graphite/releases/" + "download/" version "/" name "-" version ".tgz")) (sha256 (base32 - "1frd9mjaqzvh9gs74ngc43igi53vzjzlwr5chbrs6ii1hc4aa23s")))) + "1hlc9j7w7gihy6gvzfa7902pr6yxq1sr1xkp5rwf0p29m2rjagwz")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ; because of "import imap" in tests -- cgit v1.2.3 From e969b140a4382fd91514439a57749379cf00f86b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 23 Apr 2016 13:13:53 -0400 Subject: Revert "Merge branch 'gnome-updates'" This reverts commit 63655d459e28b09cd8d58743dae14b3460f6c9da, reversing changes made to 80627f51f0238b9450745f4e642172d059ca5bb5. --- gnu/packages/fontutils.scm | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 05adc71212..5f6ff15935 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -46,21 +46,23 @@ (define-public freetype (package (name "freetype") - (version "2.6.3") + (version "2.6") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/freetype/freetype-" version ".tar.bz2")) (sha256 (base32 - "18k3b026762lmyrxfil5xv8qwnvj7hc12gz9bjqzbb12lmx707ip")))) + "0zilx15fwcpa8hmcxpc423jwb8ijw4qpq968kh18akvn4j0znsc4")))) (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (propagated-inputs - ;; These are all in the Requires.private field of freetype2.pc. - ;; XXX: add harfbuzz. - `(("libpng" ,libpng) - ("zlib" ,zlib))) + (arguments + `(#:phases + ;; This should not be necessary; reported upstream as + ;; https://savannah.nongnu.org/bugs/index.php?44261 + (alist-cons-before + 'configure 'set-paths + (lambda _ + (setenv "CONFIG_SHELL" (which "bash"))) + %standard-phases))) (synopsis "Font rendering library") (description "Freetype is a library that can be used by applications to access the @@ -359,15 +361,16 @@ applications should be.") (define-public graphite2 (package (name "graphite2") - (version "1.3.8") + (version "1.3.6") (source (origin (method url-fetch) - (uri (string-append "https://github.com/silnrsi/graphite/releases/" - "download/" version "/" name "-" version ".tgz")) + (uri (string-append "https://github.com/silnrsi/graphite/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1hlc9j7w7gihy6gvzfa7902pr6yxq1sr1xkp5rwf0p29m2rjagwz")))) + "1frd9mjaqzvh9gs74ngc43igi53vzjzlwr5chbrs6ii1hc4aa23s")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ; because of "import imap" in tests -- cgit v1.2.3