From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bastian Krause <bst@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] libsoup: version bump 2.72.0 -> 3.2.0
Date: Wed, 19 Oct 2022 07:41:12 +0200 [thread overview]
Message-ID: <20221019054112.402169-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20221004144533.2269637-3-bst@pengutronix.de>
Thanks, applied as 2416a4ce1557ac70173c52e7894dd53fa01fb199.
Michael
[sent from post-receive hook]
On Wed, 19 Oct 2022 07:41:11 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Note that libsoup 3.x breaks previous ABI [1].
>
> [1] https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html
>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20221004144533.2269637-3-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libsoup.in b/rules/libsoup.in
> index 42ee2b1d8ea8..788d7985d8df 100644
> --- a/rules/libsoup.in
> +++ b/rules/libsoup.in
> @@ -6,11 +6,8 @@ config LIBSOUP
> select HOST_GLIB
> select GLIB
> select SQLITE
> + select LIBNGHTTP2
> select LIBPSL
> - select LIBXML2
> - select LIBXML2_OUTPUT
> - select LIBXML2_SAX1
> - select HOST_INTLTOOL
> select GOBJECT_INTROSPECTION if LIBSOUP_INTROSPECTION
> prompt "libsoup"
> help
> diff --git a/rules/libsoup.make b/rules/libsoup.make
> index 74ae2f030b13..34b80ecee610 100644
> --- a/rules/libsoup.make
> +++ b/rules/libsoup.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBSOUP) += libsoup
> #
> # Paths and names
> #
> -LIBSOUP_VERSION := 2.72.0
> -LIBSOUP_MD5 := 859380b76b51fb55d720daea3c76c945
> +LIBSOUP_VERSION := 3.2.0
> +LIBSOUP_MD5 := 34f1f15aa43f974dadf256aef2e89587
> LIBSOUP := libsoup-$(LIBSOUP_VERSION)
> LIBSOUP_SUFFIX := tar.xz
> LIBSOUP_URL := $(call ptx/mirror, GNOME, libsoup/$(basename $(LIBSOUP_VERSION))/$(LIBSOUP).$(LIBSOUP_SUFFIX))
> @@ -35,15 +35,18 @@ LIBSOUP_LICENSE_FILES := \
> LIBSOUP_CONF_TOOL := meson
> LIBSOUP_CONF_OPT := \
> $(CROSS_MESON_USR) \
> + -Dautobahn=disabled \
> -Dbrotli=disabled \
> - -Dgnome=true \
> + -Ddoc_tests=false \
> + -Ddocs=disabled \
> + -Dfuzzing=disabled \
> -Dgssapi=disabled \
> - -Dgtk_doc=false \
> -Dinstalled_tests=false \
> -Dintrospection=$(call ptx/endis, PTXCONF_LIBSOUP_INTROSPECTION)d \
> -Dkrb5_config= \
> -Dntlm=disabled \
> -Dntlm_auth=ntlm_auth \
> + -Dpkcs11_tests=disabled \
> -Dsysprof=disabled \
> -Dtests=false \
> -Dtls_check=false \
> @@ -62,10 +65,10 @@ $(STATEDIR)/libsoup.targetinstall:
> @$(call install_fixup, libsoup,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
> @$(call install_fixup, libsoup,DESCRIPTION,missing)
>
> - @$(call install_lib, libsoup, 0, 0, 0644, libsoup-2.4)
> + @$(call install_lib, libsoup, 0, 0, 0644, libsoup-3.0)
> ifdef PTXCONF_LIBSOUP_INTROSPECTION
> @$(call install_copy, libsoup, 0, 0, 0644, -, \
> - /usr/lib/girepository-1.0/Soup-2.4.typelib)
> + /usr/lib/girepository-1.0/Soup-3.0.typelib)
> endif
>
> @$(call install_finish, libsoup)
next prev parent reply other threads:[~2022-10-19 5:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 14:45 [ptxdist] [PATCH 0/4] Switch to libsoup3 Bastian Krause
2022-10-04 14:45 ` [ptxdist] [PATCH 1/4] libnghttp2: new package Bastian Krause
2022-10-19 5:41 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-04 14:45 ` [ptxdist] [PATCH 2/4] libsoup: version bump 2.72.0 -> 3.2.0 Bastian Krause
2022-10-19 5:41 ` Michael Olbrich [this message]
2022-10-04 14:45 ` [ptxdist] [PATCH 3/4] wpewebkit: use libsoup3 Bastian Krause
2022-10-19 5:41 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-04 14:45 ` [ptxdist] [PATCH 4/4] cog: " Bastian Krause
2022-10-19 5:41 ` [ptxdist] [APPLIED] " Michael Olbrich
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=20221019054112.402169-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=bst@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox