From 2537fcf3143153e272630c42fc1d7ce85b463590 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 5 Dec 2019 16:43:46 +0100 Subject: 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. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...orce-no-introspection-when-cross-building.patch | 28 -------------- meta/recipes-support/libsoup/libsoup-2.4_2.66.4.bb | 42 --------------------- meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb | 43 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch delete mode 100644 meta/recipes-support/libsoup/libsoup-2.4_2.66.4.bb create mode 100644 meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb 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 @@ -From 85f7b74fc602214297928afe09347c31d696173d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 15 Feb 2019 14:21:06 +0100 -Subject: [PATCH] Do not enforce no-introspection when cross-building - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/commit/7ef5ec60c33e254bcd915936bea3f04ba0fe2273] -Signed-off-by: Alexander Kanavin -Signed-off-by: Alistair Francis ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 25887f9..6261a7c 100644 ---- a/meson.build -+++ b/meson.build -@@ -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.66.4.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.66.4.bb deleted file mode 100644 index 7f5f910d3d..0000000000 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.66.4.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "An HTTP library implementation in C" -HOMEPAGE = "https://wiki.gnome.org/Projects/libsoup" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/gnome/libs" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -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] = "42016d80ecae4cf8eb416631049a273a" -SRC_URI[sha256sum] = "8308984f1eee1c4f8c113a9c1763b2b22d981bd811b0cc82a9f3f1aa63228779" - -CVE_PRODUCT = "libsoup" - -S = "${WORKDIR}/libsoup-${PV}" - -inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc - -# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. -PACKAGECONFIG ??= "" -PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false" -PACKAGECONFIG[gssapi] = "-Dgssapi=true,-Dgssapi=false,krb5" - -EXTRA_OEMESON_append = " -Dvapi=false" - -GTKDOC_MESON_OPTION = "gtk_doc" - -# When built without gnome support, libsoup-2.4 will contain only one shared lib -# and will therefore become subject to renaming by debian.bbclass. Prevent -# renaming in order to keep the package name consistent regardless of whether -# gnome support is enabled or disabled. -DEBIAN_NOAUTONAME_${PN} = "1" - -# glib-networking is needed for SSL, proxies, etc. -RRECOMMENDS_${PN} = "glib-networking" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb new file mode 100644 index 0000000000..e8bc7d6470 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb @@ -0,0 +1,43 @@ +SUMMARY = "An HTTP library implementation in C" +HOMEPAGE = "https://wiki.gnome.org/Projects/libsoup" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/gnome/libs" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +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" +SRC_URI[md5sum] = "29ee2ee7017945b64ede063b1396011c" +SRC_URI[sha256sum] = "534bb08e35b0ff3702f3adfde87d3441e27c12f9f5ec351f056fe04cba02bafb" + +CVE_PRODUCT = "libsoup" + +S = "${WORKDIR}/libsoup-${PV}" + +inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. +PACKAGECONFIG ??= "" +PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false" +PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" + +EXTRA_OEMESON_append = " -Dvapi=disabled -Dtls_check=false" + +GTKDOC_MESON_OPTION = "gtk_doc" + +# When built without gnome support, libsoup-2.4 will contain only one shared lib +# and will therefore become subject to renaming by debian.bbclass. Prevent +# renaming in order to keep the package name consistent regardless of whether +# gnome support is enabled or disabled. +DEBIAN_NOAUTONAME_${PN} = "1" + +# glib-networking is needed for SSL, proxies, etc. +RRECOMMENDS_${PN} = "glib-networking" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg