glib-2.0: upgrade 2.58.0 -> 2.58.3
PATCH 1/1 glib-2.0: upgrade 2.58.0 -> 2.58.3
* For changes, see:
https://gitlab.gnome.org/GNOME/glib/blob/glib-2-58/NEWS
* Upstreamed patch removed: date-lt.patch
* Tweaked another to remove a hunk trying to find a binary from glib-2.0-native which isn't needed anymore as the code is in python now.
* Add locale-base-pl-pl to RDEPENDS for ptest as the fix has been resolved and merged.
* Remove libdir INSANE_SKIP for ptest package. The only libs present here are in libexecdir which is allowed by the check.
* Revert an upstream patch for now that had changed the behavior of pkg-config files to use absolute paths which results in build failures.
Signed-off-by Anuj Mittal <[email protected]>
---
...e-absolute-paths-in-pkg-config-files.patch | 64 +++++++++++++++++++
...ble-more-tests-while-cross-compiling.patch | 42 ++----------
.../glib-2.0/glib-2.0/date-lt.patch | 20 ------
.../glib-2.0/glib-2.0/relocate-modules.patch | 2 +-
...{glib-2.0_2.58.0.bb => glib-2.0_2.58.3.bb} | 8 +--
meta/recipes-core/glib-2.0/glib.inc | 5 +-
6 files changed, 77 insertions(+), 64 deletions(-)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.58.0.bb => glib-2.0_2.58.3.bb} (76%)meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch new file +64 -0
@@ -0,0 +1,64 @@ +From abc26aed7a28678dfcc20b21726a97c7c02ea73b Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <[email protected]> +Date: Thu, 14 Feb 2019 14:55:15 +0800 +Subject: [PATCH] Revert "Use absolute paths in pkg-config files" + +This reverts commit e7a7c9b97776fa2a638d18ea3a931ba84e778f80. + +The glib pkgconfig files now contain absolute paths, but they're +target paths so when we used them from a sysroot it fails. Upstream +thinks that we should be setting +GLIB_MKENUMS=/path/to/sysroot/usr/bin/glib-mkenums but that really +doesn't scale. + +For now, we just revert the change to put absolute paths into +the sysroot. This should be re-evaluated when we move the recipe to use +meson. + +Upstream-Status: Inappropriate [Revert of an upstream commit] +Signed-off-by: Anuj Mittal <[email protected]> +--- + gio-2.0.pc.in | 7 +++---- + glib-2.0.pc.in | 7 +++---- + 2 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in +index d67e80839..526f0daa0 100644 +--- a/gio-2.0.pc.in ++++ b/gio-2.0.pc.in +@@ -5,11 +5,10 @@ includedir=@includedir@ + + datadir=@datadir@ + schemasdir=${datadir}/glib-2.0/schemas +-bindir=@bindir@ + giomoduledir=@GIO_MODULE_DIR@ +-glib_compile_schemas=${bindir}/glib-compile-schemas +-glib_compile_resources=${bindir}/glib-compile-resources +-gdbus_codegen=${bindir}/gdbus-codegen ++glib_compile_schemas=glib-compile-schemas ++glib_compile_resources=glib-compile-resources ++gdbus_codegen=gdbus-codegen + + Name: GIO + Description: glib I/O library +diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in +index 3c5ea81dc..275fc0163 100644 +--- a/glib-2.0.pc.in ++++ b/glib-2.0.pc.in +@@ -3,10 +3,9 @@ exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ + +-bindir=@bindir@ +-glib_genmarshal=${bindir}/glib-genmarshal +-gobject_query=${bindir}/gobject-query +-glib_mkenums=${bindir}/glib-mkenums ++glib_genmarshal=glib-genmarshal ++gobject_query=gobject-query ++glib_mkenums=glib-mkenums + + Name: GLib + Description: C Utility Library +-- +2.17.1 +
meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +7 -35
71 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch deleted +0 -20
@@ -1,20 +0,0 @@ -Update Lithuanian month names in the test suite as glibc changed the translations. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/merge_requests/373] -Signed-off-by: Ross Burton <[email protected]> - -diff --git a/glib/tests/date.c b/glib/tests/date.c -index b801ca704..6646c227c 100644 ---- a/glib/tests/date.c -+++ b/glib/tests/date.c -@@ -365,8 +365,8 @@ test_month_names (void) - TEST_DATE ( 1, 4, 2018, "%Y m. %OB", "2018 m. balandis"); - TEST_DATE ( 1, 5, 2018, "%Y m. %OB", "2018 m. gegužė"); - TEST_DATE ( 1, 6, 2018, "%Y m. %OB", "2018 m. birželis"); -- TEST_DATE (17, 7, 2018, "%Y m. %b %e d.", "2018 m. Lie 17 d."); -- TEST_DATE ( 1, 8, 2018, "%Y m. %Ob", "2018 m. Rgp"); -+ TEST_DATE (17, 7, 2018, "%Y m. %b %e d.", "2018 m. Liep. 17 d."); -+ TEST_DATE ( 1, 8, 2018, "%Y m. %Ob", "2018 m. rugp."); - } - else - g_test_skip ("locale lt_LT not available, skipping Lithuanian month names test");
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +1 -1
@@ -1,4 +1,4 @@ -From 8326961841f4d16c7239e747de11e3817c35cfd2 Mon Sep 17 00:00:00 2001 +From 43967e85b7a87f9c2e780504ef30f4c9bf56f8f5 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb +4 -4
@@ -8,15 +8,15 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://configure-libtool.patch \ file://run-ptest \ file://uclibc_musl_translation.patch \ - file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ file://Enable-more-tests-while-cross-compiling.patch \ + file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ file://0001-Do-not-ignore-return-value-of-write.patch \ file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ - file://date-lt.patch \ + file://0001-Revert-Use-absolute-paths-in-pkg-config-files.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[md5sum] = "9b5d21c802f55bf37171c4fbfe7d32d1" -SRC_URI[sha256sum] = "c0f4ce0730b4f95c47b711613b5406a887c2ee13ea6d25930d72a4fa7fdb77f6" +SRC_URI[md5sum] = "8058c7bde846dcffe5fa453eca366d73" +SRC_URI[sha256sum] = "8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481"
meta/recipes-core/glib-2.0/glib.inc +1 -4
@@ -142,8 +142,6 @@ RDEPENDS_${PN}-ptest += "\ shared-mime-info \ " -# When https://gitlab.gnome.org/GNOME/glib/issues/1343 is -# fixed add locale-base-pl-pl RDEPENDS_${PN}-ptest_append_libc-glibc = "\ glibc-gconv-utf-16 \ glibc-charmap-utf-8 \
@@ -167,6 +165,5 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\ locale-base-fr-fr \ locale-base-es-es \ locale-base-en-gb \ + locale-base-pl-pl \ " - -INSANE_SKIP_${PN}-ptest += "libdir"
Signature · 1 line
2.17.1