1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-05 02:20:12 +00:00

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>
This commit is contained in:
Alistair Francis
2019-04-25 04:30:05 +00:00
committed by Richard Purdie
parent 7f46ac8b5e
commit dfd5d84ecf
2 changed files with 14 additions and 10 deletions
@@ -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
@@ -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}"