gnu: libsoup: Update to 2.68.2.
* gnu/packages/gnome.scm (libsoup): Update to 2.68.2. [arguments]: Update #:configure-flags. Skip tests that attempts to resolve "subdomain.localhost". [propagated-inputs]: Add GOOGLE-BROTLI and ZLIB.
This commit is contained in:
parent
2d821e4c7f
commit
f8026a797c
|
@ -2690,7 +2690,7 @@ (define-public rest
|
|||
(define-public libsoup
|
||||
(package
|
||||
(name "libsoup")
|
||||
(version "2.66.2")
|
||||
(version "2.68.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/libsoup/"
|
||||
|
@ -2698,7 +2698,7 @@ (define-public libsoup
|
|||
"libsoup-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx"))))
|
||||
"0crr9qprmacr626fx83cx81ggk85zsgxr4mn577kpzj6m40k1bai"))))
|
||||
(build-system meson-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
|
@ -2706,7 +2706,7 @@ (define-public libsoup
|
|||
(guix build meson-build-system)
|
||||
(ice-9 popen))
|
||||
|
||||
#:configure-flags '("-Ddoc=true")
|
||||
#:configure-flags '("-Dgtk_doc=true")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'adjust-tests
|
||||
|
@ -2716,6 +2716,16 @@ (define-public libsoup
|
|||
(substitute* "tests/socket-test.c"
|
||||
((".*/sockets/unconnected.*") ""))
|
||||
|
||||
;; These fail because "subdomain.localhost" does not resolve in
|
||||
;; the build environment.
|
||||
(substitute* "tests/hsts-test.c"
|
||||
((".*/hsts/basic.*") "")
|
||||
((".*/hsts/subdomains.*") "")
|
||||
((".*/hsts/superdomain.*") "")
|
||||
((".*/hsts/utf8-address.*") ""))
|
||||
(substitute* "tests/hsts-db-test.c"
|
||||
((".*/hsts-db/subdomains.*") ""))
|
||||
|
||||
;; Generate a self-signed certificate that has "localhost" as its
|
||||
;; 'dnsName'. Failing to do that, and starting with GnuTLS
|
||||
;; 3.5.12, tests such as "ssl-tests" fail:
|
||||
|
@ -2784,10 +2794,12 @@ (define-public libsoup
|
|||
("httpd" ,httpd)))
|
||||
(propagated-inputs
|
||||
;; libsoup-2.4.pc refers to all these.
|
||||
`(("glib" ,glib)
|
||||
`(("brotli" ,google-brotli)
|
||||
("glib" ,glib)
|
||||
("libpsl" ,libpsl)
|
||||
("libxml2" ,libxml2)
|
||||
("sqlite" ,sqlite)))
|
||||
("sqlite" ,sqlite)
|
||||
("zlib" ,zlib)))
|
||||
(inputs
|
||||
`(("glib-networking" ,glib-networking)
|
||||
("mit-krb5" ,mit-krb5)))
|
||||
|
|
Loading…
Reference in a new issue