From patchwork Mon Apr 21 13:47:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41850 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 7AED227BC49; Mon, 21 Apr 2025 15:59:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,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 6E37027BC4A for ; Mon, 21 Apr 2025 15:59:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6scA-0006pX-Au; Mon, 21 Apr 2025 10:59:18 -0400 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 1u6sbw-0006mN-E9 for guix-patches@gnu.org; Mon, 21 Apr 2025 10:59:08 -0400 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 1u6sbv-0000hM-Ao for guix-patches@gnu.org; Mon, 21 Apr 2025 10:59:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=SK+EEdTgy3pk2MRK0+uP3QsN+xaz4MwJ+56ieTnqbM8=; b=EjJW9YrICNM15LoVVNAWZPUzi9vKu3kj/MLJaj0cwI8V30gflDZOV6pFKN73pXloyI3YXXhJ7J1QbjdnjIStDUtqY22sb5rgQx2NaV1Yan4ukndSg3+LPUma+06OubYRei0vZf5RXTO0kAw+vBxqqFzwPE9ARW7kt8M70No5uIpYHkg0CedqMdbGsH2O9i4j8rscL+RsiHA810VgEZdGZnR/KjFqBEX8JOV3152hVjinIQj7ylScuuqvq0F+7eyw98tGzswQFVYVW0+lyCJPabu9KZMui8P2vOFOkIlDnaN1JkeZArDzYLRG4zAF6QBvtIqEd6QJLufQZ1SZQXNnWw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6sbv-0005ue-50; Mon, 21 Apr 2025 10:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77956] [PATCH gnome-team 02/23] gnu: glib: Update to 2.84.1. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, noelopez@free.fr, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Mon, 21 Apr 2025 14:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77956 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77956@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, noelopez@free.fr, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, noelopez@free.fr, vivien@planete-kraus.eu Received: via spool by 77956-submit@debbugs.gnu.org id=B77956.174524751522504 (code B ref 77956); Mon, 21 Apr 2025 14:59:03 +0000 Received: (at 77956) by debbugs.gnu.org; 21 Apr 2025 14:58:35 +0000 Received: from localhost ([127.0.0.1]:36316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6sbS-0005qi-3t for submit@debbugs.gnu.org; Mon, 21 Apr 2025 10:58:34 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:52470) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u6sbG-0005oK-0A for 77956@debbugs.gnu.org; Mon, 21 Apr 2025 10:58:23 -0400 Received: by mail-wm1-x341.google.com with SMTP id 5b1f17b1804b1-440685d6afcso38640735e9.0 for <77956@debbugs.gnu.org>; Mon, 21 Apr 2025 07:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745247496; x=1745852296; 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=SK+EEdTgy3pk2MRK0+uP3QsN+xaz4MwJ+56ieTnqbM8=; b=BMdduagbJDJU1KOv1QWb6hLoSSu/bL4Kh69xodB6Pr90zjtzzlRMURSjSFAjOkCAB0 BD+dZRWT/2IITQAPbt1aU5/kRhCNIPks6WiseFzpBkVFhsPUO4eMbHA/KBwq7v2lX/mA NQVsTl3Jwcm/bgkjEDz/r6ArmXhrj/2gS64cXMHJklNsOR+6lQW+rqLSEp8pLeCcGSMD tlB2nZqW5nmDxwsp70d2WUrlgUZ9SlcfzmjTpgD8B9c+TZbKHzUcrWcPoxr9W4FBpr3y FIoCiletW8mUSGBEMYIDjiLSPl5m//BSM06uI1zskaCvR/Bc0UuX16bOkvDv4jLAO4Y7 FIig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745247496; x=1745852296; 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=SK+EEdTgy3pk2MRK0+uP3QsN+xaz4MwJ+56ieTnqbM8=; b=nKlVtWH9WNDv6KSZzQsIwP2mbozSjAcZbeq58P+b8kBVssV4egUhuYwQw7BxY8nd+N MUFAxwEH5v5Zlca+OdrpmDUsCSZPgcarnez77mMn6wjBwXkXwOl2RTjvFI5h72SgLQsq I7og/iYCGQWef4BkxfTYQRe+Jlqcw9t2rYulDe0L0t2VBJn2SceNhA/WLtUg5jwdxOHj As71+8kbvAbMuJZlaXnSblYlBM5acz4xTKse2vQLatNiY2a7AvcU7Mh00Ac9peMPVA1t bb3uRpheUJx9DJyN8oa75UeYCQWeWki6CdSf/tPuzDRWP2tMn0nVJ8AWQhI9v3yqws0k k2fw== X-Gm-Message-State: AOJu0YyHY/XdG05BdlGx1C0HK+n2knZEaFrR9NAvAohIh3P4IBK2KKZ5 4skEKGaRZwiveMMID744wM3OshM+JjWXnogYMYda88tj1lfFk70BxunP+6KC X-Gm-Gg: ASbGncuEBuagF5G392pLl+tBktl/frHOrEN7ivEVDTLOd4fDdTpOKrbdGSf2Vn+ofUx 91eZRYq7YmdLB+93TmwTk/zUcP7Jia6skENw0eJSvqdMPVfoZE27WNHCqTKuffYVKyLS5kh6WTP CsjIC2+yEuk3BOgjIEK2zpD10azf6k6161Hq0qJNE/IFgEaVDUdRz15hpnla4SAMj9yP1UjXTob rN22RMjnLIicY3Y3LspYkDrWa5hJcdKl0gpL5d+rNG7r1E3jdk1RvGGV+Ng1HceYltitrBmUvtY idHzJNzsnUDQrWLdxZ87LsnK/b0+vcqrbQmKWyTHBIjadYR6RZ4vyIXuoqKZxAo1ZcUkJEFxENA sT9FqbvvqI1dy9w7msRmSSpJpI9o= X-Google-Smtp-Source: AGHT+IF0na65oUSrWUHMiggb9SIb2i186RsmNBD/3zy9ZRYZxHHXYbfOw3MrzzvpDkqQcOHgQrY7ow== X-Received: by 2002:a05:600c:4e4a:b0:43c:fffc:7855 with SMTP id 5b1f17b1804b1-4406aba7c2fmr109263135e9.15.1745247495732; Mon, 21 Apr 2025 07:58:15 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4406d5acce9sm138719555e9.13.2025.04.21.07.58.15 for <77956@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Apr 2025 07:58:15 -0700 (PDT) Message-ID: <992945c38cad22b0054cba7affe15118c24c7aa0.1745243273.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Mon, 21 Apr 2025 15:47:47 +0200 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/glib.scm (glib-minimal): Update to 2.84.1. [#:phases]: Drop substitute* for testfilemonitor. : Use map. Also patch “lib/pkgconfig/girepository-2.0.pc”. --- gnu/packages/glib.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index fb1acceac40..3b1e4c10500 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -246,7 +246,7 @@ (define-public dbus-verbose (define glib-minimal (package (name "glib") - (version "2.82.1") + (version "2.84.1") (source (origin (method url-fetch) @@ -255,7 +255,7 @@ (define glib-minimal name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "19l98kdv6d4363minliw0imvxh4qfdw5im988knf8bpm1d2391j7")) + (base32 "16kq62zrccxpdfmjn2akkvk9c0gdy9asib46bz1my6k197nc4jrb")) (patches (search-patches "glib-appinfo-watch.patch" "glib-skip-failing-test.patch")) @@ -298,9 +298,6 @@ (define glib-minimal (string-append first " = " second "0"))))) (add-after 'unpack 'disable-failing-tests (lambda _ - (substitute* "gio/tests/meson.build" - ((".*'testfilemonitor'.*") ;marked as flaky - "")) (with-directory-excursion "glib/tests" (substitute* '("unix.c" "utils.c") (("[ \t]*g_test_add_func.*;") ""))) @@ -478,9 +475,10 @@ (define glib-minimal ;; We don't patch "bindir" to point to "$bin/bin", because that ;; would create a reference cycle between the "out" and "bin" ;; outputs. - (substitute* - (list (search-input-file outputs "lib/pkgconfig/gio-2.0.pc") - (search-input-file outputs "lib/pkgconfig/glib-2.0.pc")) + (substitute* (map (lambda (f) (search-input-file outputs f)) + (list "lib/pkgconfig/gio-2.0.pc" + "lib/pkgconfig/glib-2.0.pc" + "lib/pkgconfig/girepository-2.0.pc")) (("^bindir=.*") "") (("=\\$\\{bindir\\}/")