From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id SEJ7EzK6bGUTDgAAG6o9tA:P1 (envelope-from ) for ; Sun, 03 Dec 2023 18:26:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id SEJ7EzK6bGUTDgAAG6o9tA (envelope-from ) for ; Sun, 03 Dec 2023 18:26:10 +0100 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 DF6E016400 for ; Sun, 3 Dec 2023 18:26:09 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=CawpCHsE; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1701624370; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=mOGbSagmsqBP9qOJ0pA8DFfEt1RaEjkT1d3j9f60g4A=; b=Qjeq3F9cbT6TczeHCJwX0Ig8dvTF/yKSEfAHGLkcaq50c1Z2lRmJTBK4gA/i84zYlahX6a xXIzmQcidDhVXFn6YLWyGTn3QG5E1jis2TPs1HsfR+U5nSeOwiaN+IXNhXcalwypI9txY9 agOtWJEp4ygNs4tYhRe0aNeSR1dG5G0dQAScOKWYaHe1E3Vjfw/bYDOtvPyH3jsFf9r4V9 KrxzElg6mWQRYkxS8ZH91seFGycXQ8oMmSk40r7xiTsM/5kwzj8YdjaFhegLD1GcsIM1Q8 d1xq1lm/3zJQNr0i8I8Eom43XzPsxoF8YVgqpQV3MLBWQAfrs0J2DXXE+rpPHw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1701624370; a=rsa-sha256; cv=none; b=HzrLrGllQUepu/SATEQ/GMihLKrzme+99kJP+mM6iuMcPqYHbxqg5xclceP4iKohWz2oTW q78fKSSiWxke8oTZ/MOuPh0zdof6zKN3+xQhIEsT7pMofZo2wtsj+BY3a7EjFx2tvTPtF8 s3rX3V0Mr6toujFyGoYLkquMlCGHOkiRxJ9BZu8v701wOBZQ1NQKpMUEwYzeYXTRuphmmJ vQj9Pqb8hGor/r/sWeYBByyjtvgr4ROyArzWQMcPG+ByHtWepqyEPuUxP/SY1VfgHC0dSC 44qkA3deZDsGbOHBh6ztpKYPO76GWhRuG52UqWHbs+4OlE9/4zlwPolzLanKVQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=CawpCHsE; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9qE6-0008PN-56; Sun, 03 Dec 2023 12:25:54 -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 1r9qE4-0008Nz-9v for guix-patches@gnu.org; Sun, 03 Dec 2023 12:25:52 -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 1r9qE3-00014r-V0 for guix-patches@gnu.org; Sun, 03 Dec 2023 12:25:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9qED-00077Q-VU for guix-patches@gnu.org; Sun, 03 Dec 2023 12:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67058] [PATCH gnome-team 1/4] gnu: gtk: Update to 4.12.3. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Dec 2023 17:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67058 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: rg@raghavgururajan.name, 67058@debbugs.gnu.org Received: via spool by 67058-submit@debbugs.gnu.org id=B67058.170162431427307 (code B ref 67058); Sun, 03 Dec 2023 17:26:01 +0000 Received: (at 67058) by debbugs.gnu.org; 3 Dec 2023 17:25:14 +0000 Received: from localhost ([127.0.0.1]:60808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9qDS-00076M-Dp for submit@debbugs.gnu.org; Sun, 03 Dec 2023 12:25:14 -0500 Received: from mail-qv1-xf2e.google.com ([2607:f8b0:4864:20::f2e]:52340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9qDQ-000764-1g for 67058@debbugs.gnu.org; Sun, 03 Dec 2023 12:25:13 -0500 Received: by mail-qv1-xf2e.google.com with SMTP id 6a1803df08f44-67a9be1407aso16228036d6.0 for <67058@debbugs.gnu.org>; Sun, 03 Dec 2023 09:25:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701624296; x=1702229096; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mOGbSagmsqBP9qOJ0pA8DFfEt1RaEjkT1d3j9f60g4A=; b=CawpCHsEj+B8TMGC4Qa2YlCIesRRY3AmZ4JQ8AQLoLcvXVhfcA5WdOf5ZLXAbTJVOg Nzrmosz+LTjpaoYBvhhtAt90QxLummn3HZJombKHl/PREoxIwhE+DOyb3q4Ex3cy8z/W JUXqU8knCXXYKgw1uA5j1I+mYnhJUj9/44m4OLeihre5zoqRUL9h+GWTt49AJnWeaUdt CZ1UUC4Ttmo5FbhO9oYV8naW2p6GroL/SbMzt/ZZd7IpRV+ZrLxGLU7MnkmwzF7H0XWj zY8wOA85cJjrgSVr4ImRPVFb2HOQVAXhQC0+/pfDtrLbSqHvJBCv0Ldp+/CWfqTXQT5c paJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701624296; x=1702229096; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=mOGbSagmsqBP9qOJ0pA8DFfEt1RaEjkT1d3j9f60g4A=; b=JEFbQPQ0iO3/xU6x1wniGqTP/rXumkdBxEYKNTlVrY1R48foz9IDvsnHyDOzbMmKgf 4wCV6azwNoaE3vLYnBg1E43X/DC7A00X60lBdYAPAVqZ+aS31IDFDQYhvSwnCTYO5fAY pZ2JqWqbP5PDAq29T6YdvjWil6pmyZhf/Xa/IONSw0vNZL1BjXtfHOa6HOng9ZStD1Hk JszvVfxLdQny+fDXHhNDA9fO7kRhVR2nfzfrI16miGFp4FQgwtkKR1EhN6GZKrSYnNzT +7o6cOMW0g31FfBAFGz4SQ81tBqBKvME8wK76BO5gGGKxgy8RG6WDdpfznnDMfOb92Eu xT+g== X-Gm-Message-State: AOJu0YxLBdhfCqz71uQ8CFNUjurvO7o6Wzcsh/gPRGsBjnnksR1QYyZ4 TF+DgJDeu/oA8EeG+TmPHtQ= X-Google-Smtp-Source: AGHT+IEL64DhXlf7iHa6LJ94TjjpJAk2uuE3tZHQ2U1C+R+QfrTOWd/TdHuqXYWmsJ3RlEPK/NE/iw== X-Received: by 2002:a0c:fe69:0:b0:67a:a721:cb12 with SMTP id b9-20020a0cfe69000000b0067aa721cb12mr3021357qvv.115.1701624296304; Sun, 03 Dec 2023 09:24:56 -0800 (PST) Received: from hurd (dsl-141-198.b2b2c.ca. [66.158.141.198]) by smtp.gmail.com with ESMTPSA id d3-20020a0cf0c3000000b0067a3ad49979sm2410808qvl.96.2023.12.03.09.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 09:24:55 -0800 (PST) From: Maxim Cournoyer In-Reply-To: (Liliana Marie Prikler's message of "Sat, 11 Nov 2023 01:19:20 +0100") References: Date: Sun, 03 Dec 2023 12:24:54 -0500 Message-ID: <877clv2o7t.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -5.05 X-Spam-Score: -5.05 X-Migadu-Queue-Id: DF6E016400 X-TUID: 16ABgSyD8h7/ Hi, Liliana Marie Prikler writes: > * gnu/packages/gtk.scm (gtk): Update to 4.12.3. > [source]: Remove snippet. > [arguments]<#:configure-flags>: Add =E2=80=9C--no-suite=3Dheadless=E2=80= =9D. > <#:phases>: Also patch text-color tests in gsk/nodeparser. > > Change-Id: Iedabfd12ae4f60f02ea21f427b85aeb6b17d03d6 > --- > gnu/packages/gtk.scm | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm > index 21a12689b7..6a0f5e0773 100644 > --- a/gnu/packages/gtk.scm > +++ b/gnu/packages/gtk.scm > @@ -1119,7 +1119,7 @@ (define-public gtk+ > (define-public gtk > (package > (name "gtk") > - (version "4.10.3") > + (version "4.12.3") > (source > (origin > (method url-fetch) > @@ -1127,11 +1127,10 @@ (define-public gtk > (version-major+minor version) "/" > name "-" version ".tar.xz")) > (sha256 > - (base32 "1aff06l9v40j16s4s0qvdbj8cs54qxnh41d7w2v7wdwyswd48ia5")) > + (base32 "128ahzsj016vz8brd8kplhfkxg2q7wy7kndibx2qfr68yrif530l")) > (patches > (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch")) > - (modules '((guix build utils))) > - (snippet #~(begin (delete-file-recursively "subprojects/gi-docgen= "))))) > + (modules '((guix build utils))))) If we don't need the snippet, we don't need the 'modules' field either. > (build-system meson-build-system) > (outputs '("out" "bin" "doc")) > (arguments > @@ -1157,6 +1156,7 @@ (define-public gtk > "--suite=3Dgtk" > "--no-suite=3Dfailing" > "--no-suite=3Dflaky" > + "--no-suite=3Dheadless" ; requires mutter=E2= =80=A6 Instead of the '...', maybe explicit that 'XXX: Requires mutter, which transitively requires this package.' on a standalone comment. > "--no-suite=3Dgsk-compare-broadway") > #:phases > #~(modify-phases %standard-phases > @@ -1179,6 +1179,9 @@ (define-public gtk > (substitute* "meson.build" > (("gtk_update_icon_cache: true") > "gtk_update_icon_cache: false")) > + (substitute* (find-files "testsuite/gsk/nodeparser/" > + "^text-color.*\\.node$") > + (("Noto Sans") "DejaVu Sans")) > ;; Disable failing tests. > (substitute* (find-files "testsuite" "meson.build") > (("[ \t]*'empty-text.node',") "") Otherwise, Reviewed-by: Maxim Cournoyer --=20 Thanks, Maxim