From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 04 Oct 2022 16:46:06 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ofjBO-005eTM-QF for lore@lore.pengutronix.de; Tue, 04 Oct 2022 16:46:06 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ofjBN-0003jm-S6; Tue, 04 Oct 2022 16:46:05 +0200 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ofjAz-0003U5-8t; Tue, 04 Oct 2022 16:45:41 +0200 From: Bastian Krause To: ptxdist@pengutronix.de Date: Tue, 4 Oct 2022 16:45:31 +0200 Message-Id: <20221004144533.2269637-3-bst@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221004144533.2269637-1-bst@pengutronix.de> References: <20221004144533.2269637-1-bst@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 2/4] libsoup: version bump 2.72.0 -> 3.2.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Bastian Krause Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- 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 ") @$(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