mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

libsoup-2.4: update to 2.68.3

Browse Source 
Drop backported patch.

tls-check merely checks at configure time whether glib-networking has tls
support enabled (by running a target executable which doesn't work for us);
it does not affect the actual build.

(From OE-Core rev: 2537fcf3143153e272630c42fc1d7ce85b463590)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2019-12-05 16:43:46 +01:00
committed by Richard Purdie
parent 03a44db381
commit 6417746ccd
2 changed files with 8 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch
-28
View File
@@ -1,28 +0,0 @@
From 85f7b74fc602214297928afe09347c31d696173d Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 15 Feb 2019 14:21:06 +0100
Subject: [PATCH] Do not enforce no-introspection when cross-building
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/commit/7ef5ec60c33e254bcd915936bea3f04ba0fe2273]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 25887f9..6261a7c 100644
--- a/meson.build
+++ b/meson.build
@@ -281,7 +281,7 @@ enable_gnome = get_option('gnome') and host_machine.system() != 'windows'
# FIXME: once we start to require meson 0.49.0+ and gnome-introspection 1.58.1+
# the we can enable the introspection even for the static build. See
# https://github.com/mesonbuild/meson/pull/4478.
-enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not meson.is_cross_build() and not is_static_library
+enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not is_static_library
############
# Vala API #
--
2.20.1
meta/recipes-support/libsoup/libsoup-2.4_2.66.4.bb → meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb
+8 -7
View File
@@ -9,11 +9,9 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native libpsl"
SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
file://0001-Do-not-enforce-no-introspection-when-cross-building.patch \
"
SRC_URI[md5sum] = "42016d80ecae4cf8eb416631049a273a"
SRC_URI[sha256sum] = "8308984f1eee1c4f8c113a9c1763b2b22d981bd811b0cc82a9f3f1aa63228779"
SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
SRC_URI[md5sum] = "29ee2ee7017945b64ede063b1396011c"
SRC_URI[sha256sum] = "534bb08e35b0ff3702f3adfde87d3441e27c12f9f5ec351f056fe04cba02bafb"
CVE_PRODUCT = "libsoup"
@@ -21,12 +19,15 @@ S = "${WORKDIR}/libsoup-${PV}"
inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc
GIR_MESON_ENABLE_FLAG = 'enabled'
GIR_MESON_DISABLE_FLAG = 'disabled'
# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default.
PACKAGECONFIG ??= ""
PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false"
PACKAGECONFIG[gssapi] = "-Dgssapi=true,-Dgssapi=false,krb5"
PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5"
EXTRA_OEMESON_append = " -Dvapi=false"
EXTRA_OEMESON_append = " -Dvapi=disabled -Dtls_check=false"
GTKDOC_MESON_OPTION = "gtk_doc"