[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: gnu: libsoup: Update to 2.68.2.
From: |
guix-commits |
Subject: |
01/07: gnu: libsoup: Update to 2.68.2. |
Date: |
Thu, 10 Oct 2019 14:16:08 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit f8026a797c467981f9598169acc2e82ed943e7f2
Author: Marius Bakke <address@hidden>
Date: Thu Oct 10 16:01:46 2019 +0200
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.
---
gnu/packages/gnome.scm | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2a664e3..af86976 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2690,7 +2690,7 @@ libxml to ease remote use of the RESTful API.")
(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 @@ libxml to ease remote use of the RESTful API.")
"libsoup-" version ".tar.xz"))
(sha256
(base32
- "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx"))))
+ "0crr9qprmacr626fx83cx81ggk85zsgxr4mn577kpzj6m40k1bai"))))
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
@@ -2706,7 +2706,7 @@ libxml to ease remote use of the RESTful API.")
(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 @@ libxml to ease remote use of the RESTful API.")
(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 @@ libxml to ease remote use of the RESTful API.")
("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)))
- branch master updated (2d821e4 -> ff0efc8), guix-commits, 2019/10/10
- 05/07: gnu: tbb: Update to 2019_U9., guix-commits, 2019/10/10
- 01/07: gnu: libsoup: Update to 2.68.2.,
guix-commits <=
- 04/07: gnu: whois: Update to 5.5.2., guix-commits, 2019/10/10
- 03/07: gnu: appstream-glib: Update to 0.7.16., guix-commits, 2019/10/10
- 02/07: gnu: strace: Update to 5.3., guix-commits, 2019/10/10
- 06/07: gnu: fluidsynth: Update to 2.0.7., guix-commits, 2019/10/10
- 07/07: gnu: python-bleach: Update to 3.1.0., guix-commits, 2019/10/10