diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-10-16 16:08:39 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-10-16 17:30:30 +0200 |
| commit | 6979d57e5362a26ee4047f307ae2d73d5b45433e (patch) | |
| tree | 5c2e5ffe96d0df591a366cce8104736462a2abe0 | |
| parent | e924e0adcfa7f227e31879f5f2fa87ba580543fd (diff) | |
| download | guix-6979d57e5362a26ee4047f307ae2d73d5b45433e.tar.gz | |
gnu: font-abattis-cantarell: Update to 0.303.
This atones^Wfollows up on commit 44469ffd83f8dd48355954eee50002efbbe58503 which, as its changelog suggests, was not supposed to suck. * gnu/packages/fonts.scm (font-abattis-cantarell): Update to 0.303. [source]: Fetch a zipbomb from GNOME's GitLab. [build-system]: Use the font-build-system. We never actually built anything. [arguments]: Add custom 'unpack-source and 'unpack-variable-font phases. [native-inputs]: Fetch another zipbomb from GNOME's GitLab. Add unzip to unpack both of them. Remove gettext-minimal.
| -rw-r--r-- | gnu/packages/fonts.scm | 46 |
1 files changed, 35 insertions, 11 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3076ac73b7..b6646daca6 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -200,18 +200,42 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.") (define-public font-abattis-cantarell (package (name "font-abattis-cantarell") - (version "0.301") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/cantarell-fonts/" - (version-major+minor version) - "/cantarell-fonts-" version ".tar.xz")) - (sha256 - (base32 - "10sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x")))) - (build-system meson-build-system) + (version "0.303") + (source + (origin + (method url-fetch/zipbomb) + (uri (string-append "https://gitlab.gnome.org/GNOME/cantarell-fonts/-/" + "jobs/1515399/artifacts/download")) + (file-name (string-append name "-" version "-static")) + (sha256 + (base32 "1dz551xrrhx6l40j57ksk2alllrihghg4947z1r88dpcq3snpn1s")))) + (build-system font-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-source + ;; The actual OTF fonts are prebuilt (building them requires at least + ;; the currently unpackaged psautohint and its numerous dependencies; + ;; TODO), but unpack the source so that COPYING is installed later. + (lambda* (#:key outputs #:allow-other-keys) + (invoke "tar" "--strip-components=1" "-xvf" + (string-append "build/meson-dist/cantarell-fonts-" + ,version ".tar.xz")))) + (add-after 'unpack 'unpack-variable-font + (lambda* (#:key inputs #:allow-other-keys) + (let ((variable-font (assoc-ref inputs "variable-font"))) + (copy-recursively (string-append variable-font "/prebuilt") + "."))))))) (native-inputs - `(("gettext" ,gettext-minimal))) ; for msgfmt + `(("variable-font" + ,(origin + (method url-fetch/zipbomb) + (uri (string-append "https://gitlab.gnome.org/GNOME/cantarell-fonts/-/" + "jobs/1515398/artifacts/download")) + (file-name (string-append name "-" version "-variable")) + (sha256 + (base32 "0z93pbkxidsx3y98rsl2jm2qpvxv5pj0w870xhnsciglw6pc9a9i")))) + ("unzip" ,unzip))) (home-page "https://wiki.gnome.org/Projects/CantarellFonts") (synopsis "Cantarell sans-serif typeface") (description "The Cantarell font family is a contemporary Humanist |