gnu: libsoup: Update to 3.1.4.

* gnu/packages/gnome.scm (libsoup): Update to 3.1.4.
[configure-flags]: Remove obsolete gtk_doc flag and use gexps.
[phases]{patch-docbook-xml}: Delete phase.
{move-doc}: Use gexps.
[native-inputs]: Delete docbook-xml and gtk_doc.  Add gi-docgen.
This commit is contained in:
Maxim Cournoyer 2022-09-11 13:17:51 -04:00
parent af321a81aa
commit 4ebd1da9eb
No known key found for this signature in database
GPG Key ID: 1260E46482E63562

@ -5091,32 +5091,45 @@ and the GLib main loop, to integrate well with GNOME applications.")
(define-public libsoup (define-public libsoup
(package/inherit libsoup-minimal (package/inherit libsoup-minimal
(name "libsoup") (name "libsoup")
(version "3.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/libsoup/"
(version-major+minor version) "/"
"libsoup-" version ".tar.xz"))
(sha256
(base32
"0m5mf2ahb462jzr40d916swv3040h9500jcmr87vnilpr4zrj584"))))
(outputs (cons "doc" (package-outputs libsoup-minimal))) (outputs (cons "doc" (package-outputs libsoup-minimal)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments libsoup-minimal) (substitute-keyword-arguments (package-arguments libsoup-minimal)
((#:configure-flags configure-flags) ((#:configure-flags configure-flags)
`(cons "-Dgtk_doc=true" #~(delete "-Dgtk_doc=false" #$configure-flags))
(delete "-Dgtk_doc=false" ,configure-flags)))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'patch-docbook-xml (replace 'adjust-tests
(lambda* (#:key inputs #:allow-other-keys) (lambda _
(let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") ;; This test fails due to missing /etc/nsswitch.conf
"/xml/dtd/docbook"))) ;; in the build environment.
(substitute* (find-files "docs/reference") (substitute* "tests/unix-socket-test.c"
(("http://.*/docbookx\\.dtd") ((".*/sockets/unconnected.*") ""))
(string-append xmldoc "/docbookx.dtd"))))))
(add-after 'install 'move-doc ;; These fail because "subdomain.localhost" does not resolve in
(lambda* (#:key outputs #:allow-other-keys) ;; the build environment. Moreover, the hsts-test suite fails on
(let ((out (assoc-ref outputs "out")) ;; i686-linux because of errors from `session_get_uri' like
(doc (assoc-ref outputs "doc"))) ;; "Unexpected status 200 OK (expected 301 Moved Permanently)"
(mkdir-p (string-append doc "/share")) ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239).
(copy-recursively (string-append out "/share/gtk-doc") (substitute* "tests/meson.build"
(string-append doc "/share/gtk-doc")) ((".*'name': 'hsts'.*") ""))
(delete-file-recursively (substitute* "tests/hsts-db-test.c"
(string-append out "/share/gtk-doc"))))))))) ((".*/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) (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
(prepend docbook-xml-4.1.2 gtk-doc))))) (prepend gi-docgen)))))
(define-public libsecret (define-public libsecret
(package (package