From 8152024c2c743aada72b26692862859f74866640 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:14:02 +0100 Subject: gnu: graphite2: Update to 1.3.13. * gnu/packages/fontutils.scm (graphite2): Update to 1.3.13. --- 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 274efe5fd8..2b60979699 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -433,7 +433,7 @@ applications should be.") (define-public graphite2 (package (name "graphite2") - (version "1.3.12") + (version "1.3.13") (source (origin (method url-fetch) @@ -441,7 +441,7 @@ applications should be.") "download/" version "/" name "-" version ".tgz")) (sha256 (base32 - "1l1940d8fz67jm6a0x8cjb5p2dv48cvz3wcskwa83hamd70k15fd")))) + "01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ; because of "import imap" in tests -- cgit v1.2.3 From 01a92a70c403ff0883733ec8ff0419f07d6b3ef4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 17:04:20 +0100 Subject: gnu: fontforge: Build against Python 3. * gnu/packages/fontutils.scm (fontforge)[inputs]: Change from PYTHON-2 to PYTHON. --- gnu/packages/fontutils.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 21f8c7d227..0259e374d9 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -586,10 +586,7 @@ definitions.") ("libxml2" ,libxml2) ("pango" ,pango) ("potrace" ,potrace) - ;; FIXME: We use Python 2 here because there is a bug in Python - ;; 3.7 that is triggered when Py_Main is called after Py_Init, as - ;; is done by fontforge. This will be fixed in Python 3.7.1. - ("python" ,python-2) + ("python" ,python) ("zlib" ,zlib))) (arguments '(#:phases -- cgit v1.2.3 From 3b08c873d857b5585204535da8906e53c8aed568 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:58:30 +0200 Subject: gnu: fontforge: Update to 20190413. * gnu/packages/fontutils.scm (fontforge): Update to 20190413. --- gnu/packages/fontutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 0259e374d9..820dd6f666 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -555,14 +555,14 @@ definitions.") (define-public fontforge (package (name "fontforge") - (version "20190317") + (version "20190413") (source (origin (method url-fetch) (uri (string-append "https://github.com/fontforge/fontforge/releases/download/" version "/fontforge-" version ".tar.gz")) - (sha256 (base32 - "1ddqbpc32cgbccdnv0lfw0qhj59hcqzb7616ph5lkvm91pnas4dp")))) + (sha256 + (base32 "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From fefa75f39898bda746bf8119104ab42571ec10f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Jun 2019 18:07:20 +0200 Subject: gnu: freetype: Update to 2.10.0. * gnu/packages/fontutils.scm (freetype): Update to 2.10.0. --- 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 820dd6f666..cddd067517 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -57,13 +57,13 @@ (define-public freetype (package (name "freetype") - (version "2.9.1") + (version "2.10.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/freetype/freetype-" version ".tar.bz2")) (sha256 (base32 - "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv")))) + "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w")))) (build-system gnu-build-system) (arguments ;; The use of "freetype-config" is deprecated, but other packages still -- cgit v1.2.3 From e27916274cd85df4a097fc16af1a6159e9d647b6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 1 Jul 2019 13:31:55 +0200 Subject: gnu: libuninameslist: Update to 20190701. * gnu/packages/fontutils.scm (libuninameslist): Update to 20190701. --- 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 cddd067517..818d77f127 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -529,7 +529,7 @@ smooth contours with constant curvature at the spline joins.") (define-public libuninameslist (package (name "libuninameslist") - (version "20190305") + (version "20190701") (home-page "https://github.com/fontforge/libuninameslist") (source (origin @@ -538,7 +538,7 @@ smooth contours with constant curvature at the spline joins.") "/libuninameslist-dist-" version ".tar.gz")) (sha256 (base32 - "1rwd2bgcyvign9agyjsr3v2fr9j1cg2wi6g0z2wwg1az32scknwq")))) + "18c9pcz81wm26q2m7npmvh9j3ibjs2hycxfh5xic2xgjfw40v2qn")))) (build-system gnu-build-system) (synopsis "Unicode names and annotation list") (description -- cgit v1.2.3 From c4fa39188a9f198c99de528794cc7b3c4a053911 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 18:53:32 +0200 Subject: gnu: graphite2: Build against Python 3. Previously, the Python tests were skipped, because they require Python 3. * gnu/packages/fontutils.scm (graphite2)[arguments]: New field. [native-inputs]: Change PYTHON-2 and PYTHON2-FONTTOOLS to PYTHON and PYTHON-FONTTOOLS. --- gnu/packages/fontutils.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 818d77f127..725d3ac878 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -438,9 +439,20 @@ applications should be.") (base32 "01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx")))) (build-system cmake-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-test-PYTHONPATH + (lambda _ + ;; Tell the build system not to override PYTHONPATH + ;; while running the Python tests. + (substitute* "Graphite.cmake" + (("ENVIRONMENT PYTHONPATH=") + (string-append "ENVIRONMENT PYTHONPATH=" + (getenv "PYTHONPATH") ":"))) + #t))))) (native-inputs - `(("python" ,python-2) ; because of "import imap" in tests - ("python-fonttools" ,python2-fonttools))) + `(("python" ,python) + ("python-fonttools" ,python-fonttools))) (inputs `(("freetype" ,freetype))) (synopsis "Reimplementation of the SIL Graphite text processing engine") -- cgit v1.2.3 From e81b14f08d62b7fc3ffcef0fce56968d2a7eb8a4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 21:26:21 +0200 Subject: gnu: freetype: Update to 2.10.1. * gnu/packages/fontutils.scm (freetype): Update to 2.10.1. [source](uri): Adjust for new tarball name. --- gnu/packages/fontutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 725d3ac878..8a9a9b8ef7 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -58,13 +58,13 @@ (define-public freetype (package (name "freetype") - (version "2.10.0") + (version "2.10.1") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/freetype/freetype-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w")))) + "0vx2dg1jh5kq34dd6ifpjywkpapp8a7p1bvyq9yq5zi1i94gmnqn")))) (build-system gnu-build-system) (arguments ;; The use of "freetype-config" is deprecated, but other packages still -- cgit v1.2.3 From 33ef61ec726b6640595f82e38d4d72e6ef73e7e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 19:10:09 +0200 Subject: gnu: fontforge: Remove superfluous input. Pango propagates Glib nowadays, no need to list it eplicitly. * gnu/packages/fontutils.scm (fontforge)[inputs]: Remove GLIB. --- gnu/packages/fontutils.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 8a9a9b8ef7..fb18440bac 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -582,7 +582,6 @@ definitions.") ("fontconfig" ,fontconfig) ;dlopen'd ("freetype" ,freetype) ("gettext" ,gettext-minimal) - ("glib" ,glib) ;needed for pango detection ("libICE" ,libice) ("libSM" ,libsm) ("libX11" ,libx11) -- cgit v1.2.3 From 26a7ff6e10652270a4ef6ef9a08392b31ff86f40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 19:11:06 +0200 Subject: gnu: fontforge: Fix segfault on i686 (and possibly other platforms). * gnu/packages/fontutils.scm (fontforge)[source](patches): New field. --- gnu/packages/fontutils.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index fb18440bac..fe9e77d8c7 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -573,6 +573,19 @@ definitions.") (uri (string-append "https://github.com/fontforge/fontforge/releases/download/" version "/fontforge-" version ".tar.gz")) + (patches (list (origin + ;; This patch is required to fix a segfault on i686: + ;; . + ;; It is a squashed version of these commits: + ;; . + (method url-fetch) + (uri (string-append + "https://github.com/fontforge/fontforge/commit/" + "570e17b82079bb46af9b2be033c6fbb6b1f16c8f.patch")) + (file-name "fontforge-scripting-array-reference.patch") + (sha256 + (base32 + "1w0jbbkml149xmraxwchwrllia853i51ii6jdb3s160r2qbhvggc"))))) (sha256 (base32 "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7")))) (build-system gnu-build-system) -- cgit v1.2.3 From 7670efefe4fb4aca12cb19ea5d89ff37c48e3ea6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 19 Sep 2019 13:58:55 +0200 Subject: gnu: fontforge: Update to 20190801. * gnu/packages/fontutils.scm (fontforge): Update to 20190801. [source](patches): Remove. The patch served by github.com had been modified in place. --- gnu/packages/fontutils.scm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 041c1b3b6b..e355f7bb89 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus -;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018, 2019 Ludovic Courtès ;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -567,27 +567,14 @@ definitions.") (define-public fontforge (package (name "fontforge") - (version "20190413") + (version "20190801") (source (origin (method url-fetch) (uri (string-append "https://github.com/fontforge/fontforge/releases/download/" version "/fontforge-" version ".tar.gz")) - (patches (list (origin - ;; This patch is required to fix a segfault on i686: - ;; . - ;; It is a squashed version of these commits: - ;; . - (method url-fetch) - (uri (string-append - "https://github.com/fontforge/fontforge/commit/" - "570e17b82079bb46af9b2be033c6fbb6b1f16c8f.patch")) - (file-name "fontforge-scripting-array-reference.patch") - (sha256 - (base32 - "1w0jbbkml149xmraxwchwrllia853i51ii6jdb3s160r2qbhvggc"))))) (sha256 - (base32 "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7")))) + (base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3