From patchwork Tue Nov 28 07:24:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 56919 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 6313E27BBE2; Tue, 28 Nov 2023 12:39:31 +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 E863A27BBE9 for ; Tue, 28 Nov 2023 12:39:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7xN2-0002mn-8d; Tue, 28 Nov 2023 07:39:22 -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 1r7xMh-0002Ml-0Q for guix-patches@gnu.org; Tue, 28 Nov 2023 07:38:59 -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 1r7xMd-0004Pf-Uv for guix-patches@gnu.org; Tue, 28 Nov 2023 07:38:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r7xMk-0007b5-Ht for guix-patches@gnu.org; Tue, 28 Nov 2023 07:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Nov 2023 12:39: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: Liliana Marie Prikler ,67473@debbugs.gnu.org Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 67473-submit@debbugs.gnu.org id=B67473.170117509929133 (code B ref 67473); Tue, 28 Nov 2023 12:39:02 +0000 Received: (at 67473) by debbugs.gnu.org; 28 Nov 2023 12:38:19 +0000 Received: from localhost ([127.0.0.1]:45749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7xM2-0007Zn-MG for submit@debbugs.gnu.org; Tue, 28 Nov 2023 07:38:19 -0500 Received: from planete-kraus.eu ([89.234.140.182]:42910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7xLt-0007WM-JS for 67473@debbugs.gnu.org; Tue, 28 Nov 2023 07:38:10 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 27152456; Tue, 28 Nov 2023 12:38:01 +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=albinoniA; bh=G+lInudiXfrTMdQ9rGz9OeOYFvY=; b=L D0QGpv9hhlHXszVE0Ic5K8vzb1eS0wo39mKyBTi7fW/Vir36idWVzOj0z0WrIqVa bJ+0ceYqg4i51LX9U/FW7X2Gr/HoEyelriiDd0a6UBugMjH5F2jCk0bm3PGbWWwT IFfpKlpouYDRFdC92tuqIBE40khIOidJza/2p4mo2JqBpRXh6Rbvch72biDGSO+D r+OmHdnqaijF1TI3RcL0/jaDYFmfVnoWyOI6gBDoGg8j9mF65veuyHiXkDHM8RQK D9kzXpkP/w9rSq7W5sTzSUGWt+8QLxUzwSZlgVDHcLRCP5Aujme0vru1kbWbJYhg U9zZrWddFAmPFR26ieLpw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 795450b5 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 28 Nov 2023 12:38:00 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Tue, 28 Nov 2023 08:24:48 +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): Remove. (libsoup-minimal-2): Do not inherit libsoup-minimal. (libsoup): Inherit libsoup-minimal-2 instead of libsoup-minimal. (rhythmbox): Replace libsoup-minimal with libsoup. * gnu/packages/mastodon.scm (tuba) [inputs]: Same. * gnu/packages/messaging.scm (python-nbxmpp) [inputs]: Same. * gnu/packages/radio.scm (gnuais) [inputs]: Same. Change-Id: Ic57cdd0c2f7d3ceba19d7c84780b24ff2dac221f --- gnu/packages/gnome.scm | 93 +++++++++++++++----------------------- gnu/packages/mastodon.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/radio.scm | 2 +- 4 files changed, 39 insertions(+), 60 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7baef6ae5d..904a8cacfe 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 +(define-public libsoup-minimal-2 (package (name "libsoup-minimal") - (version "3.0.7") + (version "2.74.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -5016,34 +5015,40 @@ (define-public libsoup-minimal "libsoup-" version ".tar.xz")) (sha256 (base32 - "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb")))) + "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Dgtk_doc=false") - #: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" - ((".*/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 #~'("-Dgtk_doc=false") + #: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" + ((".*/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.*") "")) + + ;; Disable the SSL test, failing since 2.68 and resolved in + ;; libsoup 3. + (substitute* "tests/meson.build" + (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))) (native-inputs (list `(,glib "bin") ;for glib-mkenums gobject-introspection pkg-config python-wrapper - vala + vala-0.52 curl gnutls ;for 'certtool' httpd/pinned)) @@ -5067,35 +5072,8 @@ (define-public libsoup-minimal and the GLib main loop, to integrate well with GNOME applications.") (license license:lgpl2.0+))) -;;; An older variant kept to build the 'rest' package. -(define-public libsoup-minimal-2 - (package - (inherit libsoup-minimal) - (version "2.74.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/libsoup/" - (version-major+minor version) "/" - "libsoup-" version ".tar.xz")) - (sha256 - (base32 - "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) - (arguments - (substitute-keyword-arguments (package-arguments libsoup-minimal) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'disable-failing-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))))) - (define-public libsoup - (package/inherit libsoup-minimal + (package/inherit libsoup-minimal-2 (name "libsoup") (version "3.4.4") (source (origin @@ -5106,9 +5084,9 @@ (define-public libsoup (sha256 (base32 "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719")))) - (outputs (cons "doc" (package-outputs libsoup-minimal))) + (outputs (cons "doc" (package-outputs libsoup-minimal-2))) (arguments - (substitute-keyword-arguments (package-arguments libsoup-minimal) + (substitute-keyword-arguments (package-arguments libsoup-minimal-2) ((#:configure-flags configure-flags) #~(delete "-Dgtk_doc=false" #$configure-flags)) ((#:phases phases) @@ -5134,8 +5112,9 @@ (define-public libsoup (mkdir-p (string-append #$output:doc "/share")) (rename-file (string-append #$output "/share/doc") (string-append #$output:doc "/share/doc")))))))) - (native-inputs (modify-inputs (package-native-inputs libsoup-minimal) - (prepend gettext-minimal gi-docgen))))) + (native-inputs (modify-inputs (package-native-inputs libsoup-minimal-2) + (prepend gettext-minimal gi-docgen) + (replace "vala" vala))))) (define-public libsecret (package @@ -6789,7 +6768,7 @@ (define-public rhythmbox libpeas libsecret libmtp - libsoup-minimal + libsoup libxml2 lirc pango diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm index cbeccdb402..d766979070 100644 --- a/gnu/packages/mastodon.scm +++ b/gnu/packages/mastodon.scm @@ -131,7 +131,7 @@ (define-public tuba json-glib libadwaita libgee - libsoup-minimal + libsoup libsecret libwebp libxml2 diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1c5bc4bbd7..54ae080463 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1110,7 +1110,7 @@ (define-public python-nbxmpp (inputs (list glib glib-networking - libsoup-minimal + libsoup python-gssapi python-idna python-precis-i18n diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 486244e154..e6d8eb9ab9 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2170,7 +2170,7 @@ (define-public gnuais `(("alsa-lib" ,alsa-lib) ("curl" ,curl) ("gtk+" ,gtk+) - ("libsoup" ,libsoup-minimal) + ("libsoup" ,libsoup) ("mariadb-lib" ,mariadb "lib") ("osm-gps-map" ,osm-gps-map) ("pulseaudio" ,pulseaudio)))