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: 57225 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 EDC4127BBEA; Sat, 2 Dec 2023 16:02:34 +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=ham 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 E5EF127BBE2 for ; Sat, 2 Dec 2023 16:02:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9SRJ-0007Td-1F; Sat, 02 Dec 2023 11:01:57 -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 1r9SRE-0007T1-Qr for guix-patches@gnu.org; Sat, 02 Dec 2023 11:01:53 -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 1r9SRE-0005Qy-JJ for guix-patches@gnu.org; Sat, 02 Dec 2023 11:01:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9SRN-0005lT-Ut for guix-patches@gnu.org; Sat, 02 Dec 2023 11:02:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v3 09/14] gnu: lbsoup-minimal: Update to 3.4.4. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Dec 2023 16:02:01 +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,Liliana Marie Prikler Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 67473-submit@debbugs.gnu.org id=B67473.170153288122092 (code B ref 67473); Sat, 02 Dec 2023 16:02:01 +0000 Received: (at 67473) by debbugs.gnu.org; 2 Dec 2023 16:01:21 +0000 Received: from localhost ([127.0.0.1]:58512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9SQi-0005kA-Ql for submit@debbugs.gnu.org; Sat, 02 Dec 2023 11:01:21 -0500 Received: from planete-kraus.eu ([89.234.140.182]:57280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9SHN-0005Px-6R for 67473@debbugs.gnu.org; Sat, 02 Dec 2023 10:51:41 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id cf34c3a0; Sat, 2 Dec 2023 15:51:30 +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=ftTi0eREefMEW9ZJSIvodnIXg9s=; b=T qXvYFR1XNcUd0Io1DtvSu323C/4icCOGACn1aEtnmsEVquTxmd5c19UjHIAOCcwM i+7T+C3pA/YtJeMsv8Cehr6hq1JiPyVzyWIVcNYeq5vNeYjdxp8xZydpb/luQbG5 7F+XykWxM2MomxRuD4Ej9tF+FGdHZcUGrQ6Eq/avLJykYzK53iNoIouYw4LJHRLk chbJiTdP5HDbj4/C5ZYGQxhH8hPcFrosUXke4vXj910YRcyyCLZ6ccVPyYsfrQAu 3D0paRi8oTtFvVZzUEaaq6YVn0Ph5PHU0eAAHpIrhcwoaJQuUVTOu6Pb6EB8DOn4 ZdyVRHT3extzX5/fuRBoQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 71bc5faf (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 2 Dec 2023 15:51:29 +0000 (UTC) Message-ID: <8371fc9de5584de1870d733660224311ef1d9ce2.1701532196.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 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 7baef6ae5d..090335e6ff 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5004,11 +5004,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/" @@ -5016,17 +5015,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 @@ -5082,9 +5081,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. @@ -5097,20 +5100,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