<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fad1ef058d26d57f289951a3427f42d0e0498fd5">https://github.com/macports/macports-ports/commit/fad1ef058d26d57f289951a3427f42d0e0498fd5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fad1ef058d26d57f289951a3427f42d0e0498fd5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jan 18 23:11:31 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> pango, pango-devel: Fix crash
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix a crash in pango_layout_get_pixel_extents.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57249
</span>---
x11/pango-devel/Portfile | 5 +-
.../fix-pango_layout_get_pixel_extents-crash.patch | 105 +++++++++++++++++++++
x11/pango/Portfile | 5 +-
.../fix-pango_layout_get_pixel_extents-crash.patch | 105 +++++++++++++++++++++
4 files changed, 218 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pango-devel/Portfile b/x11/pango-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 66fd395..8a8f030 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/pango-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pango-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,6 +10,7 @@ name pango-devel
</span> conflicts pango
set my_name pango
version 1.42.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 e91880e0e9a459bbc2c280ac747ab31f80352000 \
sha256 1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d \
size 833876
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +44,8 @@ depends_lib \
</span> port:fribidi \
port:harfbuzz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append fix-pango_layout_get_pixel_extents-crash.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --enable-static \
--disable-silent-rules \
--without-x
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +81,7 @@ variant x11 {
</span>
default_variants +x11
if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # When not on OS X, don't allow X11 support to be disabled, since it is the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # When not on macOS, don't allow X11 support to be disabled, since it is the
</span> # only available option.
variant_set x11
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pango-devel/files/fix-pango_layout_get_pixel_extents-crash.patch b/x11/pango-devel/files/fix-pango_layout_get_pixel_extents-crash.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..11e0bf8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pango-devel/files/fix-pango_layout_get_pixel_extents-crash.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,105 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix a crash in pango_layout_get_pixel_extents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/pango/issues/352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/pango/commit/589af36865e5277f64b033d501741b6d365d01ce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pango/pangocoretext-fontmap.c.orig 2018-08-05 21:47:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pango/pangocoretext-fontmap.c 2020-01-18 23:07:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1524,6 +1524,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GPtrArray *fonts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GPtrArray *coverages;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint real_font_count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct _PangoCoreTextFontsetClass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1554,10 +1555,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar **family_names;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const gchar *family;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar *name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GPtrArray *fonts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fonts = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fontset = g_object_new (PANGO_TYPE_CORE_TEXT_FONTSET, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ family = pango_font_description_get_family (description);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ family_names = g_strsplit (family ? family : "", ",", -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1584,7 +1584,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (font)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_ptr_array_add (fonts, font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_ptr_array_add (fontset->fonts, font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (best_font == NULL) best_font = font;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1595,17 +1595,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!best_font)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_ptr_array_free (fonts, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_object_unref (fontset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Create a font set with best font */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fontset = g_object_new (PANGO_TYPE_CORE_TEXT_FONTSET, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontset->key = pango_core_text_fontset_key_copy (key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontset->orig_description = pango_font_description_copy (description);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fontset->fonts = fonts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fontset->coverages = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fontset->real_font_count = fontset->fonts->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Add the cascade list for this language */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1639,9 +1637,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontset->cascade_list = CTFontCopyDefaultCascadeList (pango_core_text_font_get_ctfont (best_font));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* length of cascade list + 1 for the "real" font at the front */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_ptr_array_set_size (fontset->fonts, CFArrayGetCount (fontset->cascade_list) + fonts->len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_ptr_array_set_size (fontset->coverages, CFArrayGetCount (fontset->cascade_list) + fonts->len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* length of cascade list + real_font_count for the "real" fonts at the front */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_ptr_array_set_size (fontset->fonts, CFArrayGetCount (fontset->cascade_list) + fontset->real_font_count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_ptr_array_set_size (fontset->coverages, CFArrayGetCount (fontset->cascade_list) + fontset->real_font_count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return fontset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1670,8 +1668,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_core_text_fontset_get_font_at (PangoCoreTextFontset *ctfontset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* The first font is loaded as soon as the fontset is created */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (i == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* These fonts are loaded as soon as the fontset is created */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (i < ctfontset->real_font_count)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return g_ptr_array_index (ctfontset->fonts, i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (i >= ctfontset->fonts->len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1679,7 +1677,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_ptr_array_index (ctfontset->fonts, i) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CTFontDescriptorRef ctdescriptor = CFArrayGetValueAtIndex (ctfontset->cascade_list, i - 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CTFontDescriptorRef ctdescriptor = CFArrayGetValueAtIndex (ctfontset->cascade_list, i - ctfontset->real_font_count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PangoFont *font = pango_core_text_fontset_load_font (ctfontset, ctdescriptor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_ptr_array_index (ctfontset->fonts, i) = font;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_ptr_array_index (ctfontset->coverages, i) = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1708,6 +1706,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctfontset->cascade_list = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctfontset->fonts = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctfontset->coverages = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ctfontset->real_font_count = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1732,7 +1731,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_ptr_array_free (ctfontset->coverages, TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFRelease (ctfontset->cascade_list);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ctfontset->cascade_list)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFRelease (ctfontset->cascade_list);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_font_description_free (ctfontset->orig_description);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pango/Portfile b/x11/pango/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a55ece..9b551d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/pango/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pango/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,6 +11,7 @@ conflicts pango-devel
</span> set my_name pango
epoch 1
version 1.42.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 e91880e0e9a459bbc2c280ac747ab31f80352000 \
sha256 1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d \
size 833876
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +45,8 @@ depends_lib \
</span> port:fribidi \
port:harfbuzz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append fix-pango_layout_get_pixel_extents-crash.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --enable-static \
--disable-silent-rules \
--without-x
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +82,7 @@ variant x11 {
</span>
default_variants +x11
if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # When not on OS X, don't allow X11 support to be disabled, since it is the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # When not on macOS, don't allow X11 support to be disabled, since it is the
</span> # only available option.
variant_set x11
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pango/files/fix-pango_layout_get_pixel_extents-crash.patch b/x11/pango/files/fix-pango_layout_get_pixel_extents-crash.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..11e0bf8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pango/files/fix-pango_layout_get_pixel_extents-crash.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,105 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix a crash in pango_layout_get_pixel_extents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/pango/issues/352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/pango/commit/589af36865e5277f64b033d501741b6d365d01ce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pango/pangocoretext-fontmap.c.orig 2018-08-05 21:47:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pango/pangocoretext-fontmap.c 2020-01-18 23:07:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1524,6 +1524,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GPtrArray *fonts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GPtrArray *coverages;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint real_font_count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct _PangoCoreTextFontsetClass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1554,10 +1555,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar **family_names;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const gchar *family;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar *name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GPtrArray *fonts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fonts = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fontset = g_object_new (PANGO_TYPE_CORE_TEXT_FONTSET, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ family = pango_font_description_get_family (description);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ family_names = g_strsplit (family ? family : "", ",", -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1584,7 +1584,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (font)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_ptr_array_add (fonts, font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_ptr_array_add (fontset->fonts, font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (best_font == NULL) best_font = font;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1595,17 +1595,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!best_font)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_ptr_array_free (fonts, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_object_unref (fontset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Create a font set with best font */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fontset = g_object_new (PANGO_TYPE_CORE_TEXT_FONTSET, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontset->key = pango_core_text_fontset_key_copy (key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontset->orig_description = pango_font_description_copy (description);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fontset->fonts = fonts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fontset->coverages = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fontset->real_font_count = fontset->fonts->len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Add the cascade list for this language */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1639,9 +1637,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fontset->cascade_list = CTFontCopyDefaultCascadeList (pango_core_text_font_get_ctfont (best_font));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* length of cascade list + 1 for the "real" font at the front */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_ptr_array_set_size (fontset->fonts, CFArrayGetCount (fontset->cascade_list) + fonts->len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_ptr_array_set_size (fontset->coverages, CFArrayGetCount (fontset->cascade_list) + fonts->len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* length of cascade list + real_font_count for the "real" fonts at the front */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_ptr_array_set_size (fontset->fonts, CFArrayGetCount (fontset->cascade_list) + fontset->real_font_count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_ptr_array_set_size (fontset->coverages, CFArrayGetCount (fontset->cascade_list) + fontset->real_font_count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return fontset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1670,8 +1668,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_core_text_fontset_get_font_at (PangoCoreTextFontset *ctfontset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* The first font is loaded as soon as the fontset is created */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (i == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* These fonts are loaded as soon as the fontset is created */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (i < ctfontset->real_font_count)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return g_ptr_array_index (ctfontset->fonts, i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (i >= ctfontset->fonts->len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1679,7 +1677,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_ptr_array_index (ctfontset->fonts, i) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CTFontDescriptorRef ctdescriptor = CFArrayGetValueAtIndex (ctfontset->cascade_list, i - 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CTFontDescriptorRef ctdescriptor = CFArrayGetValueAtIndex (ctfontset->cascade_list, i - ctfontset->real_font_count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PangoFont *font = pango_core_text_fontset_load_font (ctfontset, ctdescriptor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_ptr_array_index (ctfontset->fonts, i) = font;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_ptr_array_index (ctfontset->coverages, i) = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1708,6 +1706,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctfontset->cascade_list = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctfontset->fonts = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctfontset->coverages = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ctfontset->real_font_count = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1732,7 +1731,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_ptr_array_free (ctfontset->coverages, TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFRelease (ctfontset->cascade_list);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ctfontset->cascade_list)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFRelease (ctfontset->cascade_list);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_font_description_free (ctfontset->orig_description);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>