[fontconfig/f17] Updates orth files. (#790471, #790460, #757985, #586763)
Akira TAGOH
tagoh at fedoraproject.org
Fri Mar 23 03:46:14 UTC 2012
commit 8159c6e835e5d23dd2ea8389e908eac65b134c75
Author: Akira TAGOH <tagoh at redhat.com>
Date: Fri Mar 23 12:46:09 2012 +0900
Updates orth files. (#790471, #790460, #757985, #586763)
- Drop the apple roman cmap support. (#681808)
fontconfig-drop-apple-roman-support.patch | 298 ++++++++++++++
fontconfig-orth-updates.patch | 605 +++++++++++++++++++++++++++++
fontconfig.spec | 13 +-
3 files changed, 915 insertions(+), 1 deletions(-)
---
diff --git a/fontconfig-drop-apple-roman-support.patch b/fontconfig-drop-apple-roman-support.patch
new file mode 100644
index 0000000..2345921
--- /dev/null
+++ b/fontconfig-drop-apple-roman-support.patch
@@ -0,0 +1,298 @@
+From cbb6ee1662f1219518677a9d489159778a812782 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira at tagoh.org>
+Date: Tue, 19 Jul 2011 20:12:09 +0900
+Subject: [PATCH] Bug 35517 - Remove Apple Roman cmap support
+
+Get rid of the apple roman encoding related code
+---
+ src/fcfreetype.c | 260 ------------------------------------------------------
+ 1 files changed, 0 insertions(+), 260 deletions(-)
+
+diff --git a/src/fcfreetype.c b/src/fcfreetype.c
+index d37af2d..f2d0642 100644
+--- a/src/fcfreetype.c
++++ b/src/fcfreetype.c
+@@ -696,34 +696,6 @@ FcSfntNameTranscode (FT_SfntName *sname)
+ *u8 = '\0';
+ goto done;
+ }
+- if (!strcmp (fromcode, FC_ENCODING_MAC_ROMAN))
+- {
+- FcChar8 *u8;
+- const FcCharMap *map = FcFreeTypeGetPrivateMap (ft_encoding_apple_roman);
+- FcChar8 *src = (FcChar8 *) sname->string;
+- int src_len = sname->string_len;
+-
+- /*
+- * Convert AppleRoman to Utf8
+- */
+- if (!map)
+- return 0;
+-
+- utf8 = malloc (sname->string_len * 3 + 1);
+- if (!utf8)
+- return 0;
+-
+- u8 = utf8;
+- while (src_len > 0)
+- {
+- FcChar32 ucs4 = FcFreeTypePrivateToUcs4 (*src++, map);
+- int olen = FcUcs4ToUtf8 (ucs4, u8);
+- src_len--;
+- u8 += olen;
+- }
+- *u8 = '\0';
+- goto done;
+- }
+ #if USE_ICONV
+ cd = iconv_open ("UTF-8", fromcode);
+ if (cd && cd != (iconv_t) (-1))
+@@ -1794,237 +1766,6 @@ typedef struct _FcFontDecode {
+ FcChar32 max;
+ } FcFontDecode;
+
+-static const FcCharEnt AppleRomanEnt[] = {
+- { 0x0020, 0x20 }, /* SPACE */
+- { 0x0021, 0x21 }, /* EXCLAMATION MARK */
+- { 0x0022, 0x22 }, /* QUOTATION MARK */
+- { 0x0023, 0x23 }, /* NUMBER SIGN */
+- { 0x0024, 0x24 }, /* DOLLAR SIGN */
+- { 0x0025, 0x25 }, /* PERCENT SIGN */
+- { 0x0026, 0x26 }, /* AMPERSAND */
+- { 0x0027, 0x27 }, /* APOSTROPHE */
+- { 0x0028, 0x28 }, /* LEFT PARENTHESIS */
+- { 0x0029, 0x29 }, /* RIGHT PARENTHESIS */
+- { 0x002A, 0x2A }, /* ASTERISK */
+- { 0x002B, 0x2B }, /* PLUS SIGN */
+- { 0x002C, 0x2C }, /* COMMA */
+- { 0x002D, 0x2D }, /* HYPHEN-MINUS */
+- { 0x002E, 0x2E }, /* FULL STOP */
+- { 0x002F, 0x2F }, /* SOLIDUS */
+- { 0x0030, 0x30 }, /* DIGIT ZERO */
+- { 0x0031, 0x31 }, /* DIGIT ONE */
+- { 0x0032, 0x32 }, /* DIGIT TWO */
+- { 0x0033, 0x33 }, /* DIGIT THREE */
+- { 0x0034, 0x34 }, /* DIGIT FOUR */
+- { 0x0035, 0x35 }, /* DIGIT FIVE */
+- { 0x0036, 0x36 }, /* DIGIT SIX */
+- { 0x0037, 0x37 }, /* DIGIT SEVEN */
+- { 0x0038, 0x38 }, /* DIGIT EIGHT */
+- { 0x0039, 0x39 }, /* DIGIT NINE */
+- { 0x003A, 0x3A }, /* COLON */
+- { 0x003B, 0x3B }, /* SEMICOLON */
+- { 0x003C, 0x3C }, /* LESS-THAN SIGN */
+- { 0x003D, 0x3D }, /* EQUALS SIGN */
+- { 0x003E, 0x3E }, /* GREATER-THAN SIGN */
+- { 0x003F, 0x3F }, /* QUESTION MARK */
+- { 0x0040, 0x40 }, /* COMMERCIAL AT */
+- { 0x0041, 0x41 }, /* LATIN CAPITAL LETTER A */
+- { 0x0042, 0x42 }, /* LATIN CAPITAL LETTER B */
+- { 0x0043, 0x43 }, /* LATIN CAPITAL LETTER C */
+- { 0x0044, 0x44 }, /* LATIN CAPITAL LETTER D */
+- { 0x0045, 0x45 }, /* LATIN CAPITAL LETTER E */
+- { 0x0046, 0x46 }, /* LATIN CAPITAL LETTER F */
+- { 0x0047, 0x47 }, /* LATIN CAPITAL LETTER G */
+- { 0x0048, 0x48 }, /* LATIN CAPITAL LETTER H */
+- { 0x0049, 0x49 }, /* LATIN CAPITAL LETTER I */
+- { 0x004A, 0x4A }, /* LATIN CAPITAL LETTER J */
+- { 0x004B, 0x4B }, /* LATIN CAPITAL LETTER K */
+- { 0x004C, 0x4C }, /* LATIN CAPITAL LETTER L */
+- { 0x004D, 0x4D }, /* LATIN CAPITAL LETTER M */
+- { 0x004E, 0x4E }, /* LATIN CAPITAL LETTER N */
+- { 0x004F, 0x4F }, /* LATIN CAPITAL LETTER O */
+- { 0x0050, 0x50 }, /* LATIN CAPITAL LETTER P */
+- { 0x0051, 0x51 }, /* LATIN CAPITAL LETTER Q */
+- { 0x0052, 0x52 }, /* LATIN CAPITAL LETTER R */
+- { 0x0053, 0x53 }, /* LATIN CAPITAL LETTER S */
+- { 0x0054, 0x54 }, /* LATIN CAPITAL LETTER T */
+- { 0x0055, 0x55 }, /* LATIN CAPITAL LETTER U */
+- { 0x0056, 0x56 }, /* LATIN CAPITAL LETTER V */
+- { 0x0057, 0x57 }, /* LATIN CAPITAL LETTER W */
+- { 0x0058, 0x58 }, /* LATIN CAPITAL LETTER X */
+- { 0x0059, 0x59 }, /* LATIN CAPITAL LETTER Y */
+- { 0x005A, 0x5A }, /* LATIN CAPITAL LETTER Z */
+- { 0x005B, 0x5B }, /* LEFT SQUARE BRACKET */
+- { 0x005C, 0x5C }, /* REVERSE SOLIDUS */
+- { 0x005D, 0x5D }, /* RIGHT SQUARE BRACKET */
+- { 0x005E, 0x5E }, /* CIRCUMFLEX ACCENT */
+- { 0x005F, 0x5F }, /* LOW LINE */
+- { 0x0060, 0x60 }, /* GRAVE ACCENT */
+- { 0x0061, 0x61 }, /* LATIN SMALL LETTER A */
+- { 0x0062, 0x62 }, /* LATIN SMALL LETTER B */
+- { 0x0063, 0x63 }, /* LATIN SMALL LETTER C */
+- { 0x0064, 0x64 }, /* LATIN SMALL LETTER D */
+- { 0x0065, 0x65 }, /* LATIN SMALL LETTER E */
+- { 0x0066, 0x66 }, /* LATIN SMALL LETTER F */
+- { 0x0067, 0x67 }, /* LATIN SMALL LETTER G */
+- { 0x0068, 0x68 }, /* LATIN SMALL LETTER H */
+- { 0x0069, 0x69 }, /* LATIN SMALL LETTER I */
+- { 0x006A, 0x6A }, /* LATIN SMALL LETTER J */
+- { 0x006B, 0x6B }, /* LATIN SMALL LETTER K */
+- { 0x006C, 0x6C }, /* LATIN SMALL LETTER L */
+- { 0x006D, 0x6D }, /* LATIN SMALL LETTER M */
+- { 0x006E, 0x6E }, /* LATIN SMALL LETTER N */
+- { 0x006F, 0x6F }, /* LATIN SMALL LETTER O */
+- { 0x0070, 0x70 }, /* LATIN SMALL LETTER P */
+- { 0x0071, 0x71 }, /* LATIN SMALL LETTER Q */
+- { 0x0072, 0x72 }, /* LATIN SMALL LETTER R */
+- { 0x0073, 0x73 }, /* LATIN SMALL LETTER S */
+- { 0x0074, 0x74 }, /* LATIN SMALL LETTER T */
+- { 0x0075, 0x75 }, /* LATIN SMALL LETTER U */
+- { 0x0076, 0x76 }, /* LATIN SMALL LETTER V */
+- { 0x0077, 0x77 }, /* LATIN SMALL LETTER W */
+- { 0x0078, 0x78 }, /* LATIN SMALL LETTER X */
+- { 0x0079, 0x79 }, /* LATIN SMALL LETTER Y */
+- { 0x007A, 0x7A }, /* LATIN SMALL LETTER Z */
+- { 0x007B, 0x7B }, /* LEFT CURLY BRACKET */
+- { 0x007C, 0x7C }, /* VERTICAL LINE */
+- { 0x007D, 0x7D }, /* RIGHT CURLY BRACKET */
+- { 0x007E, 0x7E }, /* TILDE */
+- { 0x00A0, 0xCA }, /* NO-BREAK SPACE */
+- { 0x00A1, 0xC1 }, /* INVERTED EXCLAMATION MARK */
+- { 0x00A2, 0xA2 }, /* CENT SIGN */
+- { 0x00A3, 0xA3 }, /* POUND SIGN */
+- { 0x00A5, 0xB4 }, /* YEN SIGN */
+- { 0x00A7, 0xA4 }, /* SECTION SIGN */
+- { 0x00A8, 0xAC }, /* DIAERESIS */
+- { 0x00A9, 0xA9 }, /* COPYRIGHT SIGN */
+- { 0x00AA, 0xBB }, /* FEMININE ORDINAL INDICATOR */
+- { 0x00AB, 0xC7 }, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+- { 0x00AC, 0xC2 }, /* NOT SIGN */
+- { 0x00AE, 0xA8 }, /* REGISTERED SIGN */
+- { 0x00AF, 0xF8 }, /* MACRON */
+- { 0x00B0, 0xA1 }, /* DEGREE SIGN */
+- { 0x00B1, 0xB1 }, /* PLUS-MINUS SIGN */
+- { 0x00B4, 0xAB }, /* ACUTE ACCENT */
+- { 0x00B5, 0xB5 }, /* MICRO SIGN */
+- { 0x00B6, 0xA6 }, /* PILCROW SIGN */
+- { 0x00B7, 0xE1 }, /* MIDDLE DOT */
+- { 0x00B8, 0xFC }, /* CEDILLA */
+- { 0x00BA, 0xBC }, /* MASCULINE ORDINAL INDICATOR */
+- { 0x00BB, 0xC8 }, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+- { 0x00BF, 0xC0 }, /* INVERTED QUESTION MARK */
+- { 0x00C0, 0xCB }, /* LATIN CAPITAL LETTER A WITH GRAVE */
+- { 0x00C1, 0xE7 }, /* LATIN CAPITAL LETTER A WITH ACUTE */
+- { 0x00C2, 0xE5 }, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+- { 0x00C3, 0xCC }, /* LATIN CAPITAL LETTER A WITH TILDE */
+- { 0x00C4, 0x80 }, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+- { 0x00C5, 0x81 }, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+- { 0x00C6, 0xAE }, /* LATIN CAPITAL LETTER AE */
+- { 0x00C7, 0x82 }, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+- { 0x00C8, 0xE9 }, /* LATIN CAPITAL LETTER E WITH GRAVE */
+- { 0x00C9, 0x83 }, /* LATIN CAPITAL LETTER E WITH ACUTE */
+- { 0x00CA, 0xE6 }, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+- { 0x00CB, 0xE8 }, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+- { 0x00CC, 0xED }, /* LATIN CAPITAL LETTER I WITH GRAVE */
+- { 0x00CD, 0xEA }, /* LATIN CAPITAL LETTER I WITH ACUTE */
+- { 0x00CE, 0xEB }, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+- { 0x00CF, 0xEC }, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+- { 0x00D1, 0x84 }, /* LATIN CAPITAL LETTER N WITH TILDE */
+- { 0x00D2, 0xF1 }, /* LATIN CAPITAL LETTER O WITH GRAVE */
+- { 0x00D3, 0xEE }, /* LATIN CAPITAL LETTER O WITH ACUTE */
+- { 0x00D4, 0xEF }, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+- { 0x00D5, 0xCD }, /* LATIN CAPITAL LETTER O WITH TILDE */
+- { 0x00D6, 0x85 }, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+- { 0x00D8, 0xAF }, /* LATIN CAPITAL LETTER O WITH STROKE */
+- { 0x00D9, 0xF4 }, /* LATIN CAPITAL LETTER U WITH GRAVE */
+- { 0x00DA, 0xF2 }, /* LATIN CAPITAL LETTER U WITH ACUTE */
+- { 0x00DB, 0xF3 }, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+- { 0x00DC, 0x86 }, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+- { 0x00DF, 0xA7 }, /* LATIN SMALL LETTER SHARP S */
+- { 0x00E0, 0x88 }, /* LATIN SMALL LETTER A WITH GRAVE */
+- { 0x00E1, 0x87 }, /* LATIN SMALL LETTER A WITH ACUTE */
+- { 0x00E2, 0x89 }, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+- { 0x00E3, 0x8B }, /* LATIN SMALL LETTER A WITH TILDE */
+- { 0x00E4, 0x8A }, /* LATIN SMALL LETTER A WITH DIAERESIS */
+- { 0x00E5, 0x8C }, /* LATIN SMALL LETTER A WITH RING ABOVE */
+- { 0x00E6, 0xBE }, /* LATIN SMALL LETTER AE */
+- { 0x00E7, 0x8D }, /* LATIN SMALL LETTER C WITH CEDILLA */
+- { 0x00E8, 0x8F }, /* LATIN SMALL LETTER E WITH GRAVE */
+- { 0x00E9, 0x8E }, /* LATIN SMALL LETTER E WITH ACUTE */
+- { 0x00EA, 0x90 }, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+- { 0x00EB, 0x91 }, /* LATIN SMALL LETTER E WITH DIAERESIS */
+- { 0x00EC, 0x93 }, /* LATIN SMALL LETTER I WITH GRAVE */
+- { 0x00ED, 0x92 }, /* LATIN SMALL LETTER I WITH ACUTE */
+- { 0x00EE, 0x94 }, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+- { 0x00EF, 0x95 }, /* LATIN SMALL LETTER I WITH DIAERESIS */
+- { 0x00F1, 0x96 }, /* LATIN SMALL LETTER N WITH TILDE */
+- { 0x00F2, 0x98 }, /* LATIN SMALL LETTER O WITH GRAVE */
+- { 0x00F3, 0x97 }, /* LATIN SMALL LETTER O WITH ACUTE */
+- { 0x00F4, 0x99 }, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+- { 0x00F5, 0x9B }, /* LATIN SMALL LETTER O WITH TILDE */
+- { 0x00F6, 0x9A }, /* LATIN SMALL LETTER O WITH DIAERESIS */
+- { 0x00F7, 0xD6 }, /* DIVISION SIGN */
+- { 0x00F8, 0xBF }, /* LATIN SMALL LETTER O WITH STROKE */
+- { 0x00F9, 0x9D }, /* LATIN SMALL LETTER U WITH GRAVE */
+- { 0x00FA, 0x9C }, /* LATIN SMALL LETTER U WITH ACUTE */
+- { 0x00FB, 0x9E }, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+- { 0x00FC, 0x9F }, /* LATIN SMALL LETTER U WITH DIAERESIS */
+- { 0x00FF, 0xD8 }, /* LATIN SMALL LETTER Y WITH DIAERESIS */
+- { 0x0131, 0xF5 }, /* LATIN SMALL LETTER DOTLESS I */
+- { 0x0152, 0xCE }, /* LATIN CAPITAL LIGATURE OE */
+- { 0x0153, 0xCF }, /* LATIN SMALL LIGATURE OE */
+- { 0x0178, 0xD9 }, /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
+- { 0x0192, 0xC4 }, /* LATIN SMALL LETTER F WITH HOOK */
+- { 0x02C6, 0xF6 }, /* MODIFIER LETTER CIRCUMFLEX ACCENT */
+- { 0x02C7, 0xFF }, /* CARON */
+- { 0x02D8, 0xF9 }, /* BREVE */
+- { 0x02D9, 0xFA }, /* DOT ABOVE */
+- { 0x02DA, 0xFB }, /* RING ABOVE */
+- { 0x02DB, 0xFE }, /* OGONEK */
+- { 0x02DC, 0xF7 }, /* SMALL TILDE */
+- { 0x02DD, 0xFD }, /* DOUBLE ACUTE ACCENT */
+- { 0x03A9, 0xBD }, /* GREEK CAPITAL LETTER OMEGA */
+- { 0x03C0, 0xB9 }, /* GREEK SMALL LETTER PI */
+- { 0x2013, 0xD0 }, /* EN DASH */
+- { 0x2014, 0xD1 }, /* EM DASH */
+- { 0x2018, 0xD4 }, /* LEFT SINGLE QUOTATION MARK */
+- { 0x2019, 0xD5 }, /* RIGHT SINGLE QUOTATION MARK */
+- { 0x201A, 0xE2 }, /* SINGLE LOW-9 QUOTATION MARK */
+- { 0x201C, 0xD2 }, /* LEFT DOUBLE QUOTATION MARK */
+- { 0x201D, 0xD3 }, /* RIGHT DOUBLE QUOTATION MARK */
+- { 0x201E, 0xE3 }, /* DOUBLE LOW-9 QUOTATION MARK */
+- { 0x2020, 0xA0 }, /* DAGGER */
+- { 0x2021, 0xE0 }, /* DOUBLE DAGGER */
+- { 0x2022, 0xA5 }, /* BULLET */
+- { 0x2026, 0xC9 }, /* HORIZONTAL ELLIPSIS */
+- { 0x2030, 0xE4 }, /* PER MILLE SIGN */
+- { 0x2039, 0xDC }, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
+- { 0x203A, 0xDD }, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
+- { 0x2044, 0xDA }, /* FRACTION SLASH */
+- { 0x20AC, 0xDB }, /* EURO SIGN */
+- { 0x2122, 0xAA }, /* TRADE MARK SIGN */
+- { 0x2202, 0xB6 }, /* PARTIAL DIFFERENTIAL */
+- { 0x2206, 0xC6 }, /* INCREMENT */
+- { 0x220F, 0xB8 }, /* N-ARY PRODUCT */
+- { 0x2211, 0xB7 }, /* N-ARY SUMMATION */
+- { 0x221A, 0xC3 }, /* SQUARE ROOT */
+- { 0x221E, 0xB0 }, /* INFINITY */
+- { 0x222B, 0xBA }, /* INTEGRAL */
+- { 0x2248, 0xC5 }, /* ALMOST EQUAL TO */
+- { 0x2260, 0xAD }, /* NOT EQUAL TO */
+- { 0x2264, 0xB2 }, /* LESS-THAN OR EQUAL TO */
+- { 0x2265, 0xB3 }, /* GREATER-THAN OR EQUAL TO */
+- { 0x25CA, 0xD7 }, /* LOZENGE */
+- { 0xF8FF, 0xF0 }, /* Apple logo */
+- { 0xFB01, 0xDE }, /* LATIN SMALL LIGATURE FI */
+- { 0xFB02, 0xDF }, /* LATIN SMALL LIGATURE FL */
+-};
+-
+-static const FcCharMap AppleRoman = {
+- AppleRomanEnt,
+- sizeof (AppleRomanEnt) / sizeof (AppleRomanEnt[0])
+-};
+-
+ static const FcCharEnt AdobeSymbolEnt[] = {
+ { 0x0020, 0x20 }, /* SPACE # space */
+ { 0x0021, 0x21 }, /* EXCLAMATION MARK # exclam */
+@@ -2230,7 +1971,6 @@ static const FcCharMap AdobeSymbol = {
+ static const FcFontDecode fcFontDecoders[] = {
+ { ft_encoding_unicode, 0, (1 << 21) - 1 },
+ { ft_encoding_symbol, &AdobeSymbol, (1 << 16) - 1 },
+- { ft_encoding_apple_roman, &AppleRoman, (1 << 16) - 1 },
+ };
+
+ #define NUM_DECODE (int) (sizeof (fcFontDecoders) / sizeof (fcFontDecoders[0]))
+--
+1.7.7.6
+
diff --git a/fontconfig-orth-updates.patch b/fontconfig-orth-updates.patch
new file mode 100644
index 0000000..e04881d
--- /dev/null
+++ b/fontconfig-orth-updates.patch
@@ -0,0 +1,605 @@
+diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
+index 923a4ff..d2eca5b 100644
+--- a/fc-lang/Makefile.am
++++ b/fc-lang/Makefile.am
+@@ -1,3 +1,4 @@
++# -*- encoding: utf-8 -*-
+ #
+ # $Id $
+ #
+@@ -7,9 +8,9 @@
+ # documentation for any purpose is hereby granted without fee, provided that
+ # the above copyright notice appear in all copies and that both that
+ # copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of Keith Packard not be used in
++# documentation, and that the name of the author(s) not be used in
+ # advertising or publicity pertaining to distribution of the software without
+-# specific, written prior permission. Keith Packard makes no
++# specific, written prior permission. The authors make no
+ # representations about the suitability of this software for any purpose. It
+ # is provided "as is" without express or implied warranty.
+ #
+@@ -22,10 +23,6 @@
+ # PERFORMANCE OF THIS SOFTWARE.
+ #
+
+-CC = @CC_FOR_BUILD@
+-EXEEXT = @EXEEXT_FOR_BUILD@
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-
+ INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
+
+ TMPL=fclang.tmpl.h
+@@ -36,21 +33,30 @@ noinst_PROGRAMS=fc-lang
+
+ noinst_MANS=fc-lang.man
+
+-EXTRA_DIST=$(TMPL) $(ORTH)
++EXTRA_DIST = $(TARG) $(TMPL) $(ORTH)
+
++if CROSS_COMPILING
++$(TARG):$(ORTH) fc-lang.c $(STMPL)
++ @echo Warning: cannot rebuild $(TARG) when cross-compiling
++else
+ $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL)
+ $(AM_V_GEN) $(RM) $(TARG); \
+ ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \
+ mv $(TARG).tmp $(TARG)
++endif
+
+ ALIAS_FILES = fcalias.h fcaliastail.h
+
+ BUILT_SOURCES = $(ALIAS_FILES) $(TARG)
+
+-$(ALIAS_FILES):
++$(ALIAS_FILES):
+ touch $(ALIAS_FILES)
+
+-CLEANFILES = $(TARG) $(ALIAS_FILES)
++CLEANFILES = $(ALIAS_FILES)
++
++DISTCLEANFILES = $(TARG)
++
++MAINTAINERCLEANFILES = $(TARG)
+
+ # NOTE:
+ #
+@@ -296,5 +302,10 @@ ORTH = \
+ ty.orth \
+ wal.orth \
+ za.orth \
+- lah.orth
++ lah.orth \
++ nqo.orth \
++ brx.orth \
++ sat.orth \
++ doi.orth \
++ mni.orth
+ # ^-------------- Add new orth files here
+diff --git a/fc-lang/ast.orth b/fc-lang/ast.orth
+index 20b81f4..55aaed5 100644
+--- a/fc-lang/ast.orth
++++ b/fc-lang/ast.orth
+@@ -7,9 +7,9 @@
+ # documentation for any purpose is hereby granted without fee, provided that
+ # the above copyright notice appear in all copies and that both that
+ # copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of Keith Packard not be used in
++# documentation, and that the name of the author(s) not be used in
+ # advertising or publicity pertaining to distribution of the software without
+-# specific, written prior permission. Keith Packard makes no
++# specific, written prior permission. The authors make no
+ # representations about the suitability of this software for any purpose. It
+ # is provided "as is" without express or implied warranty.
+ #
+@@ -41,3 +41,7 @@
+ 00f3
+ 00fa
+ 00fc
++1e24
++1e25
++1e36
++1e37
+diff --git a/fc-lang/brx.orth b/fc-lang/brx.orth
+new file mode 100644
+index 0000000..eab2046
+--- /dev/null
++++ b/fc-lang/brx.orth
+@@ -0,0 +1,46 @@
++#
++# fontconfig/fc-lang/brx.orth
++#
++# Copyright © 2012 Parag Nemade
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++# Bodo (Devanagari script) (brx)
++#
++# Source: Enhanced inscript: http://pune.cdac.in/html/gist/down/inscript_d.asp
++# Or
++# Source: http://malayalam.kerala.gov.in/images/8/80/Qwerty_enhancedinscriptkeyboardlayout.pdf Page No. 44
++#
++0901-0903 # Various Signs
++0905-090c # Independent vowels
++090f-0910 # Independent vowels
++0913-0914 # Independent vowels
++0915-0928 # Consonants
++092a-0930 # Consonants
++0932-0932 # Consonants
++0935-0939 # Consonants
++093c-0944 # Various and Dependent vowel signs
++0947-0948 # Dependent vowel signs
++094b-094d # Dependent vowel signs and virama
++0950-0952 # Sign and vedic tone marks
++0960-0963 # Additional vowels
++0964-0965 # Punctuations
++0966-096F # Digits
++0970 # Abbrevation sign
++
+diff --git a/fc-lang/doi.orth b/fc-lang/doi.orth
+new file mode 100644
+index 0000000..d4a274a
+--- /dev/null
++++ b/fc-lang/doi.orth
+@@ -0,0 +1,40 @@
++#
++# fontconfig/fc-lang/doi.orth
++#
++# Copyright © 2012 Pravin Satpute <psatpute at redhat.com>
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of the author(s) not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. The author(s) make(s) no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++# Dogri (doi)
++#
++# Source: Enhanced inscript: http://malayalam.kerala.gov.in/images/8/80/Qwerty_enhancedinscriptkeyboardlayout.pdf Page No. 58
++# Encircled these characters in Unicode chart: http://pravins.fedorapeople.org/Dogri-characters.pdf
++# documents
++0902-0903
++0905-090c
++090f-0910
++0913-0928
++092a-0930
++0932
++0935-0939
++093c-0944
++0947-0948
++094b-094d
++0950-0952
++095b-096f
+diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
+index 21d568d..51717f9 100644
+--- a/fc-lang/fc-lang.c
++++ b/fc-lang/fc-lang.c
+@@ -7,9 +7,9 @@
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+- * documentation, and that the name of Keith Packard not be used in
++ * documentation, and that the name of the author(s) not be used in
+ * advertising or publicity pertaining to distribution of the software without
+- * specific, written prior permission. Keith Packard makes no
++ * specific, written prior permission. The authors make no
+ * representations about the suitability of this software for any purpose. It
+ * is provided "as is" without express or implied warranty.
+ *
+@@ -76,10 +76,14 @@ fatal (const char *file, int lineno, const char *msg)
+ }
+
+ static char *
+-get_line (FILE *f, char *line, int *lineno)
++get_line (FILE *f, char *buf, int *lineno)
+ {
+ char *hash;
++ char *line;
+ int end;
++
++next:
++ line = buf;
+ if (!fgets (line, 1024, f))
+ return 0;
+ ++(*lineno);
+@@ -87,12 +91,15 @@ get_line (FILE *f, char *line, int *lineno)
+ if (hash)
+ *hash = '\0';
+
++ while (line[0] && isspace (line[0]))
++ line++;
+ end = strlen (line);
+ while (end > 0 && isspace (line[end-1]))
+ line[--end] = '\0';
+
+- if (line[0] == '\0' || line[0] == '\n' || line[0] == '\032' || line[0] == '\r')
+- return get_line (f, line, lineno);
++ if (line[0] == '\0' || line[0] == '\n' || line[0] == '\r')
++ goto next;
++
+ return line;
+ }
+
+@@ -125,16 +132,18 @@ scanopen (char *file)
+ * Comments begin with '#'
+ */
+
+-static const FcCharSet *
++static FcCharSet *
+ scan (FILE *f, char *file, FcCharSetFreezer *freezer)
+ {
+ FcCharSet *c = 0;
+ FcCharSet *n;
++ FcBool del;
+ int start, end, ucs4;
+- char line[1024];
++ char buf[1024];
++ char *line;
+ int lineno = 0;
+
+- while (get_line (f, line, &lineno))
++ while ((line = get_line (f, buf, &lineno)))
+ {
+ if (!strncmp (line, "include", 7))
+ {
+@@ -158,6 +167,12 @@ scan (FILE *f, char *file, FcCharSetFreezer *freezer)
+ FcCharSetDestroy (n);
+ continue;
+ }
++ del = FcFalse;
++ if (line[0] == '-')
++ {
++ del = FcTrue;
++ line++;
++ }
+ if (strchr (line, '-'))
+ {
+ if (sscanf (line, "%x-%x", &start, &end) != 2)
+@@ -173,11 +188,11 @@ scan (FILE *f, char *file, FcCharSetFreezer *freezer)
+ c = FcCharSetCreate ();
+ for (ucs4 = start; ucs4 <= end; ucs4++)
+ {
+- if (!FcCharSetAddChar (c, ucs4))
++ if (!((del ? FcCharSetDelChar : FcCharSetAddChar) (c, ucs4)))
+ fatal (file, lineno, "out of memory");
+ }
+ }
+- n = FcCharSetFreeze (freezer, c);
++ n = (FcCharSet *) FcCharSetFreeze (freezer, c);
+ FcCharSetDestroy (c);
+ return n;
+ }
+@@ -231,8 +246,8 @@ typedef struct _Entry {
+
+ static int compare (const void *a, const void *b)
+ {
+- const Entry const *as = a, *bs = b;
+- return FcStrCmpIgnoreCase (as->file, bs->file);
++ const Entry *as = a, *bs = b;
++ return FcStrCmpIgnoreCase ((const FcChar8 *) as->file, (const FcChar8 *) bs->file);
+ }
+
+ #define MAX_LANG 1024
+@@ -245,7 +260,7 @@ int
+ main (int argc, char **argv)
+ {
+ static Entry entries[MAX_LANG];
+- static const FcCharSet *sets[MAX_LANG];
++ static FcCharSet *sets[MAX_LANG];
+ static int duplicate[MAX_LANG];
+ static int country[MAX_LANG];
+ static char *names[MAX_LANG];
+@@ -363,9 +378,9 @@ main (int argc, char **argv)
+
+ printf ("#define LEAF0 (%d * sizeof (FcLangCharSet))\n", nsets);
+ printf ("#define OFF0 (LEAF0 + %d * sizeof (FcCharLeaf))\n", tl);
+- printf ("#define NUM0 (OFF0 + %d * sizeof (intptr_t))\n", tn);
++ printf ("#define NUM0 (OFF0 + %d * sizeof (uintptr_t))\n", tn);
+ printf ("#define SET(n) (n * sizeof (FcLangCharSet) + offsetof (FcLangCharSet, charset))\n");
+- printf ("#define OFF(s,o) (OFF0 + o * sizeof (intptr_t) - SET(s))\n");
++ printf ("#define OFF(s,o) (OFF0 + o * sizeof (uintptr_t) - SET(s))\n");
+ printf ("#define NUM(s,n) (NUM0 + n * sizeof (FcChar16) - SET(s))\n");
+ printf ("#define LEAF(o,l) (LEAF0 + l * sizeof (FcCharLeaf) - (OFF0 + o * sizeof (intptr_t)))\n");
+ printf ("#define fcLangCharSets (fcLangData.langCharSets)\n");
+@@ -376,7 +391,7 @@ main (int argc, char **argv)
+ printf ("static const struct {\n"
+ " FcLangCharSet langCharSets[%d];\n"
+ " FcCharLeaf leaves[%d];\n"
+- " intptr_t leaf_offsets[%d];\n"
++ " uintptr_t leaf_offsets[%d];\n"
+ " FcChar16 numbers[%d];\n"
+ " FcChar%s langIndices[%d];\n"
+ " FcChar%s langIndicesInv[%d];\n"
+diff --git a/fc-lang/ks.orth b/fc-lang/ks.orth
+index e86ba0d..6697e15 100644
+--- a/fc-lang/ks.orth
++++ b/fc-lang/ks.orth
+@@ -23,8 +23,10 @@
+ #
+ # Kashmiri (ks)
+ #
+-# Kashmiri is written in Arabic in both India and Pakistan. The problem is,
+-# Unicode 5.1 does not contain all the letters required in the orthography,
+-# including Wavy Hamza Below and the Alef Maksura With Ring Below. We'll
+-# just include Urdu for now.
+ include ur.orth
++0620
++0657
++065f
++0672
++0673
++06c4
+diff --git a/fc-lang/mni.orth b/fc-lang/mni.orth
+new file mode 100644
+index 0000000..4388269
+--- /dev/null
++++ b/fc-lang/mni.orth
+@@ -0,0 +1,35 @@
++#
++# fontconfig/fc-lang/mni.orth
++#
++# Copyright © 2012 Pravin Satpute <psatpute at redhat.com>
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of the author(s) not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. The author(s) make(s) no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++# Maniputi (mni)
++#
++# Source: Script grammer: http://tdil-dc.in/tdildcMain/articles/283709Script_Grammar_for_Manipuri.pdf 6th page
++# Characters are encirled in Unicode chart http://pravins.fedorapeople.org/Manipuri-characters.pdf
++# documents
++include bn.orth
++0964
++- 09c4
++09bd
++09ce
++09e6-09ef
++09f1
+diff --git a/fc-lang/ne.orth b/fc-lang/ne.orth
+index 18cf011..246386f 100644
+--- a/fc-lang/ne.orth
++++ b/fc-lang/ne.orth
+@@ -7,9 +7,9 @@
+ # documentation for any purpose is hereby granted without fee, provided that
+ # the above copyright notice appear in all copies and that both that
+ # copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of Keith Packard not be used in
++# documentation, and that the name of the author(s) not be used in
+ # advertising or publicity pertaining to distribution of the software without
+-# specific, written prior permission. Keith Packard makes no
++# specific, written prior permission. The authors make no
+ # representations about the suitability of this software for any purpose. It
+ # is provided "as is" without express or implied warranty.
+ #
+@@ -23,3 +23,4 @@
+ #
+ # Nepali (Devanagari script) (NE)
+ include hi.orth
++-090C-090E # See bug 30685
+diff --git a/fc-lang/nqo.orth b/fc-lang/nqo.orth
+new file mode 100644
+index 0000000..285e1d7
+--- /dev/null
++++ b/fc-lang/nqo.orth
+@@ -0,0 +1,31 @@
++#
++# fontconfig/fc-lang/nqo.orth
++#
++# Copyright © 2011 Akira TAGOH
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of the author(s) not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. The authors make no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++# N'Ko (nqo)
++#
++# See:
++# http://www.unicode.org/charts/PDF/U07C0.pdf
++# http://en.wikipedia.org/wiki/N'Ko_alphabet
++#
++07c0-07ff
++
+diff --git a/fc-lang/sat.orth b/fc-lang/sat.orth
+new file mode 100644
+index 0000000..d5d91d0
+--- /dev/null
++++ b/fc-lang/sat.orth
+@@ -0,0 +1,44 @@
++# fontconfig/fc-lang/sat.orth
++#
++# Copyright © 2012 Parag Nemade
++#
++# Permission to use, copy, modify, distribute, and sell this software and its
++# documentation for any purpose is hereby granted without fee, provided that
++# the above copyright notice appear in all copies and that both that
++# copyright notice and this permission notice appear in supporting
++# documentation, and that the name of Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++# PERFORMANCE OF THIS SOFTWARE.
++#
++# Santali (Devanagari script) (sat)
++#
++# Source: Enhanced inscript: http://pune.cdac.in/html/gist/down/inscript_d.asp
++# Or
++# Source: http://malayalam.kerala.gov.in/images/8/80/Qwerty_enhancedinscriptkeyboardlayout.pdf Page No. 86
++#
++0901-0903 # Various Signs
++0905-090a # Independent vowels
++090f-0910 # Independent vowels
++0913-0914 # Independent vowels
++0915-0928 # Consonants
++092a-0930 # Consonants
++0932-0932 # Consonants
++0935 # Consonants
++0938-0939 # Consonants
++093c-0942 # Various and Dependent vowel signs
++0947-0948 # Dependent vowel signs
++094b-094d # Dependent vowel signs and virama
++0950 # Sign
++0964-0965 # Punctuations
++0966-096F # Digits
++0970 # Abbrevation sign
+diff --git a/fc-lang/ug.orth b/fc-lang/ug.orth
+index bf8e674..1a6f28d 100644
+--- a/fc-lang/ug.orth
++++ b/fc-lang/ug.orth
+@@ -1,15 +1,19 @@
+ #
+ # fontconfig/fc-lang/ug.orth
+ #
+-# Copyright © 2002 Keith Packard
++# Copyright © 2010
++# UKIJ - Uyghur Computer Science Association (http://www.ukij.org/)
++# Ubuntu Uyghur Translation Team (https://launchpad.net/~ubuntu-l10n-ug)
++# Kenjisoft (http://kenjisoft.homelinux.com/)
++# Bilik (http://www.bilik.cn/)
+ #
+ # Permission to use, copy, modify, distribute, and sell this software and its
+ # documentation for any purpose is hereby granted without fee, provided that
+ # the above copyright notice appear in all copies and that both that
+ # copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of Keith Packard not be used in
++# documentation, and that the name of the author(s) not be used in
+ # advertising or publicity pertaining to distribution of the software without
+-# specific, written prior permission. Keith Packard makes no
++# specific, written prior permission. The authors makes no
+ # representations about the suitability of this software for any purpose. It
+ # is provided "as is" without express or implied warranty.
+ #
+@@ -21,9 +25,26 @@
+ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ # PERFORMANCE OF THIS SOFTWARE.
+ #
+-# Uighur (UG)
++# Uyghur (UG)
+ #
+-# Uighur is written in a varient of Perso-Arabic, but I haven't found
+-# any references which define the variations. So, for now we'll use Arabic
+-# fonts
+-include ar.orth
++# Uyghur is written in a modified Persian-Arabic script. For detailed
++# information, refer to http://en.wikipedia.org/wiki/Uyghur_language
++#
++0626-0628
++062A
++062C
++062E-062F
++0631-0634
++063A
++0641-0646
++0648-064A
++067E
++0686
++0698
++06AD
++06AF
++06BE
++06C6-06C8
++06CB
++06D0
++06D5
+diff --git a/fc-lang/ur.orth b/fc-lang/ur.orth
+index d9b944a..5b39a50 100644
+--- a/fc-lang/ur.orth
++++ b/fc-lang/ur.orth
+@@ -8,9 +8,9 @@
+ # documentation for any purpose is hereby granted without fee, provided that
+ # the above copyright notice appear in all copies and that both that
+ # copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of Keith Packard not be used in
++# documentation, and that the name of the author(s) not be used in
+ # advertising or publicity pertaining to distribution of the software without
+-# specific, written prior permission. Keith Packard makes no
++# specific, written prior permission. The authors make no
+ # representations about the suitability of this software for any purpose. It
+ # is provided "as is" without express or implied warranty.
+ #
+@@ -34,9 +34,11 @@
+ #
+ # General forms:
+ 0621-0624
+-0626-063a
++0626-0628
++063a
+ 0641-0642
+-0644-0648
++0644-0646
++0648
+ 0679
+ 067e
+ 0686
+@@ -47,6 +49,7 @@
+ 06af
+ 06ba
+ 06be
++06c3
+ 06cc
+ 06d2
+ # Presentations forms:
diff --git a/fontconfig.spec b/fontconfig.spec
index e942fcc..4533940 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -3,7 +3,7 @@
Summary: Font configuration and customization library
Name: fontconfig
Version: 2.8.0
-Release: 5%{?dist}
+Release: 6%{?dist}
License: MIT
Group: System Environment/Libraries
Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -13,11 +13,14 @@ Source1: 25-no-bitmap-fedora.conf
Patch0: fontconfig-2.8.0-sleep-less.patch
Patch1: fontconfig-2.8.0-dingbats.patch
+Patch2: fontconfig-orth-updates.patch
+Patch3: fontconfig-drop-apple-roman-support.patch
BuildRequires: gawk
BuildRequires: expat-devel
BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: perl
+BuildRequires: autoconf automake libtool
PreReq: freetype >= %{freetype_version}, coreutils
# Hebrew fonts referenced in fonts.conf changed names in fonts-hebrew-0.100
@@ -49,9 +52,13 @@ will use fontconfig.
%setup -q
%patch0 -p1 -b .sleep-less
%patch1 -p1 -b .dingbats
+%patch2 -p1 -b .orth-updates
+%patch3 -p1 -b .apple-roman
%build
+autoreconf
+
# We don't want to rebuild the docs, but we want to install the included ones.
export HASDOCBOOK=no
@@ -133,6 +140,10 @@ fi
%{_mandir}/man3/*
%changelog
+* Fri Mar 23 2012 Akira TAGOH <tagoh at redhat.com> - 2.8.0-6
+- Updates orth files. (#790471, #790460, #757985, #586763)
+- Drop the apple roman cmap support. (#681808)
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list