From patchwork Sat Dec 2 15:08:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 57649 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 DE67127BBE9; Sat, 16 Dec 2023 17:33:29 +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 DD27827BBE2 for ; Sat, 16 Dec 2023 17:33:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEYXA-0003rb-FL; Sat, 16 Dec 2023 12:33:04 -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 1rEYX8-0003q6-Aq for guix-patches@gnu.org; Sat, 16 Dec 2023 12:33:02 -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 1rEYX8-0006tu-2o for guix-patches@gnu.org; Sat, 16 Dec 2023 12:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rEYX8-000626-Jr for guix-patches@gnu.org; Sat, 16 Dec 2023 12:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v7 09/15] 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, 16 Dec 2023 17:33:02 +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: 67473@debbugs.gnu.org, Maxim Cournoyer , Liliana Marie Prikler Cc: rg@raghavgururajan.name Received: via spool by 67473-submit@debbugs.gnu.org id=B67473.170274794823094 (code B ref 67473); Sat, 16 Dec 2023 17:33:02 +0000 Received: (at 67473) by debbugs.gnu.org; 16 Dec 2023 17:32:28 +0000 Received: from localhost ([127.0.0.1]:55977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEYWa-00060K-4F for submit@debbugs.gnu.org; Sat, 16 Dec 2023 12:32:28 -0500 Received: from planete-kraus.eu ([89.234.140.182]:33430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEYSi-0003B5-An for 67473@debbugs.gnu.org; Sat, 16 Dec 2023 12:28:29 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 3daaebd7; Sat, 16 Dec 2023 17:28:26 +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=n +FUhGiN1yhCNpa6TUb0Szvnjpwq3voRvl5AAEGcOITqe5eV0TZB13KdcQZ/Bg5yU ebnhZa3aROu618LllIOixzTvX65coZjcKwvszi4pitp48i9FGV3EgnnUat0pCQn1 F9/3C7eqAiK3Ot0MzxEMk/lLDlGs+EUv6uXLWKQKY+6U005kWnYD+oD7/qv5aufJ 3tN7EQryHrYVpksBZVwKJC+N/u2Usz2vqqj5sZehQTISu7YOL0UCxAkPK0KJD1qy g3Pd9RM+D/+BywjRTwkCXQbaLTR4avtpBL7gyOLcxKEpF6rcaz6dVri/69j9moN3 VHkTQcqHe1lRdczCobhSQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id df693ed6 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 16 Dec 2023 17:28:24 +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 X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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 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