gnu: libsoup: Update to 2.66.0.
* gnu/packages/gnome.scm (libsoup): Update to 2.66.0. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Adjust accordingly. [native-inputs]: Add GTK-DOC. [inputs]: Add MIT-KRB5. Move SQLITE and LIBPSL ... [propagated-inputs]: ... here.
This commit is contained in:
parent
b165fe61dc
commit
eccaa8bf8d
|
@ -2561,7 +2561,7 @@ libxml to ease remote use of the RESTful API.")
|
||||||
(define-public libsoup
|
(define-public libsoup
|
||||||
(package
|
(package
|
||||||
(name "libsoup")
|
(name "libsoup")
|
||||||
(version "2.64.2")
|
(version "2.66.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/libsoup/"
|
(uri (string-append "mirror://gnome/sources/libsoup/"
|
||||||
|
@ -2569,38 +2569,23 @@ libxml to ease remote use of the RESTful API.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1il6lyrmfi0hfh3ysw8w1qzc1rdz0igkb7dv6d8g5mmilnac3pbm"))))
|
"08c9kkdhzy504gv23pfdm4sq3dd3j20sikwz6gv0qrwcdjnw5bai"))))
|
||||||
(build-system gnu-build-system)
|
(build-system meson-build-system)
|
||||||
(outputs '("out" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:modules ((guix build utils)
|
`(#:modules ((guix build utils)
|
||||||
(guix build gnu-build-system)
|
(guix build meson-build-system)
|
||||||
(ice-9 popen))
|
(ice-9 popen))
|
||||||
|
|
||||||
#:configure-flags
|
#:configure-flags '("-Ddoc=true")
|
||||||
(list (string-append "--with-html-dir="
|
|
||||||
(assoc-ref %outputs "doc")
|
|
||||||
"/share/gtk-doc/html")
|
|
||||||
(string-append "--with-apache-module-dir="
|
|
||||||
(assoc-ref %build-inputs "httpd")
|
|
||||||
"/modules"))
|
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-before 'configure 'disable-unconnected-socket-test
|
(add-after 'unpack 'adjust-tests
|
||||||
|
(lambda _
|
||||||
;; This test fails due to missing /etc/nsswitch.conf
|
;; This test fails due to missing /etc/nsswitch.conf
|
||||||
;; in the build environment.
|
;; in the build environment.
|
||||||
(lambda _
|
|
||||||
(substitute* "tests/socket-test.c"
|
(substitute* "tests/socket-test.c"
|
||||||
((".*/sockets/unconnected.*") ""))
|
((".*/sockets/unconnected.*") ""))
|
||||||
#t))
|
|
||||||
(add-before 'check 'pre-check
|
|
||||||
(lambda _
|
|
||||||
;; The 'check-local' target runs 'env LANG=C sort -u',
|
|
||||||
;; unset 'LC_ALL' to make 'LANG' working.
|
|
||||||
(unsetenv "LC_ALL")
|
|
||||||
;; HTTPD in Guix uses mod_event and does not build prefork.
|
|
||||||
(substitute* "tests/httpd.conf"
|
|
||||||
(("^LoadModule mpm_prefork_module.*$") "\n"))
|
|
||||||
|
|
||||||
;; 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
|
||||||
|
@ -2646,16 +2631,19 @@ libxml to ease remote use of the RESTful API.")
|
||||||
))
|
))
|
||||||
(close-pipe pipe))
|
(close-pipe pipe))
|
||||||
#t))
|
#t))
|
||||||
(replace 'install
|
(add-after 'install 'move-doc
|
||||||
(lambda _
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(invoke "make"
|
(let ((out (assoc-ref outputs "out"))
|
||||||
;; Install vala bindings into $out.
|
(doc (assoc-ref outputs "doc")))
|
||||||
(string-append "vapidir=" %output
|
(mkdir-p (string-append doc "/share"))
|
||||||
"/share/vala/vapi")
|
(copy-recursively (string-append out "/share/gtk-doc")
|
||||||
"install"))))))
|
(string-append doc "/share/gtk-doc"))
|
||||||
|
(delete-file-recursively (string-append out "/share/gtk-doc"))
|
||||||
|
#t))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("glib:bin" ,glib "bin") ; for glib-mkenums
|
`(("glib:bin" ,glib "bin") ; for glib-mkenums
|
||||||
("gobject-introspection" ,gobject-introspection)
|
("gobject-introspection" ,gobject-introspection)
|
||||||
|
("gtk-doc" ,gtk-doc)
|
||||||
("intltool" ,intltool)
|
("intltool" ,intltool)
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
("python" ,python-wrapper)
|
("python" ,python-wrapper)
|
||||||
|
@ -2668,11 +2656,12 @@ libxml to ease remote use of the RESTful API.")
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
;; libsoup-2.4.pc refers to all these.
|
;; libsoup-2.4.pc refers to all these.
|
||||||
`(("glib" ,glib)
|
`(("glib" ,glib)
|
||||||
("libxml2" ,libxml2)))
|
("libpsl" ,libpsl)
|
||||||
|
("libxml2" ,libxml2)
|
||||||
|
("sqlite" ,sqlite)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("glib-networking" ,glib-networking)
|
`(("glib-networking" ,glib-networking)
|
||||||
("libpsl" ,libpsl)
|
("mit-krb5" ,mit-krb5)))
|
||||||
("sqlite" ,sqlite)))
|
|
||||||
(home-page "https://live.gnome.org/LibSoup/")
|
(home-page "https://live.gnome.org/LibSoup/")
|
||||||
(synopsis "GLib-based HTTP Library")
|
(synopsis "GLib-based HTTP Library")
|
||||||
(description
|
(description
|
||||||
|
|
Loading…
Reference in New Issue