suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mac OS X: incorporate Pango repair for Yosemite

Browse Source 
Pango 1.36.6 fixes the problem, so update native libraries
and the Coretext patch.
This commit is contained in:
Matthew Flatt 2014-08-27 19:03:58 -06:00
parent 768b93be82
commit 76f1ebded9
3 changed files with 74 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native-pkgs

@ -1 +1 @@
Subproject commit b01b7e26d1f85ab9fe122add1f52644c6a656123 Subproject commit 2648702ac3b6bb553573d330ac8ad6e0a00251b7

2
racket/src/native-libs/README.txt
View File

@ -30,7 +30,7 @@ versions:
harfbuzz-0.9.27 harfbuzz-0.9.27
fontconfig-2.11.1 fontconfig-2.11.1
freetype-2.5.3 freetype-2.5.3
pango-1.36.3 pango-1.36.6 (current Windows and PPC binaries are 1.36.3)
poppler-0.24.5 poppler-0.24.5
mpfr-3.1.2 mpfr-3.1.2
gmp-5.1.3 gmp-5.1.3

117
racket/src/native-libs/patches/coretext.patch
View File

@ -1,20 +1,7 @@
diff -r -u old/pango-1.36.3/pango/pangocoretext.c new/pango-1.36.3/pango/pangocoretext.c diff -r -u old/pango-1.36.6/modules/basic/basic-coretext.c new/pango-1.36.6/modules/basic/basic-coretext.c
--- old/pango-1.36.3/pango/pangocoretext.c 2014-03-05 21:33:55.000000000 -0700 --- old/pango-1.36.6/modules/basic/basic-coretext.c 2014-08-16 07:15:21.000000000 -0600
+++ new/pango-1.36.3/pango/pangocoretext.c 2014-04-14 18:25:38.000000000 -0600 +++ new/pango-1.36.6/modules/basic/basic-coretext.c 2014-08-27 18:47:22.000000000 -0600
@@ -97,8 +97,7 @@ @@ -56,7 +56,8 @@
bitmap = CFCharacterSetCreateBitmapRepresentation (kCFAllocatorDefault,
charset);
- /* We only handle the BMP plane */
- length = MIN (CFDataGetLength (bitmap), 8192);
+ length = CFDataGetLength (bitmap);
ptr = CFDataGetBytePtr (bitmap);
/* FIXME: can and should this be done more efficiently? */
diff -r -u old/pango-1.36.3/modules/basic/basic-coretext.c new/pango-1.36.3/modules/basic/basic-coretext.c
--- old/pango-1.36.3/modules/basic/basic-coretext.c 2014-03-05 21:33:55.000000000 -0700
+++ new/pango-1.36.3/modules/basic/basic-coretext.c 2014-04-14 17:50:38.000000000 -0600
@@ -55,7 +55,8 @@
PangoGlyphString *glyphs, PangoGlyphString *glyphs,
int i, int i,
int offset, int offset,
@ -24,7 +11,7 @@ diff -r -u old/pango-1.36.3/modules/basic/basic-coretext.c new/pango-1.36.3/modu
{ {
PangoRectangle logical_rect; PangoRectangle logical_rect;
@@ -65,8 +66,13 @@ @@ -66,8 +67,13 @@
glyphs->glyphs[i].geometry.y_offset = 0; glyphs->glyphs[i].geometry.y_offset = 0;
glyphs->log_clusters[i] = offset; glyphs->log_clusters[i] = offset;
@ -40,23 +27,42 @@ diff -r -u old/pango-1.36.3/modules/basic/basic-coretext.c new/pango-1.36.3/modu
} }
@@ -92,6 +98,7 @@ @@ -94,6 +100,8 @@
CTRunRef current_run;
CFIndex *current_indices; CFIndex *current_indices;
const CGGlyph *current_cgglyphs; const CGGlyph *current_cgglyphs;
CGGlyph *current_cgglyphs_buffer;
+ const CGSize *current_cgadvs; + const CGSize *current_cgadvs;
+ CGSize *current_cgadvs_buffer;
CTRunStatus current_run_status; CTRunStatus current_run_status;
}; };
@@ -118,6 +125,7 @@ @@ -106,6 +114,9 @@
iter->current_run = CFArrayGetValueAtIndex (iter->runs, run_number); if (iter->current_cgglyphs_buffer)
iter->current_run_status = CTRunGetStatus (iter->current_run); free (iter->current_cgglyphs_buffer);
iter->current_cgglyphs = CTRunGetGlyphsPtr (iter->current_run); iter->current_cgglyphs_buffer = NULL;
+ iter->current_cgadvs = CTRunGetAdvancesPtr (iter->current_run); + if (iter->current_cgadvs_buffer)
+ free (iter->current_cgadvs_buffer);
+ iter->current_cgadvs_buffer = NULL;
if (iter->current_indices)
free (iter->current_indices);
iter->current_indices = NULL;
@@ -133,6 +144,15 @@
iter->current_cgglyphs = iter->current_cgglyphs_buffer;
}
ct_glyph_count = CTRunGetGlyphCount (iter->current_run); + iter->current_cgadvs = CTRunGetAdvancesPtr (iter->current_run);
iter->current_indices = malloc (sizeof (CFIndex *) * ct_glyph_count); + if (!iter->current_cgadvs)
@@ -166,7 +174,17 @@ + {
+ iter->current_cgadvs_buffer = (CGSize *)malloc (sizeof (CGSize) * ct_glyph_count);
+ CTRunGetAdvances (iter->current_run, CFRangeMake (0, ct_glyph_count),
+ iter->current_cgadvs_buffer);
+ iter->current_cgadvs = iter->current_cgadvs_buffer;
+ }
+
iter->current_indices = malloc (sizeof (CFIndex) * ct_glyph_count);
CTRunGetStringIndices (iter->current_run, CFRangeMake (0, ct_glyph_count),
iter->current_indices);
@@ -179,7 +199,17 @@
static gunichar static gunichar
run_iterator_get_character (struct RunIterator *iter) run_iterator_get_character (struct RunIterator *iter)
{ {
@ -75,7 +81,7 @@ diff -r -u old/pango-1.36.3/modules/basic/basic-coretext.c new/pango-1.36.3/modu
} }
static CGGlyph static CGGlyph
@@ -175,6 +193,12 @@ @@ -188,6 +218,12 @@
return iter->current_cgglyphs[iter->ct_i]; return iter->current_cgglyphs[iter->ct_i];
} }
@ -88,7 +94,15 @@ diff -r -u old/pango-1.36.3/modules/basic/basic-coretext.c new/pango-1.36.3/modu
static CFIndex static CFIndex
run_iterator_get_index (struct RunIterator *iter) run_iterator_get_index (struct RunIterator *iter)
{ {
@@ -297,6 +321,7 @@ @@ -218,6 +254,7 @@
iter->current_indices = NULL;
iter->current_cgglyphs = NULL;
iter->current_cgglyphs_buffer = NULL;
+ iter->current_cgadvs_buffer = NULL;
/* Create CTLine */
attributes = CFDictionaryCreate (kCFAllocatorDefault,
@@ -311,6 +348,7 @@
{ {
CFIndex index; CFIndex index;
CGGlyph cgglyph; CGGlyph cgglyph;
@ -96,7 +110,7 @@ diff -r -u old/pango-1.36.3/modules/basic/basic-coretext.c new/pango-1.36.3/modu
gunichar wc; gunichar wc;
}; };
@@ -338,6 +363,7 @@ @@ -352,6 +390,7 @@
gi = g_slice_new (struct GlyphInfo); gi = g_slice_new (struct GlyphInfo);
gi->index = run_iterator_get_index (&riter); gi->index = run_iterator_get_index (&riter);
gi->cgglyph = run_iterator_get_cgglyph (&riter); gi->cgglyph = run_iterator_get_cgglyph (&riter);
@ -104,7 +118,7 @@ diff -r -u old/pango-1.36.3/modules/basic/basic-coretext.c new/pango-1.36.3/modu
gi->wc = run_iterator_get_character (&riter); gi->wc = run_iterator_get_character (&riter);
glyph_list = g_slist_prepend (glyph_list, gi); glyph_list = g_slist_prepend (glyph_list, gi);
@@ -426,7 +452,7 @@ @@ -440,7 +479,7 @@
if (gi == NULL || gi->index > gs_i) if (gi == NULL || gi->index > gs_i)
{ {
/* gs_i is behind, insert empty glyph */ /* gs_i is behind, insert empty glyph */
@ -113,7 +127,7 @@ diff -r -u old/pango-1.36.3/modules/basic/basic-coretext.c new/pango-1.36.3/modu
continue; continue;
} }
else if (gi->index < gs_i) else if (gi->index < gs_i)
@@ -457,7 +483,7 @@ @@ -471,7 +510,7 @@
if (result != PANGO_COVERAGE_NONE) if (result != PANGO_COVERAGE_NONE)
{ {
@ -122,7 +136,7 @@ diff -r -u old/pango-1.36.3/modules/basic/basic-coretext.c new/pango-1.36.3/modu
if (g_unichar_type (gi->wc) == G_UNICODE_NON_SPACING_MARK) if (g_unichar_type (gi->wc) == G_UNICODE_NON_SPACING_MARK)
{ {
@@ -480,7 +506,7 @@ @@ -494,7 +533,7 @@
} }
} }
else else
@ -131,9 +145,9 @@ diff -r -u old/pango-1.36.3/modules/basic/basic-coretext.c new/pango-1.36.3/modu
glyph_iter = g_slist_next (glyph_iter); glyph_iter = g_slist_next (glyph_iter);
} }
diff -r -u old/pango-1.36.3/pango/pangocairo-coretextfont.c new/pango-1.36.3/pango/pangocairo-coretextfont.c diff -r -u old/pango-1.36.6/pango/pangocairo-coretextfont.c new/pango-1.36.6/pango/pangocairo-coretextfont.c
--- old/pango-1.36.3/pango/pangocairo-coretextfont.c 2014-03-05 21:33:55.000000000 -0700 --- old/pango-1.36.6/pango/pangocairo-coretextfont.c 2014-03-05 21:33:55.000000000 -0700
+++ new/pango-1.36.3/pango/pangocairo-coretextfont.c 2014-03-30 09:52:46.000000000 -0600 +++ new/pango-1.36.6/pango/pangocairo-coretextfont.c 2014-08-27 18:13:16.000000000 -0600
@@ -147,6 +147,12 @@ @@ -147,6 +147,12 @@
metrics->strikethrough_position = metrics->ascent / 3; metrics->strikethrough_position = metrics->ascent / 3;
metrics->strikethrough_thickness = CTFontGetUnderlineThickness (ctfont) * PANGO_SCALE; metrics->strikethrough_thickness = CTFontGetUnderlineThickness (ctfont) * PANGO_SCALE;
@ -147,9 +161,9 @@ diff -r -u old/pango-1.36.3/pango/pangocairo-coretextfont.c new/pango-1.36.3/pan
layout = pango_layout_new (context); layout = pango_layout_new (context);
font_desc = pango_font_describe_with_absolute_size ((PangoFont *) font); font_desc = pango_font_describe_with_absolute_size ((PangoFont *) font);
pango_layout_set_font_description (layout, font_desc); pango_layout_set_font_description (layout, font_desc);
diff -r -u old/pango-1.36.3/pango/pangocairo-coretextfontmap.c new/pango-1.36.3/pango/pangocairo-coretextfontmap.c diff -r -u old/pango-1.36.6/pango/pangocairo-coretextfontmap.c new/pango-1.36.6/pango/pangocairo-coretextfontmap.c
--- old/pango-1.36.3/pango/pangocairo-coretextfontmap.c 2014-03-05 21:33:55.000000000 -0700 --- old/pango-1.36.6/pango/pangocairo-coretextfontmap.c 2014-03-05 21:33:55.000000000 -0700
+++ new/pango-1.36.3/pango/pangocairo-coretextfontmap.c 2014-03-30 09:52:46.000000000 -0600 +++ new/pango-1.36.6/pango/pangocairo-coretextfontmap.c 2014-08-27 18:13:16.000000000 -0600
@@ -186,5 +186,5 @@ @@ -186,5 +186,5 @@
pango_cairo_core_text_font_map_init (PangoCairoCoreTextFontMap *cafontmap) pango_cairo_core_text_font_map_init (PangoCairoCoreTextFontMap *cafontmap)
{ {
@ -157,10 +171,10 @@ diff -r -u old/pango-1.36.3/pango/pangocairo-coretextfontmap.c new/pango-1.36.3/
- cafontmap->dpi = 96.; - cafontmap->dpi = 96.;
+ cafontmap->dpi = 72.; + cafontmap->dpi = 72.;
} }
diff -r -u old/pango-1.36.3/pango/pangocoretext-fontmap.c new/pango-1.36.3/pango/pangocoretext-fontmap.c diff -r -u old/pango-1.36.6/pango/pangocoretext-fontmap.c new/pango-1.36.6/pango/pangocoretext-fontmap.c
--- old/pango-1.36.3/pango/pangocoretext-fontmap.c 2014-04-14 10:56:38.000000000 -0600 --- old/pango-1.36.6/pango/pangocoretext-fontmap.c 2014-08-01 00:49:36.000000000 -0600
+++ new/pango-1.36.3/pango/pangocoretext-fontmap.c 2014-04-14 11:01:45.000000000 -0600 +++ new/pango-1.36.6/pango/pangocoretext-fontmap.c 2014-08-27 18:13:16.000000000 -0600
@@ -297,7 +297,8 @@ @@ -298,7 +298,8 @@
cf_number = (CFNumberRef)CFDictionaryGetValue (dict, cf_number = (CFNumberRef)CFDictionaryGetValue (dict,
kCTFontWeightTrait); kCTFontWeightTrait);
@ -170,7 +184,7 @@ diff -r -u old/pango-1.36.3/pango/pangocoretext-fontmap.c new/pango-1.36.3/pango
{ {
if (value < ct_weight_min || value > ct_weight_max) if (value < ct_weight_min || value > ct_weight_max)
{ {
@@ -315,8 +316,6 @@ @@ -317,8 +318,6 @@
} }
} }
} }
@ -179,3 +193,16 @@ diff -r -u old/pango-1.36.3/pango/pangocoretext-fontmap.c new/pango-1.36.3/pango
CFRelease (dict); CFRelease (dict);
diff -r -u old/pango-1.36.6/pango/pangocoretext.c new/pango-1.36.6/pango/pangocoretext.c
--- old/pango-1.36.6/pango/pangocoretext.c 2014-03-05 21:33:55.000000000 -0700
+++ new/pango-1.36.6/pango/pangocoretext.c 2014-08-27 18:13:16.000000000 -0600
@@ -97,8 +97,7 @@
bitmap = CFCharacterSetCreateBitmapRepresentation (kCFAllocatorDefault,
charset);
- /* We only handle the BMP plane */
- length = MIN (CFDataGetLength (bitmap), 8192);
+ length = CFDataGetLength (bitmap);
ptr = CFDataGetBytePtr (bitmap);
/* FIXME: can and should this be done more efficiently? */