From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: Vivien Kraus <vivien@planete-kraus.eu>, 67473@debbugs.gnu.org
Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com
Subject: [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal.
Date: Tue, 28 Nov 2023 21:05:00 +0100 [thread overview]
Message-ID: <9eeafcfb00d839be0b01aedb2a66843c572c1b14.camel@gmail.com> (raw)
In-Reply-To: <b6830c7ba3c4f13667362919a65b22505bb9c2a7.1701174883.git.vivien@planete-kraus.eu>
Am Dienstag, dem 28.11.2023 um 08:24 +0100 schrieb Vivien Kraus:
> * gnu/packages/gnome.scm (libsoup-minimal): Remove.
> (libsoup-minimal-2): Do not inherit libsoup-minimal.
> (libsoup): Inherit libsoup-minimal-2 instead of libsoup-minimal.
Sorry for the weird wording: By unify, I meant unify their versions,
not making them the same package. That being said…
> (rhythmbox): Replace libsoup-minimal with libsoup.
> * gnu/packages/mastodon.scm (tuba) [inputs]: Same.
> * gnu/packages/messaging.scm (python-nbxmpp) [inputs]: Same.
> * gnu/packages/radio.scm (gnuais) [inputs]: Same.
>
> Change-Id: Ic57cdd0c2f7d3ceba19d7c84780b24ff2dac221f
> ---
> gnu/packages/gnome.scm | 93 +++++++++++++++---------------------
> --
> gnu/packages/mastodon.scm | 2 +-
> gnu/packages/messaging.scm | 2 +-
> gnu/packages/radio.scm | 2 +-
> 4 files changed, 39 insertions(+), 60 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 7baef6ae5d..904a8cacfe 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -5004,11 +5004,10 @@ (define-public libshumate
> as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
> (license license:lgpl2.1+)))
>
> -;;; A minimal version of libsoup used to prevent a cycle with
> Inkscape.
> -(define-public libsoup-minimal
> +(define-public libsoup-minimal-2
… is the cycle with inkscape not still a concern?
> (package
> (name "libsoup-minimal")
> - (version "3.0.7")
> + (version "2.74.3")
> (source (origin
> (method url-fetch)
> (uri (string-append "mirror://gnome/sources/libsoup/"
> @@ -5016,34 +5015,40 @@ (define-public libsoup-minimal
> "libsoup-" version ".tar.xz"))
> (sha256
> (base32
> -
> "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb"))))
> +
> "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
> (build-system meson-build-system)
> (arguments
> - `(#:configure-flags '("-Dgtk_doc=false")
> - #: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/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 #~'("-Dgtk_doc=false")
> + #: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/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.*") ""))
> +
> + ;; Disable the SSL test, failing since 2.68 and
> resolved in
> + ;; libsoup 3.
> + (substitute* "tests/meson.build"
> + (("[ \t]*\\['ssl', true, \\[\\]\\],") "")))))))
> (native-inputs
> (list `(,glib "bin") ;for glib-mkenums
> gobject-introspection
> pkg-config
> python-wrapper
> - vala
> + vala-0.52
> curl
> gnutls ;for 'certtool'
> httpd/pinned))
> @@ -5067,35 +5072,8 @@ (define-public libsoup-minimal
> and the GLib main loop, to integrate well with GNOME applications.")
> (license license:lgpl2.0+)))
>
> -;;; An older variant kept to build the 'rest' package.
> -(define-public libsoup-minimal-2
> - (package
> - (inherit libsoup-minimal)
> - (version "2.74.3")
> - (source (origin
> - (method url-fetch)
> - (uri (string-append "mirror://gnome/sources/libsoup/"
> - (version-major+minor version) "/"
> - "libsoup-" version ".tar.xz"))
> - (sha256
> - (base32
> -
> "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
> - (arguments
> - (substitute-keyword-arguments (package-arguments libsoup-
> minimal)
> - ((#:phases phases)
> - `(modify-phases ,phases
> - (add-after 'unpack 'disable-failing-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)))))
> -
> (define-public libsoup
> - (package/inherit libsoup-minimal
> + (package/inherit libsoup-minimal-2
> (name "libsoup")
> (version "3.4.4")
> (source (origin
> @@ -5106,9 +5084,9 @@ (define-public libsoup
> (sha256
> (base32
>
> "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719"))))
> - (outputs (cons "doc" (package-outputs libsoup-minimal)))
> + (outputs (cons "doc" (package-outputs libsoup-minimal-2)))
> (arguments
> - (substitute-keyword-arguments (package-arguments libsoup-
> minimal)
> + (substitute-keyword-arguments (package-arguments libsoup-
> minimal-2)
> ((#:configure-flags configure-flags)
> #~(delete "-Dgtk_doc=false" #$configure-flags))
> ((#:phases phases)
> @@ -5134,8 +5112,9 @@ (define-public libsoup
> (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 gettext-minimal gi-docgen)))))
> + (native-inputs (modify-inputs (package-native-inputs libsoup-
> minimal-2)
> + (prepend gettext-minimal gi-docgen)
> + (replace "vala" vala)))))
>
> (define-public libsecret
> (package
> @@ -6789,7 +6768,7 @@ (define-public rhythmbox
> libpeas
> libsecret
> libmtp
> - libsoup-minimal
> + libsoup
> libxml2
> lirc
> pango
> diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm
> index cbeccdb402..d766979070 100644
> --- a/gnu/packages/mastodon.scm
> +++ b/gnu/packages/mastodon.scm
> @@ -131,7 +131,7 @@ (define-public tuba
> json-glib
> libadwaita
> libgee
> - libsoup-minimal
> + libsoup
> libsecret
> libwebp
> libxml2
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index 1c5bc4bbd7..54ae080463 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -1110,7 +1110,7 @@ (define-public python-nbxmpp
> (inputs
> (list glib
> glib-networking
> - libsoup-minimal
> + libsoup
> python-gssapi
> python-idna
> python-precis-i18n
> diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
> index 486244e154..e6d8eb9ab9 100644
> --- a/gnu/packages/radio.scm
> +++ b/gnu/packages/radio.scm
> @@ -2170,7 +2170,7 @@ (define-public gnuais
> `(("alsa-lib" ,alsa-lib)
> ("curl" ,curl)
> ("gtk+" ,gtk+)
> - ("libsoup" ,libsoup-minimal)
> + ("libsoup" ,libsoup)
> ("mariadb-lib" ,mariadb "lib")
> ("osm-gps-map" ,osm-gps-map)
> ("pulseaudio" ,pulseaudio)))
Cheers
next prev parent reply other threads:[~2023-11-28 20:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <b946571271d7a4fd62bcc5ddb1b6f1a7b7a8af9a.1701174883.git.vivien@planete-kraus.eu>
2023-11-14 11:35 ` [bug#67473] [PATCH gnome-team v2 02/13] gnu: glib-networking: Update to 2.76.1 Vivien Kraus via Guix-patches via
2023-11-14 20:17 ` [bug#67473] [PATCH gnome-team v2 03/13] gnu: gnome-backgrounds: Update to 44.0 Vivien Kraus via Guix-patches via
2023-11-23 18:22 ` [bug#67473] [PATCH gnome-team v2 04/13] gnu: gtk+: Update to 3.24.38 Vivien Kraus via Guix-patches via
2023-11-23 18:32 ` [bug#67473] [PATCH gnome-team v2 05/13] gnu: gtkmm-3: Update to 3.24.8 Vivien Kraus via Guix-patches via
2023-11-23 23:08 ` [bug#67473] [PATCH gnome-team v2 06/13] gnu: json-glib: Update to 1.6.6 Vivien Kraus via Guix-patches via
2023-11-23 23:37 ` [bug#67473] [PATCH gnome-team v2 07/13] gnu: libnotify: Update to 0.8.3 Vivien Kraus via Guix-patches via
2023-11-23 23:58 ` [bug#67473] [PATCH gnome-team v2 08/13] gnu: libsoup: Update to 3.4.4 Vivien Kraus via Guix-patches via
2023-11-24 22:31 ` [bug#67473] [PATCH gnome-team v2 10/13] gnu: mm-common: Update to 1.0.5 Vivien Kraus via Guix-patches via
2023-11-26 15:18 ` [bug#67473] [PATCH gnome-team v2 11/13] gnu: pangomm@2.46: Update to 2.46.3 Vivien Kraus via Guix-patches via
2023-11-26 18:01 ` [bug#67473] [PATCH gnome-team v2 12/13] gnu: yelp-tools: Update to 42.1 Vivien Kraus via Guix-patches via
2023-11-26 18:02 ` [bug#67473] [PATCH gnome-team v2 13/13] gnu: yelp-xsl: " Vivien Kraus via Guix-patches via
2023-11-28 7:24 ` [bug#67473] [PATCH gnome-team v2 09/13] gnu: Remove libsoup-minimal Vivien Kraus via Guix-patches via
2023-11-28 20:05 ` Liliana Marie Prikler [this message]
2023-11-28 21:26 ` Vivien Kraus via Guix-patches via
2023-11-29 5:21 ` Liliana Marie Prikler
2023-11-29 6:25 ` Vivien Kraus via Guix-patches via
2023-11-29 16:22 ` Liliana Marie Prikler
2023-12-04 1:24 ` Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9eeafcfb00d839be0b01aedb2a66843c572c1b14.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=67473@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.