From patchwork Sat Nov 11 00:19:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 56239 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 E073527BBEA; Sat, 11 Nov 2023 00:47:53 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 27C1127BBE9 for ; Sat, 11 Nov 2023 00:47:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1c9m-0007GJ-9H; Fri, 10 Nov 2023 19:47:26 -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 1r1c9j-0007FF-3L for guix-patches@gnu.org; Fri, 10 Nov 2023 19:47:23 -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 1r1c9i-0004PT-OI for guix-patches@gnu.org; Fri, 10 Nov 2023 19:47:22 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r1cAM-0005NN-Fi; Fri, 10 Nov 2023 19:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67058] [PATCH gnome-team 1/4] gnu: gtk: Update to 4.12.3. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 11 Nov 2023 00:48:02 +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: 67058@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 67058-submit@debbugs.gnu.org id=B67058.169966365220607 (code B ref 67058); Sat, 11 Nov 2023 00:48:02 +0000 Received: (at 67058) by debbugs.gnu.org; 11 Nov 2023 00:47:32 +0000 Received: from localhost ([127.0.0.1]:51124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1c9s-0005MD-88 for submit@debbugs.gnu.org; Fri, 10 Nov 2023 19:47:32 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:49659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1c9o-0005Li-63 for 67058@debbugs.gnu.org; Fri, 10 Nov 2023 19:47:31 -0500 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-9c603e235d1so419550466b.3 for <67058@debbugs.gnu.org>; Fri, 10 Nov 2023 16:46:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699663602; x=1700268402; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=0yjj6xtMSgYxi/1l4hyBwKLExAk8213fZOimk8EXQnM=; b=MqFF9wA4EyD2Cd6Km4KYW4Z93PTj2rvIZq1HJLZ9EIJiUgppnEju/G5MaJJCx1gD0X gH1etAuZGm0KzKLNLFCbooM0Z+BUT1oNo4j5r4Qufqip7XpuUy7Becz/3VqKBSALok2V FkJGGGItSqNpUYfxwlsdIZmuGiaz81LI+oBzrv/mksL77OI/Dr4YZvrLEvDiAan2M0J7 hxXl0mx52yMX3WGvZm5TfM5ZuF2T+aQj3jDSLvApixPXFRGPs6AAEum8zmpJhAou1UA9 8TxEwLJOJacpGh9pROhEHod9yf8vqixrysMdrAy6QWW//yxQ3Bl8mTksQNzZg2aSYqGi +wXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699663602; x=1700268402; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0yjj6xtMSgYxi/1l4hyBwKLExAk8213fZOimk8EXQnM=; b=G7gmcV2l7Q58tuxntwVM4aWXKrNupAj2a6SzM+Bytku95v7StiKn8ut0q7Ts4EXd7b XxdTfHnsAveL1CWVOuLS2/ZIklBeEGMGafxpkWsTpNLlMEjU87fgUyaXlw1TMqWPyKbe SvpKk9aBwlwkVDlYSxdUeF40sbQ93FErx/1VcUOG3OCWo5ctzcY7KEp9OA70W6FgnDcB Tgy0aXdrvLc4OGcND04GAYwf+UJOHmwqBPPS7YsXieHbXpSeCnkl2IaqtEEroVnCZVnY rdD75JTGFF/A2wUI9JrE3szmW7OEShwJkhcIONNMhfCoKMJ0AWBDXNMemfB7HW18IaqV 1wrA== X-Gm-Message-State: AOJu0Yw7gwx6icgYIMpUx2wnW3Nu4ZQQ/iExGl95CuS9fFN0mnTRaboR hkjx/zH3eLsqQEM8eBKZNhHipyQEFBLc7Q== X-Google-Smtp-Source: AGHT+IHFZPwQD80z5155G5xuRuUEMmCsXq5eG6L0pihJ+yu4pkDYQOKIvG8pCukDsYjAIWMQgalgPA== X-Received: by 2002:a17:907:1b27:b0:9ae:701a:6efa with SMTP id mp39-20020a1709071b2700b009ae701a6efamr345159ejc.69.1699663601790; Fri, 10 Nov 2023 16:46:41 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id t17-20020a1709064f1100b009e60b72dd17sm261139eju.100.2023.11.10.16.46.40 for <67058@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 16:46:41 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 11 Nov 2023 01:19:20 +0100 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/gtk.scm (gtk): Update to 4.12.3. [source]: Remove snippet. [arguments]<#:configure-flags>: Add “--no-suite=headless”. <#:phases>: Also patch text-color tests in gsk/nodeparser. Change-Id: Iedabfd12ae4f60f02ea21f427b85aeb6b17d03d6 Reviewed-by: Maxim Cournoyer --- 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))))) (build-system meson-build-system) (outputs '("out" "bin" "doc")) (arguments @@ -1157,6 +1156,7 @@ (define-public gtk "--suite=gtk" "--no-suite=failing" "--no-suite=flaky" + "--no-suite=headless" ; requires mutter… "--no-suite=gsk-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',") "")