Signed-off-by: Alexander Kanavin <a...@linutronix.de>
---
.../glib-2.0/glib-2.0/fix-errno.patch | 31 -------------------
.../glib-2.0/glib-2.0/relocate-modules.patch | 2 +-
...{glib-2.0_2.74.4.bb => glib-2.0_2.74.5.bb} | 3 +-
3 files changed, 2 insertions(+), 34 deletions(-)
delete 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.4.bb => glib-2.0_2.74.5.bb}
(95%)
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
deleted file mode 100644
index 144fe8bbd8..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6626765a79f125cf0ec9cdaefa51ceef718d41e7 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanz...@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 <a...@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 168dc73290..ae6881b61e 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 2adfd458507c8c832955d6ffb9408d6c574b94f6 Mon Sep 17 00:00:00 2001
+From a3cdf17643bf33d532ec269913974195e136b7fc Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.bur...@intel.com>
Date: Fri, 11 Mar 2016 15:35:55 +0000
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.74.4.bb
b/meta/recipes-core/glib-2.0/glib-2.0_2.74.5.bb
similarity index 95%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.74.4.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.74.5.bb
index e5279e946c..d54f077cb0 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.74.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.74.5.bb
@@ -18,11 +18,10 @@ 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] =
"0e82da5ea129b4444227c7e4a9e598f7288d1994bf63f129c44b90cfd2432172"
+SRC_URI[sha256sum] =
"ceba83a5999ceb31a4c4fc9921207cb9ffffd2ab1d6ec03c162d3f608a5c14c8"
# Find any meson cross files in FILESPATH that are relevant for the current
# build (using siteinfo) and add them to EXTRA_OEMESON.
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#176850):
https://lists.openembedded.org/g/openembedded-core/message/176850
Mute This Topic: https://lists.openembedded.org/mt/96825762/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
