From patchwork Tue Feb 25 14:59:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 20423 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 319E027BBE4; Tue, 25 Feb 2020 15:00:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8DF5E27BBEA for ; Tue, 25 Feb 2020 15:00:11 +0000 (GMT) Received: from localhost ([::1]:58254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bgx-0008D2-3G for patchwork@mira.cbaines.net; Tue, 25 Feb 2020 10:00:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53406) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bgp-0008Cr-St for guix-patches@gnu.org; Tue, 25 Feb 2020 10:00:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6bgo-0003WM-Tl for guix-patches@gnu.org; Tue, 25 Feb 2020 10:00:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49963) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6bgo-0003W9-Qz for guix-patches@gnu.org; Tue, 25 Feb 2020 10:00:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6bgo-0003oY-No for guix-patches@gnu.org; Tue, 25 Feb 2020 10:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39783] [PATCH] gnu: gsettings-desktop-schemas: patch monospace font. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Feb 2020 15:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39783 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39783@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158264276814589 (code B ref -1); Tue, 25 Feb 2020 15:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Feb 2020 14:59:28 +0000 Received: from localhost ([127.0.0.1]:55936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6bgF-0003nF-LK for submit@debbugs.gnu.org; Tue, 25 Feb 2020 09:59:27 -0500 Received: from lists.gnu.org ([209.51.188.17]:38131) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6bgD-0003n7-NB for submit@debbugs.gnu.org; Tue, 25 Feb 2020 09:59:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53292) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bgB-000878-Qg for guix-patches@gnu.org; Tue, 25 Feb 2020 09:59:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6bgA-0003Cq-Dq for guix-patches@gnu.org; Tue, 25 Feb 2020 09:59:23 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:57971) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6bg9-0003BH-Ut for guix-patches@gnu.org; Tue, 25 Feb 2020 09:59:22 -0500 Received: from localhost.localdomain (194-118-3-109.hdsl.highway.telekom.at [194.118.3.109]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 48Rhsb6m59z1LLyf for ; Tue, 25 Feb 2020 15:59:15 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 48Rhsb6m59z1LLyf DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1582642756; bh=wEZ24swc/eiHws7R1IMZ7HRpQ+c4vvKKH5P+pzN04mY=; h=From:To:Subject:Date:From; b=ZDdxBV9Tzvhz/ACmN1CyWFb15yxbdYuuT+iTYMgLnPzv4DHpvUa26qaCSQHSlBflZ m9KqaRJgD6QVTFRx4CEGw4BP9UYhRZ3yC9rj0B/HPnFXyF05lZB5xgm0BRM1Wm9SJb pqFkeE+VKpa/eWbGibCt9oHCgYOgGK8+CLvhP/Hk= From: Leo Prikler Date: Tue, 25 Feb 2020 15:59:10 +0100 Message-Id: <20200225145910.26066-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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 * gnu/packages/gnome.scm (gsettings-desktop-schemas)[arguments]: Rename `set-adwaita-theme-file-name' to the more generic `patch-schemas'. Add patch for the monospace font (Source Code Pro 10 -> Monospace 11). Adjust comments. --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index af45ceb505..e066b4c93c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1575,15 +1575,17 @@ on the GNOME Desktop with a single simple application.") (build-system meson-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'set-adwaita-theme-file-name + (add-after 'unpack 'patch-schemas (lambda* (#:key inputs #:allow-other-keys) - ;; Provide the correct file name of the default GNOME - ;; background, 'adwaita-timed.xml'. (let ((theme (assoc-ref inputs "gnome-backgrounds"))) (substitute* (find-files "schemas" "\\.gschema\\.xml\\.in$") + ;; Provide the correct file name of the default GNOME + ;; background, 'adwaita-timed.xml'. (("@datadir@/backgrounds/gnome") - (string-append theme "/share/backgrounds/gnome"))) + (string-append theme "/share/backgrounds/gnome")) + ;; Do not reference fonts, that may not exist. + (("'Source Code Pro 10'") "'Monospace 11'")) #t)))))) (inputs `(("glib" ,glib)