diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-05 16:43:46 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-09 12:00:42 +0000 |
commit | 6417746ccdd68e51e27605806f54cb70af9d0870 (patch) | |
tree | f7d9a18419b7c0484043885408ca26c8780f95f1 /meta/recipes-support | |
parent | 03a44db3815cc3abdeea7e6cc39fcd1e652ffb6f (diff) | |
download | poky-6417746ccdd68e51e27605806f54cb70af9d0870.tar.gz |
libsoup-2.4: update to 2.68.3
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>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch | 28 | ||||
-rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb (renamed from meta/recipes-support/libsoup/libsoup-2.4_2.66.4.bb) | 15 |
2 files changed, 8 insertions, 35 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch b/meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch deleted file mode 100644 index d534457e72..0000000000 --- a/meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 85f7b74fc602214297928afe09347c31d696173d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 15 Feb 2019 14:21:06 +0100 | ||
4 | Subject: [PATCH] Do not enforce no-introspection when cross-building | ||
5 | |||
6 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/commit/7ef5ec60c33e254bcd915936bea3f04ba0fe2273] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | Signed-off-by: Alistair Francis <alistair@alistair23.me> | ||
9 | --- | ||
10 | meson.build | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/meson.build b/meson.build | ||
14 | index 25887f9..6261a7c 100644 | ||
15 | --- a/meson.build | ||
16 | +++ b/meson.build | ||
17 | @@ -281,7 +281,7 @@ enable_gnome = get_option('gnome') and host_machine.system() != 'windows' | ||
18 | # FIXME: once we start to require meson 0.49.0+ and gnome-introspection 1.58.1+ | ||
19 | # the we can enable the introspection even for the static build. See | ||
20 | # https://github.com/mesonbuild/meson/pull/4478. | ||
21 | -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 | ||
22 | +enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not is_static_library | ||
23 | |||
24 | ############ | ||
25 | # Vala API # | ||
26 | -- | ||
27 | 2.20.1 | ||
28 | |||
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.66.4.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb index 7f5f910d3d..e8bc7d6470 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.66.4.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb | |||
@@ -9,11 +9,9 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native libpsl" | |||
9 | 9 | ||
10 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 10 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
11 | 11 | ||
12 | SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ | 12 | SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" |
13 | file://0001-Do-not-enforce-no-introspection-when-cross-building.patch \ | 13 | SRC_URI[md5sum] = "29ee2ee7017945b64ede063b1396011c" |
14 | " | 14 | SRC_URI[sha256sum] = "534bb08e35b0ff3702f3adfde87d3441e27c12f9f5ec351f056fe04cba02bafb" |
15 | SRC_URI[md5sum] = "42016d80ecae4cf8eb416631049a273a" | ||
16 | SRC_URI[sha256sum] = "8308984f1eee1c4f8c113a9c1763b2b22d981bd811b0cc82a9f3f1aa63228779" | ||
17 | 15 | ||
18 | CVE_PRODUCT = "libsoup" | 16 | CVE_PRODUCT = "libsoup" |
19 | 17 | ||
@@ -21,12 +19,15 @@ S = "${WORKDIR}/libsoup-${PV}" | |||
21 | 19 | ||
22 | inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc | 20 | inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc |
23 | 21 | ||
22 | GIR_MESON_ENABLE_FLAG = 'enabled' | ||
23 | GIR_MESON_DISABLE_FLAG = 'disabled' | ||
24 | |||
24 | # libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. | 25 | # libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. |
25 | PACKAGECONFIG ??= "" | 26 | PACKAGECONFIG ??= "" |
26 | PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false" | 27 | PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false" |
27 | PACKAGECONFIG[gssapi] = "-Dgssapi=true,-Dgssapi=false,krb5" | 28 | PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" |
28 | 29 | ||
29 | EXTRA_OEMESON_append = " -Dvapi=false" | 30 | EXTRA_OEMESON_append = " -Dvapi=disabled -Dtls_check=false" |
30 | 31 | ||
31 | GTKDOC_MESON_OPTION = "gtk_doc" | 32 | GTKDOC_MESON_OPTION = "gtk_doc" |
32 | 33 | ||