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 eDWWINClA2S7/AAAbAwnHQ (envelope-from ) for ; Sat, 04 Mar 2023 21:10:56 +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 UNeKINClA2TBGwAAauVa8A (envelope-from ) for ; Sat, 04 Mar 2023 21:10:56 +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 578193E466 for ; Sat, 4 Mar 2023 21:10:56 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYYCm-0002P9-Bl; Sat, 04 Mar 2023 15:10:08 -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 1pYYCi-0002MP-9u for guix-patches@gnu.org; Sat, 04 Mar 2023 15:10:04 -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 1pYYCi-0001Ai-0X for guix-patches@gnu.org; Sat, 04 Mar 2023 15:10:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYYCh-0003Ev-SD for guix-patches@gnu.org; Sat, 04 Mar 2023 15:10:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61968] [PATCH 1/7] 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 20:10:03 +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.167796056912344 (code B ref 61968); Sat, 04 Mar 2023 20:10:03 +0000 Received: (at 61968) by debbugs.gnu.org; 4 Mar 2023 20:09:29 +0000 Received: from localhost ([127.0.0.1]:37855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYYC9-0003D2-8X for submit@debbugs.gnu.org; Sat, 04 Mar 2023 15:09:29 -0500 Received: from planete-kraus.eu ([89.234.140.182]:59616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYYC6-0003Bj-CY for 61968@debbugs.gnu.org; Sat, 04 Mar 2023 15:09:27 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1d3bcfa9 for <61968@debbugs.gnu.org>; Sat, 4 Mar 2023 20:09:25 +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=IUCgLQ RPJzrPa9t/IdOFLoxC+RRJBy9fSXUeTAJrQ5fxYLJXD1bmgDxp+blIOBs40fZBl5 f4eNjiIxs+2AoMjt/jgGmZWsYXaj+z0+9pON2g6UjTZw4s8Abl9+DyAjDtWZrlE9 GjL0pZOb0mnVZWZoRNM8dpml0eYO5xhjCCYek= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 7dc20db4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <61968@debbugs.gnu.org>; Sat, 4 Mar 2023 20:09:24 +0000 (UTC) Message-Id: <4d3ba4583e05912d192dbf7d902923783d04cf41.1677960269.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-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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677960656; a=rsa-sha256; cv=none; b=Xs25ozP/XjPqmOKqVnRl91zMTP+uqwY0iE6Hw3DCXznyfnsLWq1TKfbvtgRLXpqq6upqYI EnMjipPTTPzo3kWqMorf66GZWomWEZDgwkKAJwdT/45OyP4XtqtOrEa/7eHKc9smxBmdjG +srOyCStJF4XkO5Awb0O3Zyjplf/wCzZGTbTQj6tbMbUAt5+Z2MFP0R3I1gwpKi252shCI mfk80OmoPNTPZBwjAYqW8H9I5N6NLuHh1fB6kslzlVmm9yFbjfjNHWquv9t+Ugvob3h7nK uSbidfi5+UL3BA/zIZnwUERAIMp0Vkj7u0PFlAeGco+c5M0jCLbgAb0EldYyaw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="IUCgLQ R"; 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=1677960656; 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=R/mJQH0LZa0AFzWcXToFY5uSe2RmvLKAz+iZlw963cQufiJwiyVRvcv8GpOjbHn+NEJcEe h6x/pr2yv2DRtUTqeXNU2Pytz8IjWM0lJWK+bC4tkhUJpjoXg3zMkLhO+uuP34XskwecCT Ps5TjPPATshA7y9yHXIZL/xiTUZAGyTZTwO7YdWkQBXZ407ZwuMXggUoeonlXDuNnOISpH 6w0Vh+yZ5j5YwW2qfduIggdzO0n+oJQCmNFgCJJ1y6dbuNX/M5tOCKrUvKM3F0yuArkU3b Ro6Slqiz0y+HtjK64MYYIRJToSi/v1rxlLLCzLcg0hexWQvWHlp2N2RzTwSjaA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.70 X-Spam-Score: -3.70 X-Migadu-Queue-Id: 578193E466 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="IUCgLQ R"; 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 X-TUID: ZKGcYhm1FaYp * 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