From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UJ5hHqzCMWQQvAAASxT56A (envelope-from ) for ; Sat, 08 Apr 2023 21:38:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id SHV1HazCMWS9MwEAG6o9tA (envelope-from ) for ; Sat, 08 Apr 2023 21:38:20 +0200 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 390E6314CB for ; Sat, 8 Apr 2023 21:38:20 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plENx-0005n1-IB; Sat, 08 Apr 2023 15:38:05 -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 1plENv-0005ml-Mr for guix-patches@gnu.org; Sat, 08 Apr 2023 15:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1plENu-0001dX-JA for guix-patches@gnu.org; Sat, 08 Apr 2023 15:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1plENu-0008Ce-FT for guix-patches@gnu.org; Sat, 08 Apr 2023 15:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Apr 2023 19:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: rg@raghavgururajan.name, 62467@debbugs.gnu.org Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.168098268131524 (code B ref 62467); Sat, 08 Apr 2023 19:38:02 +0000 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:38:01 +0000 Received: from localhost ([127.0.0.1]:59581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plENs-0008CO-Gv for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:38:00 -0400 Received: from mail-qv1-f41.google.com ([209.85.219.41]:44948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plENr-0008CA-2L for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:37:59 -0400 Received: by mail-qv1-f41.google.com with SMTP id dw2so14959993qvb.11 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:37:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680982673; x=1683574673; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=HcLikVJjJyQp1ncjggPp4VLanqGWDzGlK5o15P3XtoU=; b=ejOQeZ3SNPejCyKY8lecDE+iWeLLTgIUD7nc3blnirQgNQ6fjU049I69yXV40fWKy9 xqFQBp0s9FttcWtu6AsVaiP1zH1/LS2yAE8d0NKFvhqsVzOu9AvyKWhwUdph3Eu93vv1 ZjfyYljcAwzhFraDVpjFZ7UpJvzhyxdkbsFm230gHr0ppobKYNlFYC4B6b5ihNpg6Ukm zeCRgNOeoMeRYgiiKFrfEkO1rnB38QT59PLVcJ+/TisqYPCSb2h8brAcZhF5BGjL6TKA ZLTNLGJn++5UCVh/R1hFIcdDZwgW1+nQRe9TRQoJG9JQCJRaykW6d2dlyKQOgLLSEafz dbDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680982673; x=1683574673; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HcLikVJjJyQp1ncjggPp4VLanqGWDzGlK5o15P3XtoU=; b=WMvHAz7+oI5Me/IgNlQKRv72FKTGFUZPSF126oHuxXE59bWSiuw/Bb7ja26ullzrz3 BbnkYsRxHdwkEPtgqCxECCWam3ANDNCBc62CpJENstSiv5kfXM5xyT+XZc4iA200NaJM aJ8fBADWqNmRYXVEA4yuSVx/AnHw5KtXD0DYknqPe/XSgMVUfy3OZ80ujyqCwF87rC3q fwPEbTkyamYWVYQoPGeTfCpq9oq8GDmjjqAJ2QdHzo+bT1QET/vp81ovRZ4BxV3a63kr ojcy9dhYie/9YQPX8DpSCYI854EwsHzI3/+faK7NYE2vvX2lU2W/vp0GjdGTy5vu7+bg 7CRA== X-Gm-Message-State: AAQBX9cWfV0W8X7qRCeBkr8RXjqZk3utTHe+kBsDHBnY1EvYYayNfN9j e965kTx5soNbu4fEv3wzAxA= X-Google-Smtp-Source: AKy350ZwUbMLeupyMT96qqvJjl3/69QuBvwZQ5KQ3zVWpHsTdyshh+7R3iNY6ZKPSnXiSANg29yWmQ== X-Received: by 2002:a05:6214:212d:b0:5a9:609d:e239 with SMTP id r13-20020a056214212d00b005a9609de239mr11934230qvc.48.1680982673642; Sat, 08 Apr 2023 12:37:53 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id k16-20020a05621414f000b005dd8b93457asm2274951qvw.18.2023.04.08.12.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:37:53 -0700 (PDT) From: Maxim Cournoyer References: Date: Sat, 08 Apr 2023 15:37:52 -0400 In-Reply-To: (Liliana Marie Prikler's message of "Sun, 26 Mar 2023 17:39:11 +0200") Message-ID: <87edourwq7.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680982700; a=rsa-sha256; cv=none; b=i/+9RGsfJeS6V0jxG8Zzdvy0CSHNEUCDuGu8rms7PVY2yaHXW55xO5U8lyjIf4/eGPgLdT DyFDz3xdZWYX12VTcKR9OvCFd14jOGQK82LwkNehhTjvGlI6iAs61QjruR5qTEpwGVzUHf VyL4CWQbBfiCebqqI4MY0RgATCZoyCPx0UiXWpuxkSroIq9ENhTzoC52yw+cHxuz4CgQUx 9ittqy6+6263PrkRHjLVRc0iZ1YKPgAxWzgKN07l1ikt2ANUQ0UJr4HMzbM5RAtb4DtquM BnAFQ9UjLGgy7haWG1ThtN8honMkXr2ZSpQ7zACIOwQDBk7yF8IzOUnM9NAKPg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=ejOQeZ3S; 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=1680982700; 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=HcLikVJjJyQp1ncjggPp4VLanqGWDzGlK5o15P3XtoU=; b=nYHv154NAkSChT4YBe6E7UzXTuLRfHT5TOpJLUqtjlaaVkBHl7YHc+HkpoPv27LCGC5/Jm isiCjf1rdj0APvwth4qAKc8Gv+orqY45/74DRC22TdFFbYleSJnQwG8tl699Awc3qG5R6M EWkkbN9v15DBUp/n6NqM3E4hKPRK75oq69xWC2IBT3UXQcZidi0BtKpugP3DR2TsxiJSTi gFcoIWcE8H4gQ5WIrAh9HeuTtXgaRiRxLxBDC2lSEMcyzXn/h6aFVmTeT/usEvDf2R1bC5 ruZZvAX36lngaHFtKc7fSBV3KmuBVkeI0bzoacMPQhl6cGuimSYbvGr/p//EMw== X-Migadu-Spam-Score: 7.28 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=ejOQeZ3S; 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" X-Spam-Score: 7.28 X-Migadu-Queue-Id: 390E6314CB X-TUID: u9TOVO/NJWGa Hi! Liliana Marie Prikler writes: > * gnu/packages/glib.scm (glib): Update to 2.76.1. > [source]: Adjust accordingly. > [arguments]<#:phases>: Add =E2=80=98set-G_TEST_SRCDIR=E2=80=99. Update = =E2=80=98delete-failing-tests=E2=80=99. > [propagated-inputs]: Replace pcre with pcre2. > (glib-with-documentation): Inherit from glib. > * gnu/packages/gnome.scm (sysprof, gtranslator): Use glib. > * gnu/packages/gtk.scm (gtksourceview): Use glib. > * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib. > * gnu/packages/patches/glib-skip-failing-test.patch: Adjust accordingly. > --- > gnu/packages/glib.scm | 92 +++++-------------- > gnu/packages/gnome.scm | 8 +- > gnu/packages/gtk.scm | 2 +- > gnu/packages/guile-xyz.scm | 2 +- > .../patches/glib-skip-failing-test.patch | 3 +- > 5 files changed, 30 insertions(+), 77 deletions(-) > > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index f85d5e3225..ecf5cb491f 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -215,7 +215,7 @@ (define-public dbus-verbose > (define glib > (package > (name "glib") > - (version "2.70.2") > + (version "2.76.1") > (source > (origin > (method url-fetch) > @@ -224,14 +224,14 @@ (define glib > name "/" (string-take version 4) "/" > name "-" version ".tar.xz")) > (sha256 > - (base32 "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85")) > + (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23")) > (patches > (search-patches "glib-appinfo-watch.patch" > "glib-skip-failing-test.patch")) > (modules '((guix build utils))) > (snippet > '(begin > - (substitute* "tests/spawn-test.c" > + (substitute* "glib/tests/spawn-test.c" > (("/bin/sh") "sh")))))) > (build-system meson-build-system) > (outputs '("out" ;libraries, locales, etc > @@ -256,6 +256,9 @@ (define glib > #:phases > (modify-phases %standard-phases > ;; Needed to pass the test phase on slower ARM and i686 machine= s. > + (add-after 'unpack 'set-G_TEST_SRCDIR > + (lambda _ > + (setenv "G_TEST_SRCDIR" (string-append (getcwd) "/gio/tests= ")))) > (add-after 'unpack 'increase-test-timeout > (lambda _ > (substitute* "meson.build" > @@ -270,9 +273,19 @@ (define glib > (substitute* '("unix.c" "utils.c") > (("[ \t]*g_test_add_func.*;") ""))) > (with-directory-excursion "gio/tests" > - (substitute* '("contenttype.c" "gdbus-address-get-session= .c" > - "gdbus-peer.c" "appinfo.c" "desktop-app-in= fo.c") > - (("[ \t]*g_test_add_func.*;") ""))) > + (substitute* '("contenttype.c" > + "gdbus-address-get-session.c" > + "gdbus-server-auth.c" > + "gdbus-peer.c" > + "appinfo.c" > + "desktop-app-info.c") > + (("[ \t]*g_test_add_func.*;") "")) > + (unless (which "update-desktop-database") > + (substitute* '("file.c") file.c doesn't need to be in a list. > + (("[ \t]*g_test_add_func.*query-default-handler.*;") ""= ))) The indentation seems off here. Is it really necessary to use the unless conditional here? I'd perhaps simply disable the test generally. The rest LGTM. --=20 Thanks, Maxim