From 4de1c10252257b99e29cf959bc3e671435d41165 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 6 Mar 2024 07:42:09 -0800 Subject: glib-networking: upgrade 2.78.0 -> 2.78.1 (From OE-Core rev: f45a10b6272039542d17352da0553c9589709edb) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../glib-networking/glib-networking/eagain.patch | 3 +- .../glib-networking/glib-networking_2.78.0.bb | 45 ---------------------- .../glib-networking/glib-networking_2.78.1.bb | 45 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-core/glib-networking/glib-networking_2.78.0.bb create mode 100644 meta/recipes-core/glib-networking/glib-networking_2.78.1.bb diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch index 062fc0191b..6c2e3c634b 100644 --- a/meta/recipes-core/glib-networking/glib-networking/eagain.patch +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch @@ -1,4 +1,4 @@ -From 025bb39dfdb81dd2852deaefea228b197ef3cd8d Mon Sep 17 00:00:00 2001 +From 5604707bed4b4a4bc4658c7158a18c1774775775 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 6 May 2023 12:18:50 +0100 Subject: [PATCH] In autobuilder testing we regularly see glib-networking ptest @@ -15,7 +15,6 @@ The test should probably retry in this situation so test a patch which does this Upstream-Status: Pending [testing to see if patch resolves the issue] Signed-off-by: Richard Purdie - --- tls/tests/connection.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb deleted file mode 100644 index 68f9a2ed78..0000000000 --- a/meta/recipes-core/glib-networking/glib-networking_2.78.0.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "GLib networking extensions" -DESCRIPTION = "glib-networking contains the implementations of certain GLib networking features that cannot be implemented directly in GLib itself because of their dependencies." -HOMEPAGE = "https://gitlab.gnome.org/GNOME/glib-networking/" -BUGTRACKER = "http://bugzilla.gnome.org" - -LICENSE = "LGPL-2.1-or-later" -LICENSE:append = "${@bb.utils.contains('PACKAGECONFIG', 'openssl', ' & Glib-Networking-OpenSSL-Exception', '', d)}" -NO_GENERIC_LICENSE[Glib-Networking-OpenSSL-Exception] = "LICENSE_EXCEPTION" - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://LICENSE_EXCEPTION;md5=0f5be697951b5e71aff00f4a4ce66be8 \ - file://tls/base/gtlsconnection-base.c;beginline=7;endline=22;md5=ab641ac307f3337811008ea9afe7059f" - -SECTION = "libs" -DEPENDS = "glib-2.0-native glib-2.0" - -SRC_URI[archive.sha256sum] = "52fe4ce93f7dc51334b102894599858d23c8a65ac4a1110b30920565d68d3aba" - -# Upstream note that for the openssl backend, half the tests where this backend don't return -# the expected error code or don't work as expected so default to gnutls -PACKAGECONFIG ??= "gnutls environment ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" - -PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" -PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl" -PACKAGECONFIG[environment] = "-Denvironment_proxy=enabled,-Denvironment_proxy=disabled" -PACKAGECONFIG[libproxy] = "-Dlibproxy=enabled,-Dlibproxy=disabled,libproxy" -PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" -PACKAGECONFIG[gnomeproxy] = "-Dgnome_proxy=enabled,-Dgnome_proxy=disabled,gsettings-desktop-schemas" - -inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome - -SRC_URI += "file://run-ptest" -SRC_URI += "file://eagain.patch" - -FILES:${PN} += "\ - ${libdir}/gio/modules/libgio*.so \ - ${datadir}/dbus-1/services/ \ - ${systemd_user_unitdir} \ - " -FILES:${PN}-dev += "${libdir}/gio/modules/libgio*.la" -FILES:${PN}-staticdev += "${libdir}/gio/modules/libgio*.a" - -RDEPENDS:${PN}-ptest += "bash" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb b/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb new file mode 100644 index 0000000000..5060d9fd7a --- /dev/null +++ b/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb @@ -0,0 +1,45 @@ +SUMMARY = "GLib networking extensions" +DESCRIPTION = "glib-networking contains the implementations of certain GLib networking features that cannot be implemented directly in GLib itself because of their dependencies." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/glib-networking/" +BUGTRACKER = "http://bugzilla.gnome.org" + +LICENSE = "LGPL-2.1-or-later" +LICENSE:append = "${@bb.utils.contains('PACKAGECONFIG', 'openssl', ' & Glib-Networking-OpenSSL-Exception', '', d)}" +NO_GENERIC_LICENSE[Glib-Networking-OpenSSL-Exception] = "LICENSE_EXCEPTION" + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE_EXCEPTION;md5=0f5be697951b5e71aff00f4a4ce66be8 \ + file://tls/base/gtlsconnection-base.c;beginline=7;endline=22;md5=ab641ac307f3337811008ea9afe7059f" + +SECTION = "libs" +DEPENDS = "glib-2.0-native glib-2.0" + +SRC_URI[archive.sha256sum] = "e48f2ddbb049832cbb09230529c5e45daca9f0df0eda325f832f7379859bf09f" + +# Upstream note that for the openssl backend, half the tests where this backend don't return +# the expected error code or don't work as expected so default to gnutls +PACKAGECONFIG ??= "gnutls environment ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" + +PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" +PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl" +PACKAGECONFIG[environment] = "-Denvironment_proxy=enabled,-Denvironment_proxy=disabled" +PACKAGECONFIG[libproxy] = "-Dlibproxy=enabled,-Dlibproxy=disabled,libproxy" +PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" +PACKAGECONFIG[gnomeproxy] = "-Dgnome_proxy=enabled,-Dgnome_proxy=disabled,gsettings-desktop-schemas" + +inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome + +SRC_URI += "file://run-ptest" +SRC_URI += "file://eagain.patch" + +FILES:${PN} += "\ + ${libdir}/gio/modules/libgio*.so \ + ${datadir}/dbus-1/services/ \ + ${systemd_user_unitdir} \ + " +FILES:${PN}-dev += "${libdir}/gio/modules/libgio*.la" +FILES:${PN}-staticdev += "${libdir}/gio/modules/libgio*.a" + +RDEPENDS:${PN}-ptest += "bash" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf