From patchwork Sat Aug 26 16:10:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 53231 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5978A27BBE9; Sat, 26 Aug 2023 17:15:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1199027BBE2 for ; Sat, 26 Aug 2023 17:15:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZvwC-00010d-0E; Sat, 26 Aug 2023 12:15:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZvw9-00010G-Ip for guix-patches@gnu.org; Sat, 26 Aug 2023 12:14:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZvw9-0001VP-AO for guix-patches@gnu.org; Sat, 26 Aug 2023 12:14:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZvwE-0003Ir-Bn for guix-patches@gnu.org; Sat, 26 Aug 2023 12:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65552] [PATCH] gnu: font-openmoji: Update to 14.0.0-1.93f059d. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Aug 2023 16:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65552 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65552@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169306649512665 (code B ref -1); Sat, 26 Aug 2023 16:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Aug 2023 16:14:55 +0000 Received: from localhost ([127.0.0.1]:43344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZvw7-0003ID-CQ for submit@debbugs.gnu.org; Sat, 26 Aug 2023 12:14:55 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZvw3-0003Hr-3G for submit@debbugs.gnu.org; Sat, 26 Aug 2023 12:14:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZvvr-0000y1-F7 for guix-patches@gnu.org; Sat, 26 Aug 2023 12:14:39 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZvvo-0001V3-Tx for guix-patches@gnu.org; Sat, 26 Aug 2023 12:14:39 -0400 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-99c0cb7285fso242854766b.0 for ; Sat, 26 Aug 2023 09:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693066475; x=1693671275; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=E57iaSvNGo2oJ6butyn12iM9tFHcSyXaWc8zzWTolMA=; b=TI6V8H6HntNCxK44LkMzXO6GxhBKcMs/qLLyzbH0a9/zU+ysV7qQu8wd1JtAdDA41J 8D8b4qQrCxYlGZ1L15jFtvitKHejlrA/b+AWUlDXZxQeSSe5Jzt3TeuznhPF9KZ4mwY0 KMPFm4XNXnOpDahUZVc1jCW+TJLfKlKkZyOuGw7SklRaDld4d5QftRWgY161v6OWxA/N Iv56CLLPVC6wch3ktoaZ0DbQWkK8AmcbsPKt5QR9vR9bXY+gc5zFmf8FLWhfCVXzGKGh wQ5zXucLvVDXiGfDTMdQ5/lVI7bOA4Qw15n7RCrO5m7R/rIIfbg4Cuu4SpTFVoKW2yuE ZGwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693066475; x=1693671275; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=E57iaSvNGo2oJ6butyn12iM9tFHcSyXaWc8zzWTolMA=; b=la4DBUsZ9gbnvkpheVNsJXb0pCiI/UmWZWJKgXdSQAQQk63HFGdnqa0ZsxsRQM4E85 OZoKkLpWE6QnA8wlGL4E34lF7blMJdOWrTGPikPyBYaVXeU00L2L0eyi5O/dCFkJVxwe 2QrrwpxQf7kBgKDRTXxq6Gz4KC0ziJlWVG8ffwkaDRnjabv60mrs/c2XjNNh2R4C8OpM EXfjurCFp0BekwXxNy4q85zKtpolLY3yTiRBq65yVIblfSZJdQmtW5nkiLVjeKuGeW1A gd5mQrIg3QMMf090jXzLuGF8nG+/HDlMz1oYauHWCS05ak4K1pENucSN9omp3y8LGDWt mwaQ== X-Gm-Message-State: AOJu0YzNyZsYYSXmZVie1SEAcxAFcy6ZA5Dkj7v1OQnZm6esN+xJv6tT dyJ1gvqBMN2uTn0NYXInH3YtuIc73/EyMQ== X-Google-Smtp-Source: AGHT+IEL/jf514o1eac9uuUgj8Qf4RoeOWI5n4CdPaAzadTT/pCQg6jxwZYG3IYivfxXURjsAOvdvw== X-Received: by 2002:a17:906:95:b0:9a2:86a:f9b7 with SMTP id 21-20020a170906009500b009a2086af9b7mr6381006ejc.59.1693066475171; Sat, 26 Aug 2023 09:14:35 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id f24-20020a170906495800b009829d2e892csm2393892ejt.15.2023.08.26.09.14.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Aug 2023 09:14:34 -0700 (PDT) Message-ID: <4e74df4004495d09480e2fd27ae9a050f17cc771.1693066426.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 26 Aug 2023 18:10:49 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::644; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x644.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: cfe55b220a2e21ec6314acd2fbaa5a780ea77afc prerequisite-patch-id: 9646541100c6f84794660d4c0ccb6f128a13d6a6 prerequisite-patch-id: d238e6781ad9fe767a604395b86068f2e18c72cc prerequisite-patch-id: 26bda1337d21efeaee2821065cab934e4023da4c prerequisite-patch-id: c542ac439e7152d72d948015f50e3a24bf3cf908 prerequisite-patch-id: 306c5daef92a79a13ac467182351dd8da98ba689 prerequisite-patch-id: 578f2db4046a7f79d044f72fdb66e7aef610be81 diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index e881ab11cd..52ad5988d7 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2004,20 +2004,41 @@ (define-public font-opendyslexic (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") @@ -2025,7 +2046,7 @@ (define-public font-openmoji (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