From patchwork Mon Nov 11 06:17:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 70255 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 BDF2827BBE2; Mon, 11 Nov 2024 06:25:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 70FA927BBEC for ; Mon, 11 Nov 2024 06:25:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tANqT-0002ia-4B; Mon, 11 Nov 2024 01:24:17 -0500 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 1tANqO-0002YJ-6X for guix-patches@gnu.org; Mon, 11 Nov 2024 01:24:12 -0500 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 1tANqN-0007Bl-TT for guix-patches@gnu.org; Mon, 11 Nov 2024 01:24:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=e8M03ZcJiqsBDZd+brTK1hw0r4b2GrAnu7S8kdFz4QQ=; b=BCU74trJTRp5Tn66mlrcvOpQBMHYEE6Iu1YRwpxH9zFIf42AT5IVNcdGERi9gapx6LvnKCGPLcAHp49GMqWVrlKUyHvcDLByWcFXfDPBGz9/RkJ4M/CMwDJ1LpkcRKgnbY22IaokVetbQBj72CBjoIbBY1svSNt6rl7rtfwZ3wNbTlKqcb6dp8gCTszIs7Duysh7OClPWaI+jyGDR5y7JT1g2cgXJD93H4JRa/wgKturvTLfCFJyZbagD78M852Eu1eIb395ghqO9+aCwHBtJij0sLNk3MlRMOUYbHS3qndSZB03Fg+8DanVCdn7SwXJL9n69dOc6kMtau9yRJ2UTg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tANqN-0006K2-Ln; Mon, 11 Nov 2024 01:24:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74306] [PATCH gnome-team 32/44] gnu: fontmanager: Use gexps and drop input labels. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 11 Nov 2024 06:24:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74306 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74306@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 74306-submit@debbugs.gnu.org id=B74306.173130624024079 (code B ref 74306); Mon, 11 Nov 2024 06:24:11 +0000 Received: (at 74306) by debbugs.gnu.org; 11 Nov 2024 06:24:00 +0000 Received: from localhost ([127.0.0.1]:57715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANqB-0006GC-Oa for submit@debbugs.gnu.org; Mon, 11 Nov 2024 01:24:00 -0500 Received: from mail-oi1-f182.google.com ([209.85.167.182]:48237) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANq6-0006Fr-KX for 74306@debbugs.gnu.org; Mon, 11 Nov 2024 01:23:55 -0500 Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-3e601b6a33aso2412663b6e.0 for <74306@debbugs.gnu.org>; Sun, 10 Nov 2024 22:23:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731306174; x=1731910974; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e8M03ZcJiqsBDZd+brTK1hw0r4b2GrAnu7S8kdFz4QQ=; b=c/+S808dtQazmphWfjkjKqmIe0TpK1W5iYrnZYZY99IhpMgnDOaPsDIfavHDxfvxcl Zxpqlp8jz3bcXHrmJhofeTU9TfglOnLGE49npEMTcUYNpH2Wu7674mOHVbL2Pof7tIf5 LuFrHs+Od6eonHuUxI82fmLDXujAS3aHB0xJ+MaZMWmGBV8gtDFoKsOg4iRYaqQLdfi5 a0TDkBedRdy6lfG22HKrcFJhlDBbCOss7ihc7biJUukNGWzVrO+T039GVDq5X3NJ54d6 rZclWTs5BlaermSxy3VCm1adZKGJnmtbmBTvpSipFoO1lewU222bnDuAx2I8HabeS8gZ Sz7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731306174; x=1731910974; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e8M03ZcJiqsBDZd+brTK1hw0r4b2GrAnu7S8kdFz4QQ=; b=NoXpBINRlI27CrQ2PZy1TZzVfzj9AVcB570LXPS/CqcT9l7KyF5MDv6zBRhRGoRqd4 GAe2dCo9DGQEClNe1KIjFeOJ+wUfXRmiOD3g2tNJAqR0N2QFpKnJyEQxCRyTD7o3k8LZ j/ro0exgADkS3TuX7sCpM/Bo2xXFR1Uh9FZQlKfGMnnpWNkyqpYZ7xlZ4CcjeGLOHmMX Lig1BOrIIAjazXC7cWCzgNmc/qDMVA7fdggqU15F2niGSPWjhYinQec3ExZ48ilZxpWo sZFAQptD2fRC/ykbu3AE59heZrOH+mn6BQlI2EFs1xShS3S1vKAR63Nb1hjFT31lqaoe YKrQ== X-Gm-Message-State: AOJu0Yy38HA3MOriS/Xy04XMMWZNgIMaf78W6BlN6hrqcAHc79HuYA2U yVHIA0oRccQf+JesvFDURoFUOF1nsPfTlDzBSEB2AfCVnD6fl82ptj1UqQ== X-Google-Smtp-Source: AGHT+IESSa2S4tYDDtiwhfyNTKnjWr37cVesqVqilbrcdj7+AvOgz146+eHE8vhsBY9IA9cBL5R6Dw== X-Received: by 2002:a05:6808:1922:b0:3e5:f43a:5d77 with SMTP id 5614622812f47-3e794735f03mr7918223b6e.42.1731306173652; Sun, 10 Nov 2024 22:22:53 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7f41f5ea0d5sm7782996a12.47.2024.11.10.22.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2024 22:22:53 -0800 (PST) From: Maxim Cournoyer Date: Mon, 11 Nov 2024 15:17:15 +0900 Message-ID: <7e6e05358a4b83b731b46929ec10429beebe0220.1731303037.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 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/fontutils.scm (fontmanager) [arguments]: Use gexps. [native-inputs]: Remove labels. [inputs]: Likewise. Change-Id: Ie7dae815d94a196f58909bffac5a0cba4414fb6a --- gnu/packages/fontutils.scm | 100 ++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index e9fd295531..7e126d7ed9 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1919,60 +1919,60 @@ (define-public fcft (define-public fontmanager (package - (name "fontmanager") - (version "0.9.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/FontManager/font-manager") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0pxdwpjzsmld4j2m4q423vdrkx23bb6jqszjgk5wqbr2ln772hcx")))) - (build-system meson-build-system) - (arguments - `(#:glib-or-gtk? #t - #:build-type "release" - #:configure-flags - (list (string-append "-Dc_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib/font-manager")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - (lambda _ ; Remove dependency on needless desktop cache stuff. - (substitute* "meson.build" - (("gtk_update_icon_cache: true") - "gtk_update_icon_cache: false") - (("update_desktop_database: true") - "update_desktop_database: false"))))))) - (native-inputs - `(("desktop-file-utils" ,desktop-file-utils) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper) - ("vala" ,vala) - ("yelp-tools" ,yelp-tools))) - (inputs - `(("fonconfig" ,fontconfig) - ("freetype" ,freetype) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk" ,gtk) - ("json-glib" ,json-glib) - ("libsoup" ,libsoup) - ("sqlite" ,sqlite) - ("webkitgtk" ,webkitgtk))) - (home-page "https://fontmanager.github.io/") - (synopsis "Simple font management for GTK desktop environments") - (description "Font Manager is intended to provide a way for users to + (name "fontmanager") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FontManager/font-manager") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pxdwpjzsmld4j2m4q423vdrkx23bb6jqszjgk5wqbr2ln772hcx")))) + (build-system meson-build-system) + (arguments + (list #:glib-or-gtk? #t + #:build-type "release" + #:configure-flags + #~(list (string-append "-Dc_link_args=-Wl,-rpath=" #$output + "/lib/font-manager")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + (lambda _ + ;; Remove dependency on needless desktop cache stuff. + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false") + (("update_desktop_database: true") + "update_desktop_database: false"))))))) + (native-inputs + (list desktop-file-utils + gettext-minimal + `(,glib "bin") + gobject-introspection + pkg-config + python-wrapper + vala + yelp-tools)) + (inputs + `(fontconfig + freetype + gsettings-desktop-schemas + gtk + json-glib + libsoup + sqlite + webkitgtk)) + (home-page "https://fontmanager.github.io/") + (synopsis "Simple font management for GTK desktop environments") + (description "Font Manager is intended to provide a way for users to easily manage desktop fonts, without having to resort to command-line tools or editing configuration files by hand. While designed primarily with the GNOME Desktop Environment in mind, it should work well with other GTK desktop environments.") - (license license:gpl3+))) + (license license:gpl3+))) (define-public fntsample (package