From patchwork Sat Dec 2 15:09:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 57460 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 5F59227BBEA; Sat, 9 Dec 2023 20:02:28 +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 01F3D27BBE2 for ; Sat, 9 Dec 2023 20:02:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rC3WK-0005Px-4g; Sat, 09 Dec 2023 15:01:52 -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 1rC3WH-0005Ot-T7 for guix-patches@gnu.org; Sat, 09 Dec 2023 15:01:49 -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 1rC3WH-0007Yi-Kt for guix-patches@gnu.org; Sat, 09 Dec 2023 15:01:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rC3WV-0004y2-Aw for guix-patches@gnu.org; Sat, 09 Dec 2023 15:02:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v6 10/14] gnu: libsoup-minimal: Update style. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Dec 2023 20:02:03 +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.170215208218991 (code B ref 67473); Sat, 09 Dec 2023 20:02:03 +0000 Received: (at 67473) by debbugs.gnu.org; 9 Dec 2023 20:01:22 +0000 Received: from localhost ([127.0.0.1]:49020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC3Vp-0004w6-Ow for submit@debbugs.gnu.org; Sat, 09 Dec 2023 15:01:22 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC3Bg-00049W-V2 for 67473@debbugs.gnu.org; Sat, 09 Dec 2023 14:40:33 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id b79eaf8e; Sat, 9 Dec 2023 19:40:17 +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=FkSzgkZrWNgswFZFi56TjFp2BCo=; b=a aO6nmkKY4CFlfhgMwXfWRaaUG1V7fGii55ahfnsIOBzTro1gSMHhL4ku5avxiknZ 6cNv3Ww6ZqZZ6PzmGbDr8QNV2jDSeXIRpljP0/zYD9a3aE8SB1vOM8L85C2jh10Z P8jz0VkvD923tAdkZrAApiQtbWCFMacOGQ90lDpQPSBceixXjZEPdcJSu0SjYcR+ eIsWl7vSCExWVgnaIBmT9a/SbJ0JhoG8kNspCTGYA0YD9kFtJWaqYgeL4z1qFWzL wCPzL5QUPfQ/AnNTfAuUQCUBp+wCYCPflHHXTfF3k4Iv7OC48UvkMyW3UQaGLR0E DGcs9q6eWgbqlroRKsdZg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 5babf4c9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 9 Dec 2023 19:40:17 +0000 (UTC) Message-ID: <7021f978fd5a264b4b63b08a7efceffcf64f163e.1702150667.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 2 Dec 2023 16:09:40 +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 * gnu/packages/gnome.scm (libsoup-minimal) [arguments]: Convert to list of G-Expressions. * gnu/packages/gnome.scm (libsoup-minimal-2) [arguments]: Convert to list of G-Expressions. Change-Id: I72ebe6614eac3ee032057ffeb76dff5d8d821a8e --- gnu/packages/gnome.scm | 53 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dd3d92ae2d..507ee78690 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5031,25 +5031,26 @@ (define-public libsoup-minimal "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719")))) (build-system meson-build-system) (arguments - `(#: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/unix-socket-test.c" - ((".*/sockets/unconnected.*") "")) - - ;; These fail because "subdomain.localhost" does not resolve in - ;; the build environment. Moreover, the hsts-test suite fails on - ;; i686-linux because of errors from `session_get_uri' like - ;; "Unexpected status 200 OK (expected 301 Moved Permanently)" - ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239). - (substitute* "tests/meson.build" - ((".*'name': 'hsts'.*") "")) - (substitute* "tests/hsts-db-test.c" - ((".*/hsts-db/subdomains.*") ""))))))) + (list + #:configure-flags #~(list "-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/unix-socket-test.c" + ((".*/sockets/unconnected.*") "")) + + ;; These fail because "subdomain.localhost" does not resolve in + ;; the build environment. Moreover, the hsts-test suite fails on + ;; i686-linux because of errors from `session_get_uri' like + ;; "Unexpected status 200 OK (expected 301 Moved Permanently)" + ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239). + (substitute* "tests/meson.build" + ((".*'name': 'hsts'.*") "")) + (substitute* "tests/hsts-db-test.c" + ((".*/hsts-db/subdomains.*") ""))))))) (native-inputs (list `(,glib "bin") ;for glib-mkenums gobject-introspection @@ -5099,13 +5100,13 @@ (define-public libsoup-minimal-2 #~(cons "-Dgtk_doc=false" (delete "-Ddocs=disabled" #$configure-flags))) ((#:phases phases) - `(modify-phases ,phases - (replace 'adjust-tests - (lambda _ - ;; Disable the SSL test, failing since 2.68 and resolved in - ;; libsoup 3. - (substitute* "tests/meson.build" - (("[ \t]*\\['ssl', true, \\[\\]\\],") "")))))))) + #~(modify-phases #$phases + (replace 'adjust-tests + (lambda _ + ;; Disable the SSL test, failing since 2.68 and resolved in + ;; libsoup 3. + (substitute* "tests/meson.build" + (("[ \t]*\\['ssl', true, \\[\\]\\],") "")))))))) (native-inputs (modify-inputs (package-native-inputs libsoup-minimal) (replace "vala" vala-0.52)))))