Re: [PATCH] libsoup: Upgrade from 2.64.2 to 2.66.1

[Alistair Francis <alistair23@gmail.com>]

On Sun, Apr 14, 2019 at 1:50 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Why is a patch removed? That needs to be explained in the commit
> message (unless it is an obvious backport which this isn't).

Argh, when it didn't apply I assumed it was merged upstream. I'll send
a v2 with the patch still there.

Alistair

>
> Alex
>
> On Sun, 14 Apr 2019 at 22:10, Alistair Francis <alistair@alistair23.me> wrote:
> >
> > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > ---
> >  ...no-introspection-when-cross-building.patch | 24 -------------------
> >  ...up-2.4_2.64.2.bb => libsoup-2.4_2.66.1.bb} |  5 ++--
> >  2 files changed, 2 insertions(+), 27 deletions(-)
> >  delete mode 100644 meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch
> >  rename meta/recipes-support/libsoup/{libsoup-2.4_2.64.2.bb => libsoup-2.4_2.66.1.bb} (87%)
> >
> > 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 72b029a80b..0000000000
> > --- a/meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch
> > +++ /dev/null
> > @@ -1,24 +0,0 @@
> > -From 921888affe66953c92a08ae440e911b016b124be 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>
> > ----
> > - meson.build | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/meson.build b/meson.build
> > -index 5a92cda..cfb3520 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()
> > -
> > - ############
> > - # Vala API #
> > 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
> > similarity index 87%
> > rename from meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb
> > rename to meta/recipes-support/libsoup/libsoup-2.4_2.66.1.bb
> > index b095397ec2..49f078a5de 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
> > @@ -10,10 +10,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] = "cac755dc6c6acd6e0c70007f547548f5"
> > -SRC_URI[sha256sum] = "75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6"
> > +SRC_URI[md5sum] = "5f04c09a06f6dbe4c4d3f003992145ce"
> > +SRC_URI[sha256sum] = "4a2cb6c1174540af13661636035992c2b179dfcb39f4d3fa7bee3c7e355c43ff"
> >
> >  S = "${WORKDIR}/libsoup-${PV}"
> >
> > --
> > 2.20.1
> >