diff options
Diffstat (limited to 'gnu/packages/fontutils.scm')
| -rw-r--r-- | gnu/packages/fontutils.scm | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 212c258aca..f82b7d1bf9 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1709,32 +1709,6 @@ generate bitmaps.") (license license:gpl3+) (home-page "https://fontforge.github.io"))) -;; This is the last version that supports Python 2, which is needed for -;; GNU FreeFont. Remove once no longer required. -(define-public fontforge-20190801 - (package - (inherit fontforge) - (version "20190801") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/fontforge/fontforge/releases/download/" - version "/fontforge-" version ".tar.gz")) - (sha256 - (base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r")))) - (build-system gnu-build-system) - (arguments - (substitute-keyword-arguments (package-arguments fontforge) - ((#:configure-flags _) - #~'()) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'do-not-override-RPATH))))) - (inputs - (modify-inputs (package-inputs fontforge) - (prepend libuninameslist) - (replace "python" python-2))))) - (define-public python-statmake (package (name "python-statmake") @@ -1751,6 +1725,9 @@ generate bitmaps.") (build-system pyproject-build-system) (arguments (list + #:test-flags + ;; The code no longer raises <class 'ValueError'> + '(list "-k" "not test_load_stylespace_broken_range") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'adjust-for-older-attrs @@ -1760,7 +1737,9 @@ generate bitmaps.") (lambda _ (substitute* "pyproject.toml" (("attrs = \">=21.3\"") - "attrs = \">=21.2\"")) + "attrs = \">=21.2\"") + (("cattrs = \">=22.2\"") + "cattrs = \">=22.1\"")) (substitute* (find-files "." "\\.py$") (("from attrs\\b") "from attr") |