ca9140d5d75dc123ee79557d33993b6e7077f7c0
[mono.git] / bockbuild / mac-sdk / patches / pango-disable-ligatures.patch
1 diff --git a/modules/basic/.libs/basic-coretext.o b/modules/basic/.libs/basic-coretext.o
2 index f013cbc..270a4f4 100644
3 Binary files a/modules/basic/.libs/basic-coretext.o and b/modules/basic/.libs/basic-coretext.o differ
4 diff --git a/modules/basic/.libs/pango-basic-coretext.so b/modules/basic/.libs/pango-basic-coretext.so
5 index 2cbf3ef..fec3e0f 100755
6 Binary files a/modules/basic/.libs/pango-basic-coretext.so and b/modules/basic/.libs/pango-basic-coretext.so differ
7 diff --git a/modules/basic/basic-coretext.c b/modules/basic/basic-coretext.c
8 index 82c2b48..c34460a 100644
9 --- a/modules/basic/basic-coretext.c
10 +++ b/modules/basic/basic-coretext.c
11 @@ -219,13 +219,17 @@ run_iterator_create (struct RunIterator *iter,
12    char *copy;
13    CFDictionaryRef attributes;
14    CFAttributedStringRef attstr;
15 +  int val = 0;
16 +  CFNumberRef number = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &val);
17
18    CFTypeRef keys[] = {
19 -      (CFTypeRef) kCTFontAttributeName
20 +      (CFTypeRef) kCTFontAttributeName,
21 +      kCTLigatureAttributeName
22    };
23
24    CFTypeRef values[] = {
25 -      ctfont
26 +      ctfont,
27 +      number
28    };
29
30    /* Initialize RunIterator structure */
31 @@ -238,7 +242,7 @@ run_iterator_create (struct RunIterator *iter,
32    attributes = CFDictionaryCreate (kCFAllocatorDefault,
33                                     (const void **)keys,
34                                     (const void **)values,
35 -                                   1,
36 +                                   sizeof (keys) / sizeof (keys[0]),
37                                     &kCFCopyStringDictionaryKeyCallBacks,
38                                     &kCFTypeDictionaryValueCallBacks);
39
40 @@ -262,6 +266,7 @@ run_iterator_create (struct RunIterator *iter,
41    iter->line = CTLineCreateWithAttributedString (attstr);
42    iter->runs = CTLineGetGlyphRuns (iter->line);
43
44 +  CFRelease (number);
45    CFRelease (attstr);
46    CFRelease (attributes);