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 <b...@pengutronix.de>
---
 rules/libsoup.in   |  5 +----
 rules/libsoup.make | 15 +++++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rules/libsoup.in b/rules/libsoup.in
index 42ee2b1d8..788d7985d 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 74ae2f030..34b80ecee 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 
<m...@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)
-- 
2.30.2


Reply via email to