[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#67473] [PATCH gnome-team v5 10/19] gnu: libsoup-minimal: Update sty
From: |
Vivien Kraus |
Subject: |
[bug#67473] [PATCH gnome-team v5 10/19] gnu: libsoup-minimal: Update style. |
Date: |
Sat, 2 Dec 2023 16:09:40 +0100 |
User-agent: |
Evolution 3.46.4 |
* gnu/packages/gnome.scm (libsoup-minimal) [arguments]: Convert to list of
G-Expressions.
* gnu/packages/gnome.scm (libsoup-minimal-2) [arguments]: Convert to list of
G-Expressions.
Change-Id: I72ebe6614eac3ee032057ffeb76dff5d8d821a8e
---
gnu/packages/gnome.scm | 53 +++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e1cd60b26b..2b24453e8f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5031,25 +5031,26 @@ (define-public libsoup-minimal
"1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
(build-system meson-build-system)
(arguments
- `(#:configure-flags '("-Ddocs=disabled")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack '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.*") "")))))))
+ (list
+ #:configure-flags #~(list "-Ddocs=disabled")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack '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.*") "")))))))
(native-inputs
(list `(,glib "bin") ;for glib-mkenums
gobject-introspection
@@ -5099,13 +5100,13 @@ (define-public libsoup-minimal-2
#~(cons "-Dgtk_doc=false"
(delete "-Ddocs=disabled" #$configure-flags)))
((#:phases phases)
- `(modify-phases ,phases
- (replace 'adjust-tests
- (lambda _
- ;; Disable the SSL test, failing since 2.68 and resolved in
- ;; libsoup 3.
- (substitute* "tests/meson.build"
- (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
+ #~(modify-phases #$phases
+ (replace 'adjust-tests
+ (lambda _
+ ;; Disable the SSL test, failing since 2.68 and resolved in
+ ;; libsoup 3.
+ (substitute* "tests/meson.build"
+ (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
(native-inputs
(modify-inputs (package-native-inputs libsoup-minimal)
(replace "vala" vala-0.52)))))
--
2.41.0
- [bug#67473] [PATCH gnome-team v5 18/19] gnu: yelp-tools: Update to 42.1., (continued)
- [bug#67473] [PATCH gnome-team v5 09/19] gnu: libsoup-minimal: Update to 3.4.4., Vivien Kraus, 2023/12/05
- [bug#67473] [PATCH gnome-team v5 02/19] gnu: glib-networking: Update to 2.76.1., Vivien Kraus, 2023/12/05
- [bug#67473] [PATCH gnome-team v5 10/19] gnu: libsoup-minimal: Update style.,
Vivien Kraus <=
- [bug#67473] [PATCH gnome-team v5 05/19] gnu: gtkmm-3: Update to 3.24.8., Vivien Kraus, 2023/12/05
- [bug#67473] [PATCH gnome-team v5 13/19] gnu: python-nbxmpp: Replace libsoup-minimal with libsoup., Vivien Kraus, 2023/12/05
- [bug#67473] [PATCH gnome-team v5 12/19] gnu: gnuais: Replace libsoup-minimal with libsoup., Vivien Kraus, 2023/12/05
- [bug#67473] [PATCH gnome-team v5 08/19] gnu: libsoup: Update to 3.4.4., Vivien Kraus, 2023/12/05
- [bug#67473] [PATCH gnome-team v5 03/19] gnu: gnome-backgrounds: Update to 44.0., Vivien Kraus, 2023/12/05
- [bug#67473] [PATCH gnome-team v5 04/19] gnu: gtk+: Update to 3.24.38., Vivien Kraus, 2023/12/05