From patchwork Fri Jul 5 15:54:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 14475 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 D094B171BD; Fri, 5 Jul 2019 16:59:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 836F0171B7 for ; Fri, 5 Jul 2019 16:59:41 +0100 (BST) Received: from localhost ([::1]:54378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjQcd-0007wl-7t for patchwork@mira.cbaines.net; Fri, 05 Jul 2019 11:59:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38710) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjQZE-0005Lu-3L for guix-patches@gnu.org; Fri, 05 Jul 2019 11:56:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjQZB-0002r0-Kl for guix-patches@gnu.org; Fri, 05 Jul 2019 11:56:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44819) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjQZ8-0002fh-Ue for guix-patches@gnu.org; Fri, 05 Jul 2019 11:56:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hjQZ7-0007L9-SM for guix-patches@gnu.org; Fri, 05 Jul 2019 11:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36513] texlive-union: Build missing font maps. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jul 2019 15:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36513@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156234212628168 (code B ref -1); Fri, 05 Jul 2019 15:56:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jul 2019 15:55:26 +0000 Received: from localhost ([127.0.0.1]:53639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hjQYY-0007KF-6G for submit@debbugs.gnu.org; Fri, 05 Jul 2019 11:55:26 -0400 Received: from lists.gnu.org ([209.51.188.17]:33741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hjQYV-0007K5-U1 for submit@debbugs.gnu.org; Fri, 05 Jul 2019 11:55:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38504) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjQYL-0004Nm-Ks for guix-patches@gnu.org; Fri, 05 Jul 2019 11:55:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjQYG-0007Jr-1k for guix-patches@gnu.org; Fri, 05 Jul 2019 11:55:11 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21241) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hjQYE-0006mc-J7; Fri, 05 Jul 2019 11:55:07 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1562342099; cv=none; d=zoho.com; s=zohoarc; b=NSH002z5WT11YzkLEJF95rxm8CRvN4ibjp7i9BalqFgWB1zzhAUPgxsb9AFdBhxOxVPppgkQgU+5alHcToPXBKqjmr+pWmCXjQF7rjaPvkv2+rc5OaTkbtvsAipnBYvYVodOy+no0lKI2m/Ax9wFkN86GYNGjqqV/MSUh+isPkw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562342099; h=Content-Type:Cc:Date:From:MIME-Version:Message-ID:Subject:To:ARC-Authentication-Results; bh=p8rReO2NNhdfbimir55o2ShvkoLeAZ4qE5AK96XDQBo=; b=lDsIxnyChlMvwCN/fC74FuQCaRFbwzTsiAuGgYAcfE3Msnwzx88JMuQhRoYHmZX4OXdOmNTieYygfx6Zg0+QN0lbJvOBJZelYLkKwzkNZ+mfZb4ItGCc0FXe//W0lgwbQr39FcugAFSA+uh8sMAnz4QYjuqRVcfagdXYe2CnZ4E= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1562342099; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; l=3773; bh=p8rReO2NNhdfbimir55o2ShvkoLeAZ4qE5AK96XDQBo=; b=cmYC05aMJgBiVUbzlOWo9ftGw/A3w+ggKU7X/FeFL5KGPlUlSTjcnxH9TTJXbSLs XROAiDjQYhgR/Z6i7ft80Uwjw2wRmvG6lSN5ZyGGZIOADyn0gf/s4434M+rknFmTiK+ EjBFheqerUL0dhCixEXgwx5R92WdVPWkeLFURdA8= Received: from localhost (141.80.247.250 [141.80.247.250]) by mx.zohomail.com with SMTPS id 1562342097400409.2248423731804; Fri, 5 Jul 2019 08:54:57 -0700 (PDT) User-agent: mu4e 1.2.0; emacs 26.2 From: Ricardo Wurmus X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Fri, 05 Jul 2019 17:54:54 +0200 Message-ID: <87d0ioschd.fsf@elephly.net> MIME-Version: 1.0 X-ZohoMailClient: External X-Zoho-Virus-Status: 1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Hi Guix, this patch causes texlive-union to include pdftex.map, among other font map files. This is achieved by running updmap in the builder. This should fix a couple of problems. Unfortunately, this doesn’t fix the same problem with the profile hook, so I think this means that the profile hook should be using texlive-union to avoid duplication. What do you think? --- Ricardo From 11900d109a617d07e0085a25e747da76fcb12c2e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Jul 2019 17:48:45 +0200 Subject: [PATCH] gnu: texlive-union: Build font maps. * gnu/packages/tex.scm (texlive-union)[arguments]: Execute updmap to generate missing font maps. [native-inputs]: Add coreutils, sed, and updmap.cfg. --- gnu/packages/tex.scm | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ec35315f22..85c72e006a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2387,16 +2387,18 @@ standard LaTeX packages." #:builder (begin (use-modules (ice-9 match) + (ice-9 popen) (srfi srfi-26) (guix build union) (guix build utils) (guix build texlive-build-system)) (let* ((out (assoc-ref %outputs "out")) (texmf.cnf (string-append out "/share/texmf-dist/web2c/texmf.cnf"))) - ;; Build a modifiable union of all inputs (but exclude bash) + ;; Build a modifiable union of all inputs (but exclude bash and + ;; the updmap.cfg file) (match (filter (match-lambda ((name . _) - (not (string=? "bash" name)))) + (not (member name '("bash" "updmap.cfg"))))) %build-inputs) (((names . directories) ...) (union-build (assoc-ref %outputs "out") @@ -2413,19 +2415,47 @@ standard LaTeX packages." (string-append "TEXMFROOT = " out "/share\n")) (("^TEXMF = .*") "TEXMF = $TEXMFROOT/share/texmf-dist\n")) - (setenv "PATH" (string-append (assoc-ref %build-inputs "bash") - "/bin")) + (setenv "PATH" (string-append + (assoc-ref %build-inputs "bash") "/bin:" + (assoc-ref %build-inputs "coreutils") "/bin:" + (string-append out "/bin"))) (for-each (cut wrap-program <> `("TEXMFCNF" ":" suffix (,(dirname texmf.cnf))) `("TEXMF" ":" suffix (,(string-append out "/share/texmf-dist")))) (find-files (string-append out "/bin") ".*")) + + ;; Remove invalid maps from config file. + (let ((port (open-pipe* OPEN_WRITE "updmap-sys" + "--syncwithtrees" + "--nohash" + (assoc-ref %build-inputs "updmap.cfg")))) + (display "Y\n" port) + (when (not (zero? (status:exit-val (close-pipe port)))) + (error "failed to filter updmap.cfg"))) + ;; Generate maps. + (invoke "updmap-sys" "--force" + (string-append out "/share/texmf-config/web2c/updmap.cfg")) #t)))) (inputs `(("bash" ,bash) ,@(map (lambda (package) (list (package-name package) package)) (append default-packages packages)))) + (native-inputs + `(("coreutils" ,coreutils) + ("sed" ,sed) + ("updmap.cfg" + ,(origin + (method url-fetch) + (uri (string-append "https://tug.org/svn/texlive/tags/" + %texlive-tag "/Master/texmf-dist/web2c/updmap.cfg" + "?revision=" (number->string %texlive-revision))) + (file-name (string-append "updmap.cfg-" + (number->string %texlive-revision))) + (sha256 + (base32 + "06mwpy5i218g5k3sf4gba0fmxgas82hkzx9fhwn67z5ik37d8apq")))))) (home-page (package-home-page texlive-bin)) (synopsis "Union of TeX Live packages") (description "This package provides a subset of the TeX Live -- 2.21.0