diff options
author | Alistair Francis <alistair@alistair23.me> | 2019-04-25 04:30:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-29 14:16:30 +0100 |
commit | dfd5d84ecf930623dbb297c1c0f9b77f374314c3 (patch) | |
tree | e0fe4262fe34fa307c2cd068e8ffeb4a02ec61fe /meta | |
parent | 7f46ac8b5e87ed16e92a6e498831b0838540de53 (diff) | |
download | poky-dfd5d84ecf930623dbb297c1c0f9b77f374314c3.tar.gz |
libsoup: Upgrade from 2.64.2 to 2.66.1
(From OE-Core rev: 8e9e352a0c16296cd8a530a8bccfa138b9f04040)
Signed-off-by: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch | 20 | ||||
-rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4_2.66.1.bb (renamed from meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb) | 4 |
2 files changed, 14 insertions, 10 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 index 72b029a80b..cd6de853e5 100644 --- 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 | |||
@@ -1,24 +1,28 @@ | |||
1 | From 921888affe66953c92a08ae440e911b016b124be Mon Sep 17 00:00:00 2001 | 1 | From 85f7b74fc602214297928afe09347c31d696173d Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 15 Feb 2019 14:21:06 +0100 | 3 | Date: Fri, 15 Feb 2019 14:21:06 +0100 |
4 | Subject: [PATCH] Do not enforce no-introspection when cross-building | 4 | Subject: [PATCH] Do not enforce no-introspection when cross-building |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | Signed-off-by: Alistair Francis <alistair@alistair23.me> | ||
8 | --- | 9 | --- |
9 | meson.build | 2 +- | 10 | meson.build | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 12 | ||
12 | diff --git a/meson.build b/meson.build | 13 | diff --git a/meson.build b/meson.build |
13 | index 5a92cda..cfb3520 100644 | 14 | index 25887f9..6261a7c 100644 |
14 | --- a/meson.build | 15 | --- a/meson.build |
15 | +++ b/meson.build | 16 | +++ b/meson.build |
16 | @@ -262,7 +262,7 @@ enable_gnome = get_option('gnome') and host_machine.system() != 'windows' | 17 | @@ -281,7 +281,7 @@ enable_gnome = get_option('gnome') and host_machine.system() != 'windows' |
17 | ######################### | 18 | # FIXME: once we start to require meson 0.49.0+ and gnome-introspection 1.58.1+ |
18 | # GObject introspection # | 19 | # the we can enable the introspection even for the static build. See |
19 | ######################### | 20 | # https://github.com/mesonbuild/meson/pull/4478. |
20 | -enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not meson.is_cross_build() | 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 |
21 | +enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() | 22 | +enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not is_static_library |
22 | 23 | ||
23 | ############ | 24 | ############ |
24 | # Vala API # | 25 | # Vala API # |
26 | -- | ||
27 | 2.20.1 | ||
28 | |||
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.66.1.bb index e718b2248d..f0043f80b3 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.66.1.bb | |||
@@ -12,8 +12,8 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | |||
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 | file://0001-Do-not-enforce-no-introspection-when-cross-building.patch \ |
14 | " | 14 | " |
15 | SRC_URI[md5sum] = "cac755dc6c6acd6e0c70007f547548f5" | 15 | SRC_URI[md5sum] = "5f04c09a06f6dbe4c4d3f003992145ce" |
16 | SRC_URI[sha256sum] = "75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6" | 16 | SRC_URI[sha256sum] = "4a2cb6c1174540af13661636035992c2b179dfcb39f4d3fa7bee3c7e355c43ff" |
17 | 17 | ||
18 | S = "${WORKDIR}/libsoup-${PV}" | 18 | S = "${WORKDIR}/libsoup-${PV}" |
19 | 19 | ||