From 44469ffd83f8dd48355954eee50002efbbe58503 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Oct 2021 18:10:33 +0200 Subject: gnu: font-abattis-cantarell: Update variable name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-cantarell): Rename to… (font-abattis-cantarell): …this. * gnu/packages/gnome.scm (gnome)[propagated-inputs]: Adjust accordingly. * gnu/packages/mate.scm (mate)[inputs]: Likewise. * gnu/services/xorg.scm (): Likewise. --- gnu/packages/fonts.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 5cf2393177..de1acc5a75 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -197,10 +197,10 @@ includes lining and old-style numerals, tabular and proportional. Greek, Cyrillic, Canadian Syllabics and most Latin based languages are supported.") (license license:cc0))) -(define-public font-cantarell +(define-public font-abattis-cantarell (package (name "font-abattis-cantarell") - (version "0.301") + (version "0.303") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/cantarell-fonts/" @@ -208,7 +208,7 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.") "/cantarell-fonts-" version ".tar.xz")) (sha256 (base32 - "10sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x")))) + "11sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal))) ; for msgfmt -- cgit v1.2.3 From 405393ef7f37a8243d0bbaf807cac847218e03b4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 15 Oct 2021 23:29:57 -0400 Subject: gnu: font-abattis-cantarell: Downgrade to 0.301. Reported by talos on #guix. This fixes the build; the 0.303 release archive is not available from https://download.gnome.org/sources/cantarell-fonts/. * gnu/packages/fonts.scm (font-abattis-cantarell): Downgrade to 0.301. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index de1acc5a75..f59e93ada2 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -200,7 +200,7 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.") (define-public font-abattis-cantarell (package (name "font-abattis-cantarell") - (version "0.303") + (version "0.301") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/cantarell-fonts/" @@ -208,7 +208,7 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.") "/cantarell-fonts-" version ".tar.xz")) (sha256 (base32 - "11sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x")))) + "10sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal))) ; for msgfmt -- cgit v1.2.3 From 39c1660cef855dd22bb67dea5ad75887df5eaeb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Oct 2021 02:13:03 +0200 Subject: gnu: font-overpass: Update to 3.0.5. * gnu/packages/fonts.scm (font-overpass): Update to 3.0.5. --- gnu/packages/fonts.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index f59e93ada2..3076ac73b7 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2242,16 +2242,16 @@ half of the twentieth century.") (define-public font-overpass (package (name "font-overpass") - (version "3.0.4") + (version "3.0.5") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/RedHatOfficial/Overpass") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pl7zpwlx0j2xv23ahnpmbb4a5d6ib2cjck5mxqzi3jjk25rk9kb")))) + (base32 "1vsp94h7v5sn29hajv2ng94gyx4pqb0xgvn3gf7jp2q80gdv8pkm")))) (build-system font-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6979d57e5362a26ee4047f307ae2d73d5b45433e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Oct 2021 16:08:39 +0200 Subject: 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. --- gnu/packages/fonts.scm | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) (limited to 'gnu/packages/fonts.scm') 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 -- cgit v1.2.3 From 620bce25735355cf4b154a3138a0be7b4d629f96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 Oct 2021 20:59:52 +0200 Subject: gnu: font-liberation: Update to 2.1.5. * gnu/packages/fonts.scm (font-liberation): Update to 2.1.5. --- gnu/packages/fonts.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/fonts.scm') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index b6646daca6..dc7add8667 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -337,15 +337,15 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over (define-public font-liberation (package (name "font-liberation") - (version "2.1.4") + (version "2.1.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/liberationfonts/liberation-fonts/" - "files/6418984/liberation-fonts-ttf-" version ".tar.gz")) + "files/7261482/liberation-fonts-ttf-" version ".tar.gz")) (sha256 - (base32 "1vx5q5bif9d1cn5pvm78203sf4may2mch72aa1hx1a8avl959y16")))) + (base32 "1l15iwk0x75621q67qlh9wv561c0gc7x0kh9l9rrz29qpxlwd4bi")))) (build-system font-build-system) (home-page "https://github.com/liberationfonts") (synopsis "Fonts compatible with Arial, Times New Roman, and Courier New") -- cgit v1.2.3