diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2023-01-13 19:04:15 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2023-01-13 19:25:42 +0000 |
| commit | 9df9cc2afb00230bf145846f08964cd10d2e5e14 (patch) | |
| tree | 2c454c5a64a3dd252f815987b650f5dbcbfd0341 /recipes | |
| parent | a318984c53bbd203eba2f9e48a0d9f9b0f7440e2 (diff) | |
glib: update to 2.74.4
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1071>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/glib.recipe | 6 | ||||
| -rw-r--r-- | recipes/glib/0001-gthread-posix-need-to-include-errno.h.patch | 29 |
2 files changed, 33 insertions, 2 deletions
diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 971af209..87dcf4d1 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -22,10 +22,10 @@ GLIB_CONFIG_UNVERSAL='''\ class Recipe(recipe.Recipe): name = 'glib' - version = '2.74.3' + version = '2.74.4' stype = SourceType.TARBALL url = 'gnome://' - tarball_checksum = 'e9bc41ecd9690d9bc6a970cc7380119b828e5b6a4b16c393c638b3dc2b87cbcb' + tarball_checksum = '0e82da5ea129b4444227c7e4a9e598f7288d1994bf63f129c44b90cfd2432172' licenses = [License.LGPLv2Plus] btype = BuildType.MESON meson_options = {'libmount': 'disabled', 'dtrace': 'false', 'iconv': 'auto'} @@ -44,6 +44,8 @@ class Recipe(recipe.Recipe): 'glib/0001-gtypes.h-workaround-for-g_uint64_checked_mul-issue-w.patch', # TODO upstreaming 'glib/0001-gio-fix-duplicate-g_trace_-symbols-in-static-libs-wi.patch', + # From post-2.74.4 glib upstream (remove when bumping version) + 'glib/0001-gthread-posix-need-to-include-errno.h.patch', ] files_libs = [ diff --git a/recipes/glib/0001-gthread-posix-need-to-include-errno.h.patch b/recipes/glib/0001-gthread-posix-need-to-include-errno.h.patch new file mode 100644 index 00000000..c16f2149 --- /dev/null +++ b/recipes/glib/0001-gthread-posix-need-to-include-errno.h.patch @@ -0,0 +1,29 @@ +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) +--- + glib/gthreadprivate.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h +index 6eaf42275..f34368a7c 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> +-- +2.38.1 + |