diff mbox series

[01/77] glib-2.0: upgrade 2.74.3 -> 2.74.4

Message ID 20230104110548.2537259-1-alex@linutronix.de
State Accepted, archived
Commit f9e3169fea23a7300e8cab2862610c776de4ead3
Headers show
Series [01/77] glib-2.0: upgrade 2.74.3 -> 2.74.4 | expand

Commit Message

Alexander Kanavin Jan. 4, 2023, 11:04 a.m. UTC 
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../glib-2.0/glib-2.0/fix-errno.patch         | 31 +++++++++++++++++++
 .../glib-2.0/glib-2.0/relocate-modules.patch  |  4 +--
 ...{glib-2.0_2.74.3.bb => glib-2.0_2.74.4.bb} |  3 +-
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.74.3.bb => glib-2.0_2.74.4.bb} (95%)
diff mbox series

Patch

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch
new file mode 100644
index 0000000000..144fe8bbd8
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch
@@ -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
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 7723ac6672..168dc73290 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 0da0b608fdbb144c39225233cbdd89995b76904b Mon Sep 17 00:00:00 2001
+From 2adfd458507c8c832955d6ffb9408d6c574b94f6 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 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 <jussi.kukkonen@intel.com>
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index f5dbb4555..c926e77a8 100644
+index f5dbb45..c926e77 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
 @@ -58,6 +58,8 @@
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.74.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.74.4.bb
similarity index 95%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.74.3.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.74.4.bb
index 8f66fd9581..e5279e946c 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.74.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.74.4.bb
@@ -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://cpp-null.patch \
            file://cpp-null2.patch \
+           file://fix-errno.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
 # build (using siteinfo) and add them to EXTRA_OEMESON.