From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 6CVvMtbIbGUVEwAAG6o9tA:P1 (envelope-from ) for ; Sun, 03 Dec 2023 19:28:39 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 6CVvMtbIbGUVEwAAG6o9tA (envelope-from ) for ; Sun, 03 Dec 2023 19:28:38 +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 8497922430 for ; Sun, 3 Dec 2023 19:28:38 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniB header.b="Z GVk4ul"; 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=1701628118; 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=ZUa/JznDHcIIUu+uW7q9twdU4Kyr3ST8dT3wHhMapBo=; b=bXQNUaTK3NcCgMKdCpw0HbQrWvCNqtiu7wJzOyGCeb28xjN4+Jqm7J6VOIqwl96m9kCctQ om5jcHuM/YQUqGuvEiO3JsRfH1feheW0WpUxErRtxGHdsNTBPC/fm83sDdEciCbsLTcNB9 Y7yO/1UK6Ua6yNV9KsRCJ4a7yg1DeyHnxiXIx4cJDPcXz6hKpfOfQs4ucr4MGxkOuWmymH nxQwIgXgV71/E/QSH+uNxWAHaRgXJK1eq+LNV3NTgFOOgsFv49nt0IekAxf3eR3/AxYNg2 c+hQ8flPHXC05t1d8ctq3rxQBnP4rrUJ8BfoAi+jh6tIOT8vckQye3K+JBgc4g== 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 GVk4ul"; 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=1701628118; a=rsa-sha256; cv=none; b=joihWvGnpva54XowLzs2k3DJkbT4isnZ/+J1UWiMsCF0wQn1H0fOZ5AmmvoBaVbpO1LEp5 IleQkCd/WHVKPVPHiw/FbmJr1uZhzFO2knWwNNM9Z6GaosMAvd24obDsJd29U5pQPUrlpw Y4lJil9gExqU88gPQbSnHIMiJHmRccJnHrF26uFtzWFH8xblofBIB/41iHYfZXOLNOzpsw Q5kNFkzt3YdoilFbakbTbQdK3OH8yiT0DH1cZtgNXtCIKMSii5u90/sNaduuep2pjBYfgt zpaZ3xzlngLNUvbY0BfiK9uoQorcqtsVRqMzGQjBaZpZ+urV+4+hUkEt/5xtww== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9rCD-00021T-9u; Sun, 03 Dec 2023 13:28: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 1r9rC6-0001yc-AF for guix-patches@gnu.org; Sun, 03 Dec 2023 13:27:55 -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 1r9rC6-0005fa-2S for guix-patches@gnu.org; Sun, 03 Dec 2023 13:27:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9rCG-0002yT-2j for guix-patches@gnu.org; Sun, 03 Dec 2023 13:28:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v4 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: Sun, 03 Dec 2023 18:28: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: Liliana Marie Prikler , Maxim Cournoyer , 67473@debbugs.gnu.org Cc: rg@raghavgururajan.name Received: via spool by 67473-submit@debbugs.gnu.org id=B67473.170162806111304 (code B ref 67473); Sun, 03 Dec 2023 18:28:04 +0000 Received: (at 67473) by debbugs.gnu.org; 3 Dec 2023 18:27:41 +0000 Received: from localhost ([127.0.0.1]:60871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9rBs-0002wF-Up for submit@debbugs.gnu.org; Sun, 03 Dec 2023 13:27:41 -0500 Received: from planete-kraus.eu ([89.234.140.182]:38778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9rBp-0002vA-8E for 67473@debbugs.gnu.org; Sun, 03 Dec 2023 13:27:37 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1a10a37f; Sun, 3 Dec 2023 18:27: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:cc :mime-version; s=albinoniB; bh=ChUrJ4ugMrTx20jt2y4r3qD8g0M=; b=Z GVk4ulm4O86qthpLMsCU5a8U31jXo4gswm6ht/CGot/xJnXU8r1E4STOYfeGj0dc B1mhAYVJGwCxue7d3xKj1tbNS6GzfmWCIrgbU8siPN0c8P+Q1lmtI2rDk1+PXe+4 VxCqJsWCh/OG7vubd4OqmW7sWBM7qBARXho0AE8KSahG7ngbSYqDpGdSYFQhWpXM tKE1/Do2QZ/yi9SkrK3OStsiFiMewJCZ9aqh1sDIOT4+GWG5TC1M7QtwgLh5s+1L B6T4bmy4fnUkDz9eoGq01BRV1lUVifOm9ObdXVr5iyrATin0ErWYjp9KiXLK0stU B66ZFZbQPAEpqyR+Ix6/A== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ada317e9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 3 Dec 2023 18:27:24 +0000 (UTC) Message-ID: <47e299593e37c6cbd9c82c8c3d2c3567c6e526c8.1701626217.git.vivien@planete-kraus.eu> 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 8497922430 X-Spam-Score: -4.15 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -4.15 X-TUID: L9LSOMJ+fkVt 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 aa52eb0f04..e1cd60b26b 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 named 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