From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id WAuiHeLCdGVaKwAAauVa8A:P1 (envelope-from ) for ; Sat, 09 Dec 2023 20:41:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WAuiHeLCdGVaKwAAauVa8A (envelope-from ) for ; Sat, 09 Dec 2023 20:41:22 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniB header.b="Z 0MddWs"; 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=1702150882; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=3q1Ht3S6LXz+lSbNqgf41iko5xClkM9TqnoZlLPeZ/U=; b=aHxKaiHm2liqIb6lzbidjHV4ovby8QWth2WawKOfY0IIkCfKmRCPXFUluOJuyXwaIKFbQe uGQs8Y8W0mw19BKzPaCi9WKpJLN6v/Tc3Q8+5yeOolhi013TrZaMN/U7EPF0U1O6Ltz3aV LeRFQQ98kfRViqgJHDaOJleJPwxkiG77qLZ7QyAnan/C8N+mPyCJ/cCfQGZVQYggfdy7gg RidSZlYJPPlevbDY9RUC8i5n9uw8gaGa5GK3AVVsj1BPZZfoAbvGeAR+F/rLTP2Z+ngz05 YRNmmj/Yf9cENbvyh1IZKerNWFP7LK6MuMjz3yWMK3iNvAzU44UegeKsiHe3BA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniB header.b="Z 0MddWs"; 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=1702150882; a=rsa-sha256; cv=none; b=ZO0R2ye9/fBMC0L26zQqyQzDA3yukAVy+66NQtZ2W5bqG8pHVOwb9HNjS/27x4/6oex6JC BPMouqb0mt5DVoonoijKVAJtrIoW+86xoywISdclDWmHMnoxsOrMRq0OoFJ3AQBx/nQOO/ e/8UOr9lL54C0Ok1fD7e+S90Gr8m6lny6wF8SXgTywEQw8gxx3bOBkpuny7nQrq8mKW7W2 AFs6RuFOC6Rtg4UvZvy/Anas57s5FJJnYtTY0WB1n3TSHCtgS+14W5P0HT/jASH0FQs5YZ 9U/U57otVlri3LZCTXfAFIl14p9Oq8BF9k7otN7tVvRH5DkpTA1Rfvx3NM9DVQ== 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 E819D403F3 for ; Sat, 9 Dec 2023 20:41:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rC3C9-0002wk-NS; Sat, 09 Dec 2023 14:41:01 -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 1rC3C2-0002uo-FR for guix-patches@gnu.org; Sat, 09 Dec 2023 14:40: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 1rC3By-0002I0-L8 for guix-patches@gnu.org; Sat, 09 Dec 2023 14:40:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rC3CC-0004E6-Ap for guix-patches@gnu.org; Sat, 09 Dec 2023 14:41:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v6 09/14] gnu: libsoup-minimal: Update to 3.4.4. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Dec 2023 19:41:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: rg@raghavgururajan.name, Liliana Marie Prikler , 67473@debbugs.gnu.org Received: via spool by 67473-submit@debbugs.gnu.org id=B67473.170215081216106 (code B ref 67473); Sat, 09 Dec 2023 19:41:04 +0000 Received: (at 67473) by debbugs.gnu.org; 9 Dec 2023 19:40:12 +0000 Received: from localhost ([127.0.0.1]:48972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC3BM-0004Bi-0P for submit@debbugs.gnu.org; Sat, 09 Dec 2023 14:40:12 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC3BK-00049W-Uf for 67473@debbugs.gnu.org; Sat, 09 Dec 2023 14:40:11 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1b0a7498; Sat, 9 Dec 2023 19:39:55 +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:cc :mime-version; s=albinoniB; bh=ADzC0dx3Ts+dDDEkd8aDqgejrIE=; b=Z 0MddWsPTx0jOtseNHwtG6LWrSS3YojuYEVcaMze0cS/alunDrPOWKl2vTr4MH/td g9WcDrv+Xs3fyMZF2Q4TkPpppxrQVjM9T3XMjwndK8H82iV0RWI08ZCmNg4DMAq7 ZhqAZvRL3eHwhpmsvV1Ayzu8SXxUcaeOBPpkEU1l7MourIo3zUpKypAfKHXZI6fX z4UpRJF5tZiSwJTzgT3HcEGGnN0sSUU8vpnsO6akLbOEvv1TkUJuPWb1kx0enzSF N0pcqEo8MYGWe5CVTZ2oJgyuroP/Yfvor0GURc5gK8swtjZ5mjcUaPeG069QlLBx MlpnXzYdu7KhDGHdKtkVg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id f6a8dba7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 9 Dec 2023 19:39:54 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Sat, 2 Dec 2023 16:08:01 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: 0.59 X-Spam-Score: 0.59 X-Migadu-Queue-Id: E819D403F3 X-TUID: OAR8gx1nmrDX The libsoup-minimal comment about inkscape is irrelevant, because inkscape uses libsoup-minimal-2. The option to build documentation has changed between libsoup 2 and libsoup 3. The failing socket test has been moved to a different file. libsoup-minimal-2 introduces a new phase to disable tests, however the 'adjust-tests phase of libsoup-minimal must be removed. For simplicity, we use the 'adjust-tests name for the phase of all variants. * gnu/packages/gnome.scm (libsoup-minimal): Update to 3.4.4. [#:configure-flags]: Change name of docs option. [#:phases]: Change the file name of socket test. (libsoup-minimal-2) [arguments]: Override #:configure-flags. [#:phases]: Override 'adjust-tests. (libsoup) [version]: Remove field. [source]: Remove field. [#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled. Change-Id: Iace1bf0f1d805a0eed7e484a7cd496ac04631b32 --- gnu/packages/gnome.scm | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 33089b4acf..dd3d92ae2d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5017,11 +5017,10 @@ (define-public libshumate as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.") (license license:lgpl2.1+))) -;;; A minimal version of libsoup used to prevent a cycle with Inkscape. (define-public libsoup-minimal (package (name "libsoup-minimal") - (version "3.0.7") + (version "3.4.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -5029,17 +5028,17 @@ (define-public libsoup-minimal "libsoup-" version ".tar.xz")) (sha256 (base32 - "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb")))) + "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Dgtk_doc=false") + `(#:configure-flags '("-Ddocs=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'adjust-tests (lambda _ ;; This test fails due to missing /etc/nsswitch.conf ;; in the build environment. - (substitute* "tests/socket-test.c" + (substitute* "tests/unix-socket-test.c" ((".*/sockets/unconnected.*") "")) ;; These fail because "subdomain.localhost" does not resolve in @@ -5095,9 +5094,13 @@ (define-public libsoup-minimal-2 "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) (arguments (substitute-keyword-arguments (package-arguments libsoup-minimal) + ((#:configure-flags configure-flags) + ;; The option name changed between libsoup 2 and libsoup 3. + #~(cons "-Dgtk_doc=false" + (delete "-Ddocs=disabled" #$configure-flags))) ((#:phases phases) `(modify-phases ,phases - (add-after 'unpack 'disable-failing-tests + (replace 'adjust-tests (lambda _ ;; Disable the SSL test, failing since 2.68 and resolved in ;; libsoup 3. @@ -5110,20 +5113,13 @@ (define-public libsoup-minimal-2 (define-public libsoup (package/inherit libsoup-minimal (name "libsoup") - (version "3.4.4") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/libsoup/" - (version-major+minor version) "/" - "libsoup-" version ".tar.xz")) - (sha256 - (base32 - "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719")))) (outputs (cons "doc" (package-outputs libsoup-minimal))) (arguments (substitute-keyword-arguments (package-arguments libsoup-minimal) ((#:configure-flags configure-flags) - #~(delete "-Dgtk_doc=false" #$configure-flags)) + #~(cons "-Ddocs=enabled" + ;; The default value is 'auto', meaning it could be skipped. + (delete "-Ddocs=disabled" #$configure-flags))) ((#:phases phases) #~(modify-phases #$phases (replace 'adjust-tests -- 2.41.0