From patchwork Mon Dec 4 18:27:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 57322 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 88FD527BBE2; Tue, 5 Dec 2023 16:51:39 +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 A280A27BBE9 for ; Tue, 5 Dec 2023 16:51:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAYcO-0004SA-T8; Tue, 05 Dec 2023 11:49:56 -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 1rAYcN-0004Re-NA for guix-patches@gnu.org; Tue, 05 Dec 2023 11:49: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 1rAYcN-0001Dl-Ep for guix-patches@gnu.org; Tue, 05 Dec 2023 11:49:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rAYcY-0000Zq-LL for guix-patches@gnu.org; Tue, 05 Dec 2023 11:50:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67473] [PATCH gnome-team v5 11/19] gnu: Deprecate libsoup-minimal. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Dec 2023 16:50:06 +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 , Liliana Marie Prikler Cc: rg@raghavgururajan.name, 67473@debbugs.gnu.org Received: via spool by 67473-submit@debbugs.gnu.org id=B67473.17017949872086 (code B ref 67473); Tue, 05 Dec 2023 16:50:06 +0000 Received: (at 67473) by debbugs.gnu.org; 5 Dec 2023 16:49:47 +0000 Received: from localhost ([127.0.0.1]:38196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rAYcE-0000XT-I5 for submit@debbugs.gnu.org; Tue, 05 Dec 2023 11:49:47 -0500 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]:42936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rAYc6-0000VR-Pn for 67473@debbugs.gnu.org; Tue, 05 Dec 2023 11:49:39 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 38fc4104; Tue, 5 Dec 2023 16:49: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=mBAzBtSdpk/jUMjYx3Q6jb/m/Rc=; b=e ZI3vDFKujkz/zUsI0/ptsutltQ9r4HSYQhE8L6fm2sLoxbpwDx0Xj6GG1DkZoPXI zhNUJzLQfrIiFGhL8omgIxWXbOIjoziCdt04pK6QZiUV0/Lb6Z3tMQy4gHTDkLrc 6or0nYto0NG0ModDduZCLB+QduzyF8JqZICbFTuaka0u5VO6YxJntozvEUjgOY12 rbHbLSt6F0Zk3E5C0hIUh7a8rlVhdJO+rc0e+jyLxZEfwvSLmv6sSEL18T5heW3s WCKLnAvVqRfkER6GYt2F7I15GSHq8sIcyw2EMwnjYXbUL8JhwPoQd0EhpuLxICji IffTgl+HB+eMop/xpU2lw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id e176fb37 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 5 Dec 2023 16:49:25 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Mon, 4 Dec 2023 19:27:11 +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 This patch makes the old libsoup-minimal a full package, by adding a "doc" output, -Ddocs=enabled to the configure-flags, a 'move-doc phase and gettext-minimal and gi-docgen to the native-inputs. The libsoup-minimal-2 package inherits from that and must undo all these changes on top of the existing fixes (change origin, change tests fixes). Finally, libsoup-minimal is re-introduced as a deprecated-package. * gnu/packages/gnome.scm (libsoup): New variable from the old libsoup-minimal. [outputs]: Add "out" and "doc". [#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled. [#:phases]: Add 'move-doc. [native-inputs]: Add gettext-minimal and gi-docgen. (libsoup-minimal-2): Inherit from libsoup instead of libsoup-minimal. [name]: Set to "libsoup-minimal". [outputs]: Delete "doc". [#:configure-flags]: Delete -Ddocs=enabled since the package base has docs. [#:phases]: Replace with libsoup-minimal-2 test fixes. [native-inputs]: Delete gettext-minimal and gi-docgen. (libsoup-minimal): New variable. Change-Id: Id797a568fb4a90a84260fd7727f7a57121a26a2d --- gnu/packages/gnome.scm | 71 +++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 46 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2b24453e8f..25d964e596 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5017,9 +5017,9 @@ (define-public libshumate as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.") (license license:lgpl2.1+))) -(define-public libsoup-minimal +(define-public libsoup (package - (name "libsoup-minimal") + (name "libsoup") (version "3.4.4") (source (origin (method url-fetch) @@ -5030,9 +5030,10 @@ (define-public libsoup-minimal (base32 "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719")))) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments (list - #:configure-flags #~(list "-Ddocs=disabled") + #:configure-flags #~(list "-Ddocs=enabled") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'adjust-tests @@ -5050,9 +5051,16 @@ (define-public libsoup-minimal (substitute* "tests/meson.build" ((".*'name': 'hsts'.*") "")) (substitute* "tests/hsts-db-test.c" - ((".*/hsts-db/subdomains.*") ""))))))) + ((".*/hsts-db/subdomains.*") "")))) + (add-after 'install 'move-doc + (lambda _ + (mkdir-p (string-append #$output:doc "/share")) + (rename-file (string-append #$output "/share/doc") + (string-append #$output:doc "/share/doc"))))))) (native-inputs - (list `(,glib "bin") ;for glib-mkenums + (list gettext-minimal + `(,glib "bin") ;for glib-mkenums + gi-docgen gobject-introspection pkg-config python-wrapper @@ -5083,7 +5091,8 @@ (define-public libsoup-minimal ;;; An older variant kept to build the 'rest' package. (define-public libsoup-minimal-2 (package - (inherit libsoup-minimal) + (inherit libsoup) + (name "libsoup-minimal") (version "2.74.3") (source (origin (method url-fetch) @@ -5093,15 +5102,17 @@ (define-public libsoup-minimal-2 (sha256 (base32 "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) + (outputs (delete "doc" (package-outputs libsoup))) (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))) + (delete "-Ddocs=enabled" #$configure-flags))) ((#:phases phases) - #~(modify-phases #$phases - (replace 'adjust-tests + #~(modify-phases %standard-phases + ;; Cannot reuse #$phases here, because it references the "doc" + ;; output of this package, so Guix expects a "doc" output. + (add-after 'unpack 'adjust-tests (lambda _ ;; Disable the SSL test, failing since 2.68 and resolved in ;; libsoup 3. @@ -5109,43 +5120,11 @@ (define-public libsoup-minimal-2 (("[ \t]*\\['ssl', true, \\[\\]\\],") "")))))))) (native-inputs (modify-inputs (package-native-inputs libsoup-minimal) - (replace "vala" vala-0.52))))) + (replace "vala" vala-0.52) + (delete "gettext-minimal" "gi-docgen"))))) -(define-public libsoup - (package/inherit libsoup-minimal - (name "libsoup") - (outputs (cons "doc" (package-outputs libsoup-minimal))) - (arguments - (substitute-keyword-arguments (package-arguments libsoup-minimal) - ((#:configure-flags 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 - (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.*") "")))) - (add-after 'install 'move-doc - (lambda _ - (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))))) +(define-public libsoup-minimal + (deprecated-package "libsoup-minimal" libsoup)) (define-public libsecret (package