summaryrefslogtreecommitdiffstats
path: root/packaging/macos/modulesets/patches/pango-coretext-fix-clang-build-failure.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 18:24:48 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 18:24:48 +0000
commitcca66b9ec4e494c1d919bff0f71a820d8afab1fa (patch)
tree146f39ded1c938019e1ed42d30923c2ac9e86789 /packaging/macos/modulesets/patches/pango-coretext-fix-clang-build-failure.patch
parentInitial commit. (diff)
downloadinkscape-cca66b9ec4e494c1d919bff0f71a820d8afab1fa.tar.xz
inkscape-cca66b9ec4e494c1d919bff0f71a820d8afab1fa.zip
Adding upstream version 1.2.2.upstream/1.2.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'packaging/macos/modulesets/patches/pango-coretext-fix-clang-build-failure.patch')
-rw-r--r--packaging/macos/modulesets/patches/pango-coretext-fix-clang-build-failure.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/packaging/macos/modulesets/patches/pango-coretext-fix-clang-build-failure.patch b/packaging/macos/modulesets/patches/pango-coretext-fix-clang-build-failure.patch
new file mode 100644
index 0000000..8476d50
--- /dev/null
+++ b/packaging/macos/modulesets/patches/pango-coretext-fix-clang-build-failure.patch
@@ -0,0 +1,30 @@
+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.0 (Apple Git-132)
+