From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id QK7RMHLOA2RahQEAbAwnHQ (envelope-from ) for ; Sun, 05 Mar 2023 00:04:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id QLu6MHLOA2SzxQAAauVa8A (envelope-from ) for ; Sun, 05 Mar 2023 00:04:18 +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 851089BAA for ; Sun, 5 Mar 2023 00:04:18 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="rcWpzX 2"; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677971058; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: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=KS6oPfgkNNk1e3jTm9YhPrZc99VUuTHxV6cg1PiGDlQ=; b=Tb3mIImBMMy4YXuV90Q9l6x6P55klgtzdGB0blozNl+Dr2dQipuYA6GhzARdmneI+SefeF BEuhAJF7qcXlqmtMweE1fr5Dl6ykFh/3zIm59/XRVIJxYruG+eKjejHa057UP6LcjLeFZQ ysA/YZZA8Xj9bE0ph0I8I5QpphRbAb0eIpegWXi3agsutkNXVLIUT6kYAewnS0oQ5eMfHe eSgUIcMl0OXWwBDy9JVjgiNXY1zYzHiZzzjJv7iQFP0k5WLqoxfguopMOxduU2CL2uGeDc f02/zv80VcybSjjJH+E3twRTT5nVbJnwNFzOVMtqEwERkTzIxpxtEnsb6RC+lA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="rcWpzX 2"; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677971058; a=rsa-sha256; cv=none; b=Y5GiMPCBpPn0AIwStM6eRU9k+RUzbxlu5w/FJgj1WRgDAEBaoSCwcq5sybsWHlEBPfZs4j 5eHz1vOGkg6xrUVDglwttAafFvnIrJ0U4B7nuUGlHaEl+pgG51DX+SQnp49MIPjfRfVuQl yyALIZU1ktalNBknkzpz346GL4go5zTxXvfheXMHu1nPSBP0Symo8oZEssKbOKfpniygaw CpnFkZb0pWKbF1b/D8s852X826Et4yOOsrhvzPlS5BzzFKs3b7vxbdY9vNGlZ9exaQP2Sk xvHxuxx4Cg5g1AWhP3JMmj1Nt6XzvElPg9xOAOJV4X+FO1B0ijjdzve7yu7+/g== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYav5-0001LI-UM; Sat, 04 Mar 2023 18:04:03 -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 1pYav4-0001IN-Hy for guix-patches@gnu.org; Sat, 04 Mar 2023 18:04:02 -0500 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 1pYav4-0001dz-9e for guix-patches@gnu.org; Sat, 04 Mar 2023 18:04:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYav4-0008GG-4y for guix-patches@gnu.org; Sat, 04 Mar 2023 18:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61968] [PATCH v2 1/8] gnu: glib-next: Update to 2.75.4 Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 23:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61968 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61968@debbugs.gnu.org Received: via spool by 61968-submit@debbugs.gnu.org id=B61968.167797103231708 (code B ref 61968); Sat, 04 Mar 2023 23:04:02 +0000 Received: (at 61968) by debbugs.gnu.org; 4 Mar 2023 23:03:52 +0000 Received: from localhost ([127.0.0.1]:38003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYauu-0008FM-ER for submit@debbugs.gnu.org; Sat, 04 Mar 2023 18:03:52 -0500 Received: from planete-kraus.eu ([89.234.140.182]:44478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYaus-0008Eq-6a for 61968@debbugs.gnu.org; Sat, 04 Mar 2023 18:03:51 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 80233b0b for <61968@debbugs.gnu.org>; Sat, 4 Mar 2023 23:03:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=dkim; bh=vL8oObOiGqHjAHUzcv82d1PJRCU=; b=rcWpzX 2LSDqABdjHZREyPgKTdG2nKY8w60waXLBLybCBx1eweZ6CYw0Ls5vYrXvcft5qKm LRQ7W6aDOSHul2SgKfOnjY/1Xj2hp0CziO93Z/NDe3TAxRwsRdI3OAyGolluTzwL jhth8jaZIb/ZHSFJs99dxB1/HrHxaqv+fSg4g= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id fc8baf83 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <61968@debbugs.gnu.org>; Sat, 4 Mar 2023 23:03:47 +0000 (UTC) Message-Id: <4d3ba4583e05912d192dbf7d902923783d04cf41.1677970718.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 4 Mar 2023 19:13:30 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.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: Vivien Kraus X-Migadu-Spam-Score: -4.50 X-Spam-Score: -4.50 X-Migadu-Scanner: scn0.migadu.com X-Migadu-Queue-Id: 851089BAA X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via 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-TUID: +x7xaRziz+cB * gnu/packages/patches/glib-next-skip-failing-test.patch: New file. * gnu/packages/glib.scm (glib-next): override patches and update to 2.75.4. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 7 ++++-- .../patches/glib-next-skip-failing-test.patch | 25 +++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/glib-next-skip-failing-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 415955bd3f..98b18f1026 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1209,6 +1209,7 @@ dist_patch_DATA = \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-networking-gnutls-binding.patch \ %D%/packages/patches/glib-networking-32-bit-time.patch \ + %D%/packages/patches/glib-next-skip-failing-test.patch \ %D%/packages/patches/glib-skip-failing-test.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ %D%/packages/patches/glibc-CVE-2019-9169.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f85d5e3225..8f9c5dff18 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -387,7 +387,7 @@ (define-public glib-next (package (inherit glib) (name "glib") - (version "2.73.3") + (version "2.75.4") (source (origin (inherit (package-source glib)) @@ -399,7 +399,10 @@ (define-public glib-next '(substitute* "glib/tests/spawn-test.c" (("/bin/sh") "sh"))) (sha256 - (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz")))) + (base32 "1lbadg7s8jn189g5wzj15nnvbf1vp68c0dx9pnys63iwiyxj9khn")) + (patches + (search-patches "glib-appinfo-watch.patch" + "glib-next-skip-failing-test.patch")))) (arguments (substitute-keyword-arguments (package-arguments glib) ((#:test-options test-options ''()) diff --git a/gnu/packages/patches/glib-next-skip-failing-test.patch b/gnu/packages/patches/glib-next-skip-failing-test.patch new file mode 100644 index 0000000000..e8cbebeb84 --- /dev/null +++ b/gnu/packages/patches/glib-next-skip-failing-test.patch @@ -0,0 +1,25 @@ +diff -r -u glib-2.75.4/gio/tests/meson.build glib-fixed/gio/tests/meson.build +--- glib-2.75.4/gio/tests/meson.build 1970-01-01 01:00:01.000000000 +0100 ++++ glib-fixed/gio/tests/meson.build 2023-03-04 19:10:23.727876252 +0100 +@@ -205,9 +205,6 @@ + 'extra_sources' : ['gdbus-tests.c'], + 'dependencies' : [dbus1_dep], + }, +- 'gdbus-server-auth' : { +- 'dependencies' : [dbus1_dep], +- }, + } + else + # We can build a cut-down version of this test without libdbus +@@ -260,11 +257,6 @@ + 'extra_sources': ['../gportalsupport.c', '../gsandbox.c'], + 'suite': ['portal-support'], + }, +- 'portal-support-snap' : { +- 'extra_sources': ['../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c'], +- 'c_args': ['-DG_PORTAL_SUPPORT_TEST'], +- 'suite': ['portal-support'], +- }, + 'portal-support-snap-classic' : { + 'extra_sources': ['../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c'], + 'c_args': ['-DG_PORTAL_SUPPORT_TEST'], -- 2.39.1