From a0e10c5252c70802cae57e7012bed488a0b30728 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 26 Aug 2023 18:10:49 +0200 Subject: [PATCH] gnu: font-openmoji: Update to 14.0.0-1.93f059d. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Up until and including 14.0.0, the OpenMoji font only works in Icecat. However, the git sources already include variants that work in other browsers and desktop applications, so let's use them. * gnu/packages/fonts.scm (font-openmoji): Update to 14.0.0-1.93f059d. [source]: Change to git-fetch. [arguments]: Add ‘chdir’, ‘strip-alternative-variants’ and ‘chdir-back’. --- gnu/packages/fonts.scm | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index e10227f020a803522c5ceb084fedd256d56c9001..3cdfb7500abc0c2b45ff84ee0159819ca822469d 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2059,20 +2059,41 @@ emphasis while still being readable.") (license license:silofl1.1))) (define-public font-openmoji - (package + (let ((commit "93f059dfb68401d49beaef7a3e09b80072b51a1f") + (revision "1")) + (package (name "font-openmoji") - (version "13.1.0") + (version (git-version "14.0.0" revision commit)) (source (origin - (method url-fetch/zipbomb) - (uri - (string-append "https://github.com/hfg-gmuend/openmoji/" - "releases/download/" version - "/openmoji-font.zip")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/hfg-gmuend/openmoji/") + (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 - "0xmy3hr38v03f1riwxmxdibb7iwj0qz288inqaha3pwq7pj7ln45")))) - (build-system font-build-system) + "16w4lg2y6qzb45j08l7cdwprjhprsm11jsm6nxzxwy2wzykd7gxk")))) + (build-system font-build-system) + (arguments (list #:modules `((ice-9 ftw) + (guix build font-build-system) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "font"))) + (add-after 'chdir 'strip-alternative-variants + (lambda _ + (let ((keep '("OpenMoji-black-glyf" + "OpenMoji-color-glyf_colr_0" + "." + ".."))) + (for-each (lambda (f) + (unless (member f keep) + (delete-file-recursively f))) + (scandir "."))))) + (add-before 'install-license-files 'chdir-back + (lambda _ (chdir "..")))))) (native-inputs (list unzip)) (home-page "https://openmoji.org") @@ -2080,7 +2101,7 @@ emphasis while still being readable.") (description "This package provides the OpenMoji font in both color and black variants.") - (license license:cc-by-sa4.0))) + (license license:cc-by-sa4.0)))) (define-public font-dosis (package