[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
162/181: gnu: libsoup: Update to 3.1.4.
From: |
guix-commits |
Subject: |
162/181: gnu: libsoup: Update to 3.1.4. |
Date: |
Tue, 13 Sep 2022 02:26:32 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 4ebd1da9eba9329f9121e8a5f11c6fd49a5dcd9b
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Sep 11 13:17:51 2022 -0400
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.
---
gnu/packages/gnome.scm | 53 +++++++++++++++++++++++++++++++-------------------
1 file changed, 33 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d559e17bd8..809bfafe85 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5091,32 +5091,45 @@ and the GLib main loop, to integrate well with GNOME
applications.")
(define-public libsoup
(package/inherit libsoup-minimal
(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)))
(arguments
(substitute-keyword-arguments (package-arguments libsoup-minimal)
((#:configure-flags configure-flags)
- `(cons "-Dgtk_doc=true"
- (delete "-Dgtk_doc=false" ,configure-flags)))
+ #~(delete "-Dgtk_doc=false" #$configure-flags))
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'patch-docbook-xml
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook")))
- (substitute* (find-files "docs/reference")
- (("http://.*/docbookx\\.dtd")
- (string-append xmldoc "/docbookx.dtd"))))))
- (add-after 'install 'move-doc
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (doc (assoc-ref outputs "doc")))
- (mkdir-p (string-append doc "/share"))
- (copy-recursively (string-append out "/share/gtk-doc")
- (string-append doc "/share/gtk-doc"))
- (delete-file-recursively
- (string-append out "/share/gtk-doc")))))))))
+ #~(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 docbook-xml-4.1.2 gtk-doc)))))
+ (prepend gi-docgen)))))
(define-public libsecret
(package
- 151/181: gnu: ghex: Update to 42.3., (continued)
- 151/181: gnu: ghex: Update to 42.3., guix-commits, 2022/09/13
- 152/181: gnu: libgit2-glib: Update to 1.1.0., guix-commits, 2022/09/13
- 159/181: gnu: sysprof: Update to 3.45.1., guix-commits, 2022/09/13
- 160/181: gnu: gnome-builder: Update to 42.1., guix-commits, 2022/09/13
- 58/181: gnu: gnome-bluetooth: Update to 42.4., guix-commits, 2022/09/13
- 65/181: gnu: evince: Update to 42.3., guix-commits, 2022/09/13
- 72/181: gnu: pango-next: Rename from "pango "to "pango-next"., guix-commits, 2022/09/13
- 83/181: gnu: gnome-weather: Update to 42.0., guix-commits, 2022/09/13
- 138/181: gnu: tracker: Patch a /bin/bash reference., guix-commits, 2022/09/13
- 166/181: gnu: libofx: Update to 0.10.7., guix-commits, 2022/09/13
- 162/181: gnu: libsoup: Update to 3.1.4.,
guix-commits <=
- 161/181: gnu: numix-gtk-theme: Remove input labels., guix-commits, 2022/09/13
- 156/181: gnu: apostrophe: Update to 2.6.3., guix-commits, 2022/09/13
- 173/181: gnu: arc-theme: Update to 20220405., guix-commits, 2022/09/13
- 175/181: gnu: Add libshumate., guix-commits, 2022/09/13
- 174/181: gnu: gnome-shell: Use libsoup 3 to fix tests., guix-commits, 2022/09/13
- 181/181: gnu: gnome-screenshot: Remove meson patch., guix-commits, 2022/09/13
- 110/181: gnu: seahorse: Update to 42.0., guix-commits, 2022/09/13
- 155/181: gnu: setzer: Update to 0.4.8., guix-commits, 2022/09/13
- 153/181: gnu: gnote: Update to 42.1., guix-commits, 2022/09/13
- 167/181: gnu: gnucash: Update to 4.11 and use gexps., guix-commits, 2022/09/13