>From 2c1c8e3b6531cd3e4f5e69825f9cbf47e6e91f2a Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sat, 15 May 2021 03:48:05 +0000 Subject: [PATCH] glib-2.0: upgrade 2.68.1 -> 2.68.2 --- .../glib-2.0/glib-2.0/relocate-modules.patch | 6 +++--- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 9 --------- .../glib-2.0/{glib-2.0_2.68.1.bb => glib-2.0_2.68.2.bb} | 4 ++-- 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/run-ptest rename meta/recipes-core/glib-2.0/{glib-2.0_2.68.1.bb => glib-2.0_2.68.2.bb} (94%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 7cf89c8718..00d4b57164 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From ff790dd7086e28896f8e7630135f756cc6f06c80 Mon Sep 17 00:00:00 2001 +From dbf7c0d0153519d7563059f6b84a691a5d3ed7ea Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds @@ -19,7 +19,7 @@ Signed-off-by: Jussi Kukkonen 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index ca1daf2..954a250 100644 +index a2909a8..1f4ab82 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -51,6 +51,8 @@ @@ -31,7 +31,7 @@ index ca1daf2..954a250 100644 #endif #include -@@ -1212,7 +1214,15 @@ get_gio_module_dir (void) +@@ -1213,7 +1215,15 @@ get_gio_module_dir (void) NULL); g_free (install_dir); #else diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest deleted file mode 100644 index 7a231b514b..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -set -eux -if id -u glib2-test; then - userdel glib2-test -fi -useradd glib2-test -su glib2-test -c 'gnome-desktop-testing-runner glib' -userdel glib2-test diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.68.2.bb similarity index 94% rename from meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.68.2.bb index accc2cada2..8ef767e3fa 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.68.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.68.2.bb @@ -5,7 +5,6 @@ PE = "1" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ - file://run-ptest \ file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ file://Enable-more-tests-while-cross-compiling.patch \ file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ @@ -17,10 +16,11 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ + file://relocate-modules.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333" +SRC_URI[sha256sum] = "ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. -- 2.27.0