From patchwork Mon Jun 12 20:53:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 50864 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 ADCAE27BBE9; Mon, 12 Jun 2023 22:10:32 +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_INVALID, DKIM_SIGNED,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 2699027BBE2 for ; Mon, 12 Jun 2023 22:10:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8onf-0004JB-Ma; Mon, 12 Jun 2023 17:10:07 -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 1q8ond-0004Hp-O8 for guix-patches@gnu.org; Mon, 12 Jun 2023 17:10:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8ond-0000GR-F6 for guix-patches@gnu.org; Mon, 12 Jun 2023 17:10:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8ond-0001eb-85 for guix-patches@gnu.org; Mon, 12 Jun 2023 17:10:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64028] [PATCH 18/18] gnu: font-xfree86-type1: Update to 1.0.5. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Jun 2023 21:10:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64028 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64028@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 64028-submit@debbugs.gnu.org id=B64028.16866041986287 (code B ref 64028); Mon, 12 Jun 2023 21:10:05 +0000 Received: (at 64028) by debbugs.gnu.org; 12 Jun 2023 21:09:58 +0000 Received: from localhost ([127.0.0.1]:40848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8onV-0001dE-H3 for submit@debbugs.gnu.org; Mon, 12 Jun 2023 17:09:58 -0400 Received: from araneo.si ([90.157.193.204]:57580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8oY5-00018V-Fx for 64028@debbugs.gnu.org; Mon, 12 Jun 2023 16:54:02 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id bd099dd3 for <64028@debbugs.gnu.org>; Mon, 12 Jun 2023 20:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=jFly+uY6MJIw8ki4/6J4y W2prWc=; b=q1uqPLyh6ZFXrBm2jalntTcN0zE6YvUVKMRNiiURIWskfOefeSpPf 3wuGIaIQhvt6Xmmo+phecZfApO2l7iL5xrIX0m1dL3YX4OzuFCcg9sqKiVXvikrp wO8vnREJan42WueVCiBlQuTy5faZxyKpr/rvLUiq8PWaMdISzegm96Cjs8CvJmgH NbF33yGNMpo7tBrDQFQvjll69Mn5loFb/Dkpi+4CtzUqv2/UBcVLrkXBBiLKHS8o vYOFklzYf14bqombx+cViVWu1iMKA3viu5mipdrlr8Z/IJuxMBTbIdbE7xAjO+T1 qzZ9pCgbsp5foYRan9Du+8j49F9+3r/vA== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 1dc3ef11 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 12 Jun 2023 20:53:59 +0000 (UTC) From: Timotej Lazar Date: Mon, 12 Jun 2023 22:53:33 +0200 Message-Id: <4e44fc741f09bbebc212fe5f17f94661ea221d28.1686602492.git.timotej.lazar@araneo.si> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/xorg.scm (font-xfree86-type1): Update to 1.0.5. [source]: Drop upstreamed snippet. (xorg-font-origin): Drop obsolete macro. (%xorg-font-origin): Drop unused procedure. --- gnu/packages/xorg.scm | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ed3e6e0907..e41ddea28f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -468,26 +468,6 @@ (define-public encodings (description "Xorg font encoding files.") (license license:public-domain))) -(define (%xorg-font-origin font version hash) - (origin - (method url-fetch) - (uri (string-append "mirror://xorg/individual/font/" font "-" - version ".tar.bz2")) - (sha256 hash) - (modules '((guix build utils))) - (snippet - ;; Do not include timestamps in '.pcf.gz' files. - '(begin - (substitute* "Makefile.in" - (("^COMPRESS = (.*)$" _ rest) - (string-append "COMPRESS = " (string-trim-right rest) - " --no-name\n"))) - #t)))) - -(define-syntax-rule (xorg-font-origin font version hash) - "Expand to the 'origin' form for the given Xorg font package." - (%xorg-font-origin font version (base32 hash))) - (define-public font-adobe100dpi (package (name "font-adobe100dpi") @@ -893,10 +873,12 @@ (define-public font-winitzki-cyrillic (define-public font-xfree86-type1 (package (name "font-xfree86-type1") - (version "1.0.4") - (source (xorg-font-origin - name version - "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya")) + (version "1.0.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://xorg/individual/font/" + "font-xfree86-type1-" version ".tar.xz")) + (sha256 "0ds8xbgxy9h0bqn2p38vylfzn8cqkp7n51kwmw1c18ayi9w2qg59"))) (build-system gnu-build-system) (inputs (list mkfontdir mkfontscale))