From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2GfMKvFAMmG7RQEAgWs5BA (envelope-from ) for ; Fri, 03 Sep 2021 17:36:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id aDCWJvFAMmGkJQAA1q6Kng (envelope-from ) for ; Fri, 03 Sep 2021 15:36:17 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EC3E7245B0 for ; Fri, 3 Sep 2021 17:36:16 +0200 (CEST) Received: from localhost ([::1]:34704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMBEm-0003Je-1y for larch@yhetil.org; Fri, 03 Sep 2021 11:36:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMBBf-000752-Qu for guix-patches@gnu.org; Fri, 03 Sep 2021 11:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMBBf-00062z-IG for guix-patches@gnu.org; Fri, 03 Sep 2021 11:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mMBBf-0007Xg-FQ for guix-patches@gnu.org; Fri, 03 Sep 2021 11:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50358] [PATCH core-updates-frozen 8/8] gnu: fontconfig: Add a search path for XDG_DATA_DIRS. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Sep 2021 15:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50358@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 50358-submit@debbugs.gnu.org id=B50358.163068313428916 (code B ref 50358); Fri, 03 Sep 2021 15:33:03 +0000 Received: (at 50358) by debbugs.gnu.org; 3 Sep 2021 15:32:14 +0000 Received: from localhost ([127.0.0.1]:45780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMBAr-0007WF-Ji for submit@debbugs.gnu.org; Fri, 03 Sep 2021 11:32:13 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:41646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMBAg-0007UT-P5 for 50358@debbugs.gnu.org; Fri, 03 Sep 2021 11:32:03 -0400 Received: by mail-qk1-f169.google.com with SMTP id bk29so6143344qkb.8 for <50358@debbugs.gnu.org>; Fri, 03 Sep 2021 08:32:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3BTmZGT6XrD3BBw53KoW2+hG6S/uckRdVi+rKc/um6Y=; b=OUhD0LMYCcVspxiuxXQmmu+jpUJYHqK1nWlrvvSh17V4DQY2VGpId/pxhRm6d0Mi/E O9Pm9hcEOL3D3D6ZJ769LznUIRJ43IYxC5WWxEW4omq5umqqrUngTN4vQspXFnTUw02k qopTx9eEf3kafQIdW2CnRK+VfhaFMPA2tIgbguOXo43LqprMYq8yomyx0xiLsJqoC71p lwagIOLVztagSqR7Zg4DzORW/CUI7JnYZqp/D1qFYuyEi5qvJDS9gInNgdsYLxZs1heM Jx6QRd1g1XMkh1jax6IIiUqgOVi6N/8Z79Q+apSdXULrGjTvTat8orU3Q7qzA3rUkha3 070A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3BTmZGT6XrD3BBw53KoW2+hG6S/uckRdVi+rKc/um6Y=; b=Wg/3H1Ha1uOGdYi9MfcE05WBNvwP8pCFtykZL2JSKAmLs0xQ+WLGV7Vv3iZL6T5WN8 JF7VL0frPLoN4z0CgRszo5madqCk8hdgkmz1MB2LgUeHnw4s5/S66SZa90EL3mlpvjLB gwg1rO6iqlJPB8HeEJuZiPwVjrKvaDb0nAOUgFsJjkU2lARfL7xhli9tztevv73ZWcsi 5al+tbinQkjEWFNKHHCS98VhbcNvPO83NF+2cIRdFg7tjRBa0b7GCfs6sRYaZZqwpe9S fGSXFW1M8nqhKUzeB/cNTqelJAW6SuQyzBP5w/8CFVvJt0IbIYU74VN/dCHlS6pQV9Ay u6Vw== X-Gm-Message-State: AOAM533i3YMbW+LIUx1w/0mKxWvjKBMsw9MHPiQXuoxcQ9LBiQotHiJK hdFox7JWb/U9O/yRoIwaSlDPPBVp9/g= X-Google-Smtp-Source: ABdhPJzV7hMak5LVULCt2GTFvWrhEcAP51em8KEd7++NMixvymu+69TolAf/Znz1z/No+MOvAm33qg== X-Received: by 2002:a05:620a:a93:: with SMTP id v19mr3955477qkg.185.1630683116933; Fri, 03 Sep 2021 08:31:56 -0700 (PDT) Received: from localhost.localdomain ([207.35.94.150]) by smtp.gmail.com with ESMTPSA id b25sm3973128qka.23.2021.09.03.08.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 08:31:56 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 3 Sep 2021 11:31:16 -0400 Message-Id: <20210903153116.22517-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210903153116.22517-1-maxim.cournoyer@gmail.com> References: <20210903153116.22517-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630683377; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=3BTmZGT6XrD3BBw53KoW2+hG6S/uckRdVi+rKc/um6Y=; b=t9yZ6b7U7ixBrdrgrJ18rFMwnaeJtwZ3fZ6Orw6PvTvQ2Li+mz28X4AnWxo8brgHOTVyzz oUG9y7zMXiJt+UlKk3f0x7mhBW8TbLKufbnhZEOQ0uDH2NSfAoODhBuVTNXVuxkQfXi4kg b9adSLZ+cSUROxp2ErguwAMnqIU2V7jT9F0ySUEZKuwLuQhZxkmmgOYqXH5v9zLnxR5p6L pMSDojv9sKLmf7kZuLoeZBPOE10ESQCpSe/sZSdMKcQdt/zmZ5bX2nzQFEtSJJtNwQBPyn uj53BmBxfMCA4ILlXlFiHrFCwYm1Z+paJxXVtGlZlsOIVwehSEPyhqr4rgxMhg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630683377; a=rsa-sha256; cv=none; b=FZrjOVWj6WkQADQHWG2coBkBXh/BlbObyT4pVfBz/Ly+SbCi9OhHotB45ohndAI1ZQKIzO eUcZKeJkAEqlN86GqPyzHAs2kyh6jwaHnrt89q4OxET3NucPy9DFzig+CiNq8Lbr1Q1uLX Y2PcSubecjaToS6c9+vWxZiO69mP10V+b18seN+z9RX7Naxwpwuoq242b74pfHRtJAeQsL rXqfKmcFnGvgbioM+q0sBQePaYXjKny47073XUMFu4VGdZpWNWdMJ4+xHCK8AWuQlMutUz HYXHhzIPwSTF//CM+RBwd8w+11Fuo8tZHCI6FMxhS7pZB9tyCuUyW532yUGfnQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=OUhD0LMY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=OUhD0LMY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: EC3E7245B0 X-Spam-Score: 2.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: nA7ADEp0jb+b Fixes . * gnu/packages/fontutils.scm (fontconfig)[source]: Fix indentation. [configure-flags]: Drop the "--with-add-fonts" configure option as it's no longer necessary/desirable to special case the system and user profiles. [native-search-paths]: New search path. --- gnu/packages/fontutils.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 8e0980dd95..9a5cdc1cb6 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -327,14 +327,13 @@ Font Format (WOFF).") (name "fontconfig-minimal") (version "2.13.94") (source (origin - (method url-fetch) - (uri (string-append - "https://www.freedesktop.org/software/" - "fontconfig/release/fontconfig-" version ".tar.xz")) - (sha256 - (base32 - "0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55")) - (patches (search-patches "fontconfig-cache-ignore-mtime.patch")))) + (method url-fetch) + (uri (string-append + "https://www.freedesktop.org/software/" + "fontconfig/release/fontconfig-" version ".tar.xz")) + (sha256 (base32 + "0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55")) + (patches (search-patches "fontconfig-cache-ignore-mtime.patch")))) (build-system gnu-build-system) ;; In Requires or Requires.private of fontconfig.pc. (propagated-inputs `(("expat" ,expat) @@ -356,12 +355,7 @@ Font Format (WOFF).") ;; register the default fonts (string-append "--with-default-fonts=" (assoc-ref %build-inputs "font-dejavu") - "/share/fonts") - - ;; Register fonts from user and system profiles. - (string-append "--with-add-fonts=" - "~/.guix-profile/share/fonts," - "/run/current-system/profile/share/fonts")) + "/share/fonts")) #:phases (modify-phases %standard-phases (add-before 'check 'skip-problematic-tests @@ -393,6 +387,12 @@ high quality, anti-aliased and subpixel rendered text on a display.") ; The exact license is more X11-style than BSD-style. (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")) + (native-search-paths + ;; Since version 2.13.94, fontconfig knows to find fonts from + ;; XDG_DATA_DIRS. + (list (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))))) (home-page "https://www.freedesktop.org/wiki/Software/fontconfig")))) ;;; The documentation of fontconfig is built in a separate package, as it -- 2.33.0