From patchwork Mon Nov 27 19:26:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 56867 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 3C52127BBE9; Mon, 27 Nov 2023 19:27:14 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 43CAC27BBE2 for ; Mon, 27 Nov 2023 19:27:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7hFy-0006mI-W1; Mon, 27 Nov 2023 14:26:59 -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 1r7hFx-0006lb-7O for guix-patches@gnu.org; Mon, 27 Nov 2023 14:26:57 -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 1r7hFw-0007tG-Vo for guix-patches@gnu.org; Mon, 27 Nov 2023 14:26:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r7hG2-0003uI-1Z; Mon, 27 Nov 2023 14:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67493] [PATCH 1/6] gnu: Update glib-next to 2.78.1 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Mon, 27 Nov 2023 19:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67493@debbugs.gnu.org Cc: Saku Laesvuori , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 67493-submit@debbugs.gnu.org id=B67493.170111321014977 (code B ref 67493); Mon, 27 Nov 2023 19:27:01 +0000 Received: (at 67493) by debbugs.gnu.org; 27 Nov 2023 19:26:50 +0000 Received: from localhost ([127.0.0.1]:44843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7hFp-0003tT-Ug for submit@debbugs.gnu.org; Mon, 27 Nov 2023 14:26:50 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:41658 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7hFo-0003tL-4E for 67493@debbugs.gnu.org; Mon, 27 Nov 2023 14:26:48 -0500 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 9F8EE3400A9; Mon, 27 Nov 2023 20:27:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701113272; bh=fX06KwU57MiHIOXCwxwUYwPvtb6a2HTKDBwkUo8H18U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QuDh7qysXLjPPLj5pj1FfKPMHXHv++4pX8W25N93fwXn8QM2eJ1UnAMZn5nRkfzQK rEPdOanDOLxlzEcoekiP+rlw+SLMpsZ6NsEgb064PSumtjN7BatCnfcIwdlqp2Lu0N aIuyCoBXMg1/wkiufYQ65GJlbDRa1TKeWQieI7Ug= Date: Mon, 27 Nov 2023 21:26:05 +0200 Message-ID: <4cdaa07f5e211c24798b36e2eef7d210dbc9625b.1701112690.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.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: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori 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-next): Update to 2.78.1. [patches]: Remove redundant patch. [phases]: Disable new failing tests. Change-Id: I0d4bab8248cd33fde35fecc1c2c07e2bdb83d733 --- gnu/packages/glib.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b5eb4602da..353cb95aaf 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -486,7 +486,7 @@ (define-public glib-next (package (inherit glib) (name "glib") - (version "2.73.3") + (version "2.78.1") (source (origin (inherit (package-source glib)) @@ -494,11 +494,14 @@ (define-public glib-next (string-append "mirror://gnome/sources/" name "/" (string-take version 4) "/" name "-" version ".tar.xz")) + (patches (filter (lambda (patch-file) + (not (string-suffix? "glib-skip-failing-test.patch" patch-file))) + (origin-patches (package-source glib)))) (snippet '(substitute* "glib/tests/spawn-test.c" (("/bin/sh") "sh"))) (sha256 - (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz")))) + (base32 "1ckqxmpiwvxbgm57bmy4m9cww3v7zgwf4ciqml76azahz38c6nwi")))) (arguments (substitute-keyword-arguments (package-arguments glib) ((#:test-options test-options ''()) @@ -520,8 +523,10 @@ (define-public glib-next "desktop-app-info.c" "file.c" "gdbus-address-get-session.c" - "gdbus-peer.c") - (("[ \t]*g_test_add_func.*;") ""))) + "gdbus-peer.c" + "gdbus-server-auth.c" + "portal-support-snap.c") + (("g_test_run.*;") "0;"))) #$@(if (target-x86-32?) ;; Comment out parts of timer.c that fail on i686 due to