mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-16 21:36:35 +00:00
e0014ef4fe
These patches are taken from upstream, and they fix compile failures with latest clang. These can be dropped when upgrading these wraps. This is currently causing a warning because we do not require the version of meson that ships with this feature: 0.63.0. The version has not been bumped because older Meson versions gracefully ignore the wrap field, this fix is optional and only needed on macOS, and 0.63.0 is a very new release with a bug that partially breaks this feature: https://github.com/mesonbuild/meson/pull/10602 We can consider bumping the requirement once 0.63.1 is released. Also switch from git to tarballs, no reason to use git here anymore. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2761>
30 lines
1 KiB
Diff
30 lines
1 KiB
Diff
From 9093ffd69850b630622a3fc8dcf09c45c51ae2f9 Mon Sep 17 00:00:00 2001
|
|
From: John Ralls <jralls@ceridwen.us>
|
|
Date: Tue, 22 Mar 2022 12:09:09 -0700
|
|
Subject: [PATCH] Coretext: fix clang build failure.
|
|
|
|
Recent versions of clang notice that pango_core_text_fontset_load_font's
|
|
`key` local variable isn't used and errors out. Remove it.
|
|
---
|
|
pango/pangocoretext-fontmap.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
|
|
index 40e62eed..e090bfc4 100644
|
|
--- a/pango/pangocoretext-fontmap.c
|
|
+++ b/pango/pangocoretext-fontmap.c
|
|
@@ -1696,11 +1696,8 @@ static PangoFont *
|
|
pango_core_text_fontset_load_font (PangoCoreTextFontset *ctfontset,
|
|
CTFontDescriptorRef ctdescriptor)
|
|
{
|
|
- PangoCoreTextFontsetKey *key;
|
|
PangoCoreTextFont *font;
|
|
|
|
- key = pango_core_text_fontset_get_key (ctfontset);
|
|
-
|
|
/* For now, we will default the fallbacks to not have synthetic italic,
|
|
* in the future this may be improved.
|
|
*/
|
|
--
|
|
2.32.1 (Apple Git-133)
|
|
|