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 10:23:24 +0100 |
| commit | 8e9e352a0c16296cd8a530a8bccfa138b9f04040 (patch) | |
| tree | 5eb126d47b3539b0a6d0773b0db54fcbb41a7d7c /meta/recipes-support/libsoup | |
| parent | 892e6258f737b0903fef29daef99f31f616e217f (diff) | |
| download | openembedded-core-8e9e352a0c16296cd8a530a8bccfa138b9f04040.tar.gz | |
libsoup: Upgrade from 2.64.2 to 2.66.1
Signed-off-by: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libsoup')
| -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 @@ -From 921888affe66953c92a08ae440e911b016b124be Mon Sep 17 00:00:00 2001 +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: Pending 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 5a92cda..cfb3520 100644 +index 25887f9..6261a7c 100644 --- a/meson.build +++ b/meson.build -@@ -262,7 +262,7 @@ enable_gnome = get_option('gnome') and host_machine.system() != 'windows' - ######################### - # GObject introspection # - ######################### --enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not meson.is_cross_build() -+enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() +@@ -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 + 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]}" 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] = "cac755dc6c6acd6e0c70007f547548f5" -SRC_URI[sha256sum] = "75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6" +SRC_URI[md5sum] = "5f04c09a06f6dbe4c4d3f003992145ce" +SRC_URI[sha256sum] = "4a2cb6c1174540af13661636035992c2b179dfcb39f4d3fa7bee3c7e355c43ff" S = "${WORKDIR}/libsoup-${PV}" |