diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-08-25 13:37:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-26 08:07:55 +0100 |
commit | e617435893faf8bbef134f5cc17265559e3e9270 (patch) | |
tree | aa1a9b98f6a4782251ba3a84c9f7dac7d0f26bdf /meta/recipes-core/glib-2.0 | |
parent | 3ae0b7c128f6dd2c039c86770bace8acde17bfe8 (diff) | |
download | poky-e617435893faf8bbef134f5cc17265559e3e9270.tar.gz |
glib-2.0: upgrade 2.68.3 -> 2.68.4
Drop merged 0001-correctly-use-3-parameters-for-close_range.patch
(From OE-Core rev: 592335a75dbf28d2e3c5f0c62ad96d38420ae1f9)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch | 29 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 2 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.68.4.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb) | 3 |
3 files changed, 2 insertions, 32 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch deleted file mode 100644 index 6ff25fc535..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 8 Jul 2021 17:26:43 -0700 | ||
4 | Subject: [PATCH] correctly use 3 parameters for close_range | ||
5 | |||
6 | libc implementation has 3 parameter e.g. | ||
7 | https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2180] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | glib/gspawn.c | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/glib/gspawn.c b/glib/gspawn.c | ||
16 | index 899647c2f..3073a10a4 100644 | ||
17 | --- a/glib/gspawn.c | ||
18 | +++ b/glib/gspawn.c | ||
19 | @@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd) | ||
20 | * | ||
21 | * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, | ||
22 | * fall back to safe_fdwalk(). */ | ||
23 | - if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) | ||
24 | + if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) | ||
25 | #endif /* HAVE_CLOSE_RANGE */ | ||
26 | (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); | ||
27 | #endif | ||
28 | -- | ||
29 | 2.32.0 | ||
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 f34f30bb3c..846c8d62b6 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 @@ | |||
1 | From e56cdb8c343dd6a6ed3b10bd54e353d633ad6158 Mon Sep 17 00:00:00 2001 | 1 | From dac2bdeea38388e069412aa27eff8f1eff0440e5 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 | 3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 |
4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds | 4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.68.4.bb index c71dc81202..cd789de3c0 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.68.4.bb | |||
@@ -18,11 +18,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
18 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ | 18 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ |
19 | file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ | 19 | file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ |
20 | file://time-test.patch \ | 20 | file://time-test.patch \ |
21 | file://0001-correctly-use-3-parameters-for-close_range.patch \ | ||
22 | " | 21 | " |
23 | SRC_URI:append:class-native = " file://relocate-modules.patch" | 22 | SRC_URI:append:class-native = " file://relocate-modules.patch" |
24 | 23 | ||
25 | SRC_URI[sha256sum] = "e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138" | 24 | SRC_URI[sha256sum] = "62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b" |
26 | 25 | ||
27 | # Find any meson cross files in FILESPATH that are relevant for the current | 26 | # Find any meson cross files in FILESPATH that are relevant for the current |
28 | # build (using siteinfo) and add them to EXTRA_OEMESON. | 27 | # build (using siteinfo) and add them to EXTRA_OEMESON. |