From patchwork Mon Nov 11 06:17:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 70229 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 5ADCD27BBEB; Mon, 11 Nov 2024 06:24:20 +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 EA41227BBE9 for ; Mon, 11 Nov 2024 06:24:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tANqP-0002aH-De; Mon, 11 Nov 2024 01:24:13 -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 1tANqN-0002XL-MR for guix-patches@gnu.org; Mon, 11 Nov 2024 01:24:11 -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-0007BK-CA 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=1Lv3qbsk+Fduy9pZa0TYrTYqFv0HSFpeNaAZGBQ0dXU=; b=W+dH8h/zg01wp/Yws8zl9Vq1cm5pbWr6xSABBCfnrg8eL+HZMnpNuxeEAOJm07sQw8Cui+EpvXoIAWHh+I1k/x4qW6IJHEG70ne/ei9i+wz8ZtIa+MaL61PaOhbiT9M5B8Xwb1yQ9jmKEi4QbTbb6SMw6k0dqJ/PIefA0eyKaqdMIjGlO00gmENCJLKihU8PPiuLJJxWv0Yvee/7nQIowi07qjCUpxv8OcxBVm9ARjUkkVn4qYUOIphBBPRHkvT4Wx4L5w/Gwc8f19mkW4Gkc4RV+QKTQxGz03McU58kAaxHKw8LewdOgAj0pkumRDgRsqLgMKtBKZM1zLQ34u4voA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tANqN-0006Jt-7C; Mon, 11 Nov 2024 01:24:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74306] [PATCH gnome-team 31/44] gnu: fontmanager: Update to 0.9.0. 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.173130623924071 (code B ref 74306); Mon, 11 Nov 2024 06:24:11 +0000 Received: (at 74306) by debbugs.gnu.org; 11 Nov 2024 06:23:59 +0000 Received: from localhost ([127.0.0.1]:57713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANq7-0006G0-JA for submit@debbugs.gnu.org; Mon, 11 Nov 2024 01:23:59 -0500 Received: from mail-il1-f171.google.com ([209.85.166.171]:53340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANq4-0006Fh-7i for 74306@debbugs.gnu.org; Mon, 11 Nov 2024 01:23:53 -0500 Received: by mail-il1-f171.google.com with SMTP id e9e14a558f8ab-3a3b4663e40so16050005ab.2 for <74306@debbugs.gnu.org>; Sun, 10 Nov 2024 22:23:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731306171; x=1731910971; 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=1Lv3qbsk+Fduy9pZa0TYrTYqFv0HSFpeNaAZGBQ0dXU=; b=awaQEt7qMDtz/zLeHGHlMmiK24dkFATIom/Bqv/Di5dnvFW0GvfUbXJjJmhzeP9ESO fFUsMU2wodZ9xygZIhWMx9lefu7q/0MCBZIz3zrOXnFlmVFpa6q2VnhX8C5C1rOyZV7L DGxIB//3Ah2VBPYZjO3abDmhJqBvU1nljNIsyWTiAY1+92IsKh8KWprYWudRhzC0Unya 8/KMIHvrAJRta5Vr+8m1dRqtAW+zKPOy8yjRaC26l0/Dl/VXIHdLHojzW/Q6w0f3mzfp 9s7L8/MlBP4mGcZLz/3XuPBa1iRqqaVWta/8qcy0sCcm6C9587Qer1P6keDftD7Muqbf qOAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731306171; x=1731910971; 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=1Lv3qbsk+Fduy9pZa0TYrTYqFv0HSFpeNaAZGBQ0dXU=; b=EF2C3a4CGXN/tTVQ/M7H1k8j4VrcO+HHa8Z9/OGY4DJfoUVH8KuodFaVr/0CDuG0K4 uOSYdTrVBmnTZqq/FjDsOQ0tZ/pwawjjHi0Am7C/OiRnVZP0e7E7YjGq7p6WITYk3Mj2 IpKuB/vZKuMTXWUjXs2Bvb4r18Q5bKkLoADJYel8jFAMM+oHcbdcb+7bMCcrIOvl7eoA p8EtJsQ9NNyPWCABZ0j36paeelYSicfb1HZbVeHZuZDk6Tt4ea8YD9b0uVqBQDCY6y8V 32WJ+Aw1o+J1aXgoVUpKFAQISxLbwoRlKDjzLCpj8S/TZFf794y0JwdbQiOGgiVxPcWT 7eAA== X-Gm-Message-State: AOJu0Yx2PKhqXbZ6KbLlmtpWfimZHRlQDPitgXepqG7es/S1g6v4S+kq P8r3bSUNvQWh1WZxKRiDuQGGCmWl0vqkJCebD8k0pmCCYITOqqdBu1EziA== X-Google-Smtp-Source: AGHT+IFgi9boTuE90EFa3ATcPPYcTZsuoNKyk/cV5fmc1JuJNVTIb6dBF+Tyaxkb1NGPwdlK2hnX0w== X-Received: by 2002:a05:6e02:160b:b0:3a3:4164:eec9 with SMTP id e9e14a558f8ab-3a6f1a15cb8mr124774995ab.14.1731306170652; Sun, 10 Nov 2024 22:22:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2024 22:22:50 -0800 (PST) From: Maxim Cournoyer Date: Mon, 11 Nov 2024 15:17:14 +0900 Message-ID: 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): Update to 0.9.0. [arguments] <#:phases>: New argument. [native-inputs]: Replace vala-0.52 with vala. [inputs]: Replace gtk+ with gtk. Replace libsoup-minimal-2 with libsoup. Replace webkitgtk-with-libsoup2 with webkitgtk. Change-Id: Ieedd48147f3c5c9936f922b812932020258fccae --- gnu/packages/fontutils.scm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 614d62f439..e9fd295531 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2019, 2020, 2022 Marius Bakke ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020, 2021, 2024 Nicolas Goaziou -;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer +;;; Copyright © 2021-2024 Maxim Cournoyer ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Felipe Balbi ;;; Copyright © 2023 gemmaro @@ -1920,7 +1920,7 @@ (define-public fcft (define-public fontmanager (package (name "fontmanager") - (version "0.8.7") + (version "0.9.0") (source (origin (method git-fetch) @@ -1929,7 +1929,7 @@ (define-public fontmanager (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nyda2a6vbzyz4sn9mmrr8bkifzxmmjp7x9a3c4s6n925ccy79cn")))) + (base32 "0pxdwpjzsmld4j2m4q423vdrkx23bb6jqszjgk5wqbr2ln772hcx")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -1937,7 +1937,16 @@ (define-public fontmanager #:configure-flags (list (string-append "-Dc_link_args=-Wl,-rpath=" (assoc-ref %outputs "out") - "/lib/font-manager")))) + "/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) @@ -1945,24 +1954,24 @@ (define-public fontmanager ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) - ("vala" ,vala-0.52) + ("vala" ,vala) ("yelp-tools" ,yelp-tools))) (inputs `(("fonconfig" ,fontconfig) ("freetype" ,freetype) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk+" ,gtk+) + ("gtk" ,gtk) ("json-glib" ,json-glib) - ("libsoup" ,libsoup-minimal-2) + ("libsoup" ,libsoup) ("sqlite" ,sqlite) - ("webkitgtk" ,webkitgtk-with-libsoup2))) + ("webkitgtk" ,webkitgtk))) (home-page "https://fontmanager.github.io/") - (synopsis "Simple font management for GTK+ desktop environments") + (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.") +work well with other GTK desktop environments.") (license license:gpl3+))) (define-public fntsample