me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Marius Bakke 2019-10-10 16:01:46 +02:00
parent 2d821e4c7f
commit f8026a797c
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/gnome.scm
View File

@ -2690,7 +2690,7 @@ libxml to ease remote use of the RESTful API.")
(define-public libsoup (define-public libsoup
(package (package
(name "libsoup") (name "libsoup")
(version "2.66.2") (version "2.68.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/libsoup/" (uri (string-append "mirror://gnome/sources/libsoup/"
@ -2698,7 +2698,7 @@ libxml to ease remote use of the RESTful API.")
"libsoup-" version ".tar.xz")) "libsoup-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx")))) "0crr9qprmacr626fx83cx81ggk85zsgxr4mn577kpzj6m40k1bai"))))
(build-system meson-build-system) (build-system meson-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
@ -2706,7 +2706,7 @@ libxml to ease remote use of the RESTful API.")
(guix build meson-build-system) (guix build meson-build-system)
(ice-9 popen)) (ice-9 popen))
#:configure-flags '("-Ddoc=true") #:configure-flags '("-Dgtk_doc=true")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'adjust-tests (add-after 'unpack 'adjust-tests
@ -2716,6 +2716,16 @@ libxml to ease remote use of the RESTful API.")
(substitute* "tests/socket-test.c" (substitute* "tests/socket-test.c"
((".*/sockets/unconnected.*") "")) ((".*/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 ;; Generate a self-signed certificate that has "localhost" as its
;; 'dnsName'. Failing to do that, and starting with GnuTLS ;; 'dnsName'. Failing to do that, and starting with GnuTLS
;; 3.5.12, tests such as "ssl-tests" fail: ;; 3.5.12, tests such as "ssl-tests" fail:
@ -2784,10 +2794,12 @@ libxml to ease remote use of the RESTful API.")
("httpd" ,httpd))) ("httpd" ,httpd)))
(propagated-inputs (propagated-inputs
;; libsoup-2.4.pc refers to all these. ;; libsoup-2.4.pc refers to all these.
`(("glib" ,glib) `(("brotli" ,google-brotli)
("glib" ,glib)
("libpsl" ,libpsl) ("libpsl" ,libpsl)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("sqlite" ,sqlite))) ("sqlite" ,sqlite)
("zlib" ,zlib)))
(inputs (inputs
`(("glib-networking" ,glib-networking) `(("glib-networking" ,glib-networking)
("mit-krb5" ,mit-krb5))) ("mit-krb5" ,mit-krb5)))