diff options
| author | Seungha Yang <seungha@centricular.com> | 2024-07-09 21:31:58 +0900 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2024-07-09 21:18:17 +0000 |
| commit | be3b873e1038a5073bf9febcb3676c37655828c8 (patch) | |
| tree | fbbf2d742db543d1e22fd49e16731525f8be36e4 | |
| parent | 12fdd2342097b5e350781a4811d9adad361ba22e (diff) | |
glib: Fix Windows build
With GCC
../glib/gspawn-win32.c:548:33: error:
passing argument 2 of '_spawnve' from incompatible pointer type
And MSVC
../glib/gspawn-win32.c(548): warning C4133: 'function':
incompatible types - from 'wchar_t *' to 'const char *'
Applying upstream MR https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3237
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1509>
| -rw-r--r-- | recipes/glib.recipe | 5 | ||||
| -rw-r--r-- | recipes/glib/0001-Fix-safe_wspawnve-define.patch | 25 |
2 files changed, 29 insertions, 1 deletions
diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 142827fa..5c743674 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -54,7 +54,10 @@ class Recipe(recipe.Recipe): f'{name}/0009-glib-gthread-posix-Block-futex_time64-usage-on-Andro.patch', f'{name}/0010-glib-gthread-posix-Fix-name-of-the-futex_time64-2-te.patch', f'{name}/0011-glib-gthread-posix-Use-the-config.h-macros-to-detect.patch', - f'{name}/0012-glib-gthread-posix-Fix-missing-saved_errno-variable-.patch' + f'{name}/0012-glib-gthread-posix-Fix-missing-saved_errno-variable-.patch', + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3237 + # backported into 2.74.6 + 'glib/0001-Fix-safe_wspawnve-define.patch', ] files_libs = [ diff --git a/recipes/glib/0001-Fix-safe_wspawnve-define.patch b/recipes/glib/0001-Fix-safe_wspawnve-define.patch new file mode 100644 index 00000000..12ab13e4 --- /dev/null +++ b/recipes/glib/0001-Fix-safe_wspawnve-define.patch @@ -0,0 +1,25 @@ +From 4c4448debd314c8069d7c6af53144aaab089ffd2 Mon Sep 17 00:00:00 2001 +From: Hernan Martinez <hernan.c.martinez@gmail.com> +Date: Thu, 26 Jan 2023 10:23:41 +0000 +Subject: [PATCH] Fix safe_wspawnve #define + +--- + glib/gspawn-win32.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c +index 665d7313e..e8bc10e9a 100644 +--- a/glib/gspawn-win32.c ++++ b/glib/gspawn-win32.c +@@ -163,7 +163,7 @@ safe_wspawnvpe (int _Mode, + + #else + +-#define safe_wspawnve _spawnve ++#define safe_wspawnve _wspawnve + #define safe_wspawnvpe _wspawnvpe + + #endif /* _UCRT */ +-- +2.44.0.windows.1 + |