mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

glib-2.0: upgrade 2.74.3 -> 2.74.4

Browse Source 
(From OE-Core rev: f9e3169fea23a7300e8cab2862610c776de4ead3)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-01-04 12:04:32 +01:00
committed by Richard Purdie
parent f544333715
commit 8f2f684586
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch
+31
View File
@@ -0,0 +1,31 @@
From 6626765a79f125cf0ec9cdaefa51ceef718d41e7 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Tue, 20 Dec 2022 17:10:41 -0600
Subject: [PATCH] gthread-posix: need to #include <errno.h>
a79c6af23eff5ee978db62e048828c9a992a1261 uses errno without the required
header.
(cherry picked from commit 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd)
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/6626765a79f125cf0ec9cdaefa51ceef718d41e7]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
glib/gthreadprivate.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h
index 6eaf422753..f34368a7c2 100644
--- a/glib/gthreadprivate.h
+++ b/glib/gthreadprivate.h
@@ -41,6 +41,7 @@ struct _GRealThread
/* system thread implementation (gthread-posix.c, gthread-win32.c) */
#if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64)
+#include <errno.h>
#include <linux/futex.h>
#include <sys/syscall.h>
#include <unistd.h>
--
GitLab
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+2 -2
View File
@@ -1,4 +1,4 @@
From 0da0b608fdbb144c39225233cbdd89995b76904b Mon Sep 17 00:00:00 2001 From 2adfd458507c8c832955d6ffb9408d6c574b94f6 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com> From: Ross Burton <ross.burton@intel.com>
Date: Fri, 11 Mar 2016 15:35:55 +0000 Date: Fri, 11 Mar 2016 15:35:55 +0000
Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
@@ -19,7 +19,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
1 file changed, 11 insertions(+), 1 deletion(-) 1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gio/giomodule.c b/gio/giomodule.c diff --git a/gio/giomodule.c b/gio/giomodule.c
index f5dbb4555..c926e77a8 100644 index f5dbb45..c926e77 100644
--- a/gio/giomodule.c --- a/gio/giomodule.c
+++ b/gio/giomodule.c +++ b/gio/giomodule.c
@@ -58,6 +58,8 @@ @@ -58,6 +58,8 @@
meta/recipes-core/glib-2.0/glib-2.0_2.74.3.bb → meta/recipes-core/glib-2.0/glib-2.0_2.74.4.bb
+2 -1
View File
@@ -18,10 +18,11 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch \ file://0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch \
file://cpp-null.patch \ file://cpp-null.patch \
file://cpp-null2.patch \ file://cpp-null2.patch \
file://fix-errno.patch \
" "
SRC_URI:append:class-native = " file://relocate-modules.patch" SRC_URI:append:class-native = " file://relocate-modules.patch"
SRC_URI[sha256sum] = "e9bc41ecd9690d9bc6a970cc7380119b828e5b6a4b16c393c638b3dc2b87cbcb" SRC_URI[sha256sum] = "0e82da5ea129b4444227c7e4a9e598f7288d1994bf63f129c44b90cfd2432172"
# Find any meson cross files in FILESPATH that are relevant for the current # Find any meson cross files in FILESPATH that are relevant for the current
# build (using siteinfo) and add them to EXTRA_OEMESON. # build (using siteinfo) and add them to EXTRA_OEMESON.