restored

12 files changed, 922 insertions, 0 deletions

diff --git a/media-libs/fontconfig/files/patch/fontconfig-0.0.1.020826.1330-blacklist.patch b/media-libs/fontconfig/files/patch/fontconfig-0.0.1.020826.1330-blacklist.patch
new file mode 100644
index 000000000000..43eb110a7df9
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-0.0.1.020826.1330-blacklist.patch
@@ -0,0 +1,53 @@
+--- fontconfig/src/fcdir.c.blacklist	Mon Aug 26 15:57:40 2002
++++ fontconfig/src/fcdir.c	Fri Aug 30 14:59:05 2002
+@@ -150,6 +150,40 @@
+     return ret;
+ }
+ 
++static FcBool
++FcBlackListed (const char *name)
++{
++    static const char * const black_listed_names[] = {
++	"hrger.pfa",
++	"hrgrr.pfa",
++	"hritr.pfa",
++	"hrpld.pfa",
++	"hrpldi.pfa",
++	"hrplt.pfa",
++	"hrplti.pfa",
++	"hrscc.pfa",
++	"hrscs.pfa",
++	"u003043t.gsf",
++	"u004006t.gsf"
++    };
++
++    int low = 0;
++    int high = sizeof(black_listed_names) / sizeof(black_listed_names[0]) - 1;
++
++    while (low <= high) {
++	int mid = (low + high) / 2;
++	int res = strcmp (name, black_listed_names[mid]);
++	if (res == 0)
++	    return FcTrue;
++	else if (res < 0)
++	    high = mid - 1;
++	else
++	    low = mid + 1;
++    }
++
++    return FcFalse;
++}
++
+ #define FC_MAX_FILE_LEN	    4096
+ 
+ FcBool
+@@ -201,7 +235,8 @@
+     }
+     while (ret && (e = readdir (d)))
+     {
+-	if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN)
++	if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN &&
++	    !FcBlackListed (e->d_name))
+ 	{
+ 	    strcpy ((char *) base, (char *) e->d_name);
+ 	    ret = FcFileScan (set, dirs, cache, blanks, file, force);
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.0-defaultconfig.patch b/media-libs/fontconfig/files/patch/fontconfig-2.0-defaultconfig.patch
new file mode 100644
index 000000000000..d4c39806a75d
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.0-defaultconfig.patch
@@ -0,0 +1,93 @@
+--- fontconfig/fonts.conf.in.defaultconfig	Mon Aug 19 15:31:59 2002
++++ fontconfig/fonts.conf.in	Mon Sep  2 23:32:37 2002
+@@ -170,45 +170,78 @@
+ 	<alias>
+ 		<family>serif</family>
+ 		<prefer>
+-			<family>Times New Roman</family>
+ 			<family>Nimbus Roman No9 L</family>
+ 			<family>Luxi Serif</family>
+-			<family>Times</family>
+ 			<family>Kochi Mincho</family>
++			<family>ZYSong18030</family>
+ 			<family>AR PL SungtiL GB</family>
+ 			<family>AR PL Mingti2L Big5</family>
+ 			<family>Baekmuk Batang</family>			
++			<family>Times New Roman</family>
++			<family>Times</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>sans-serif</family>
+ 		<prefer>
+-			<family>Verdana</family>
+-			<family>Nimbus Sans L</family>
+ 			<family>Luxi Sans</family>
+-			<family>Arial</family>
++			<family>Nimbus Sans L</family>
+ 			<family>Helvetica</family>
+ 			<family>Kochi Gothic</family>
+-			<family>AR PL KaitiM GB</family>
+-			<family>AR PL KaitiM Big5</family>
+-			<family>Baekmuk Dotum</family>
++			<family>ZYSong18030</family>
++			<family>AR PL SungtiL GB</family>
++			<family>AR PL Mingti2L Big5</family>
++			<family>Baekmuk Gulim</family>
++			<family>Verdana</family>
++			<family>Arial</family>
+ 			<family>SimSun</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>monospace</family>
+ 		<prefer>
+-			<family>Andale Mono</family>
+-			<family>Courier New</family>
+ 			<family>Luxi Mono</family>
+ 			<family>Nimbus Mono L</family>
+ 			<family>Kochi Gothic</family>
+-			<family>AR PL KaitiM GB</family>
+-			<family>Baekmuk Dotum</family>
++			<family>ZYSong18030</family>
++			<family>AR PL SungtiL GB</family>
++			<family>AR PL Mingti2L Big5</family>
++			<family>Baekmuk Gulim</family>
++			<family>Andale Mono</family>
++			<family>Courier New</family>
+ 		</prefer>
+ 	</alias>
+ 
+ <!-- 
++ We can't hint CJK fonts well, so turn off hinting for CJK fonts.
++ -->
++
++	<match target="font">
++		<test name="lang" compare="contains">
++			<string>ja</string>
++		</test>
++		<edit name="hinting" mode="assign">
++			<bool>false</bool>
++		</edit>
++	</match>
++	<match target="font">
++		<test name="lang" compare="contains">
++			<string>ko</string>
++		</test>
++		<edit name="hinting" mode="assign">
++			<bool>false</bool>
++		</edit>
++	</match>
++	<match target="font">
++		<test name="lang" compare="contains">
++			<string>zh</string>
++		</test>
++		<edit name="hinting" mode="assign">
++			<bool>false</bool>
++		</edit>
++	</match>
++
++<!-- 
+  Artificial oblique for fonts without an italic or oblique version
+  -->
+  
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.0-x11fontpath-date-configure.patch b/media-libs/fontconfig/files/patch/fontconfig-2.0-x11fontpath-date-configure.patch
new file mode 100644
index 000000000000..3684418231e6
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.0-x11fontpath-date-configure.patch
@@ -0,0 +1,26 @@
+diff -ur fcpackage.2_0.old/fontconfig/fonts.conf.in fcpackage.2_0/fontconfig/fonts.conf.in
+--- fcpackage.2_0.old/fontconfig/fonts.conf.in	2002-11-26 00:53:47.000000000 +0100
++++ fcpackage.2_0/fontconfig/fonts.conf.in	2002-11-26 01:06:26.000000000 +0100
+@@ -20,7 +20,6 @@
+   Common X11R6 font directories
+ -->
+ 
+-	<dir>/usr/X11R6/lib/X11/fonts</dir>
+  	<dir>/usr/share/fonts</dir>
+ 	<dir>~/.fonts</dir>
+ 
+diff -ur fcpackage.2_0.old/fontconfig/setfontdirs fcpackage.2_0/fontconfig/setfontdirs
+--- fcpackage.2_0.old/fontconfig/setfontdirs	2002-11-26 00:53:47.000000000 +0100
++++ fcpackage.2_0/fontconfig/setfontdirs	2002-11-26 00:55:00.000000000 +0100
+@@ -11,10 +11,10 @@
+ chmod +w fonts.conf
+ ed fonts.conf << EOF
+ /FONTPATH_END/a
+-<!-- Font directory list configured on `date` -->
+ .
+ +r $FONTDIRS
+ a
++	<dir>/usr/X11R6/lib/X11/fonts</dir>
+ 	<dir>~/.fonts</dir>
+ 
+ .
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.1-cvs-update-20021221.patch b/media-libs/fontconfig/files/patch/fontconfig-2.1-cvs-update-20021221.patch
new file mode 100644
index 000000000000..08e3756b215f
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.1-cvs-update-20021221.patch
@@ -0,0 +1,253 @@
+diff -urN fontconfig.orig/fc-lang/fc-lang.c fontconfig/fc-lang/fc-lang.c
+--- fontconfig.orig/fc-lang/fc-lang.c	2002-08-22 09:36:43.000000000 +0200
++++ fontconfig/fc-lang/fc-lang.c	2002-12-16 11:16:29.000000000 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * $XFree86: xc/lib/fontconfig/fc-lang/fc-lang.c,v 1.3 2002/08/22 07:36:43 keithp Exp $
++ * $XFree86: xc/lib/fontconfig/fc-lang/fc-lang.c,v 1.4 2002/12/14 02:03:58 dawes Exp $
+  *
+  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
+  *
+@@ -165,22 +165,38 @@
+     return FcStrCmpIgnoreCase (*as, *bs);
+ }
+ 
++#define MAX_LANG	    1024
++#define MAX_LANG_SET_MAP    ((MAX_LANG + 31) / 32)
++
++#define BitSet(map, id)   ((map)[(id)>>5] |= ((FcChar32) 1 << ((id) & 0x1f)))
++#define BitGet(map, id)   ((map)[(id)>>5] >> ((id) & 0x1f)) & 1)
++
+ int
+ main (int argc, char **argv)
+ {
+-    char	*files[1024];
+-    FcCharSet	*sets[1024];
+-    int		duplicate[1024];
+-    char	*names[1024];
++    char	*files[MAX_LANG];
++    FcCharSet	*sets[MAX_LANG];
++    int		duplicate[MAX_LANG];
++    int		country[MAX_LANG];
++    char	*names[MAX_LANG];
++    char	*langs[MAX_LANG];
+     FILE	*f;
++    int		ncountry = 0;
+     int		i = 0;
+     FcCharLeaf	**leaves, **sleaves;
+     int		total_leaves = 0;
+     int		l, sl, tl;
++    int		c;
+     char	line[1024];
++    FcChar32	map[MAX_LANG_SET_MAP];
++    int		num_lang_set_map;
+     
+     while (*++argv)
++    {
++	if (i == MAX_LANG)
++	    fatal (*argv, 0, "Too many languages");
+ 	files[i++] = *argv;
++    }
+     files[i] = 0;
+     qsort (files, i, sizeof (char *), compare);
+     i = 0;
+@@ -191,6 +207,10 @@
+ 	    fatal (files[i], 0, strerror (errno));
+ 	sets[i] = scan (f, files[i]);
+ 	names[i] = get_name (files[i]);
++	langs[i] = get_lang(names[i]);
++	if (strchr (langs[i], '-'))
++	    country[ncountry++] = i;
++
+ 	total_leaves += sets[i]->num;
+ 	i++;
+ 	fclose (f);
+@@ -319,10 +339,54 @@
+ 		"      { FC_REF_CONSTANT, %d, "
+ 		"(FcCharLeaf **) leaves_%s, "
+ 		"(FcChar16 *) numbers_%s } },\n",
+-		get_lang(names[i]),
++		langs[i],
+ 		sets[j]->num, names[j], names[j]);
+     }
+     printf ("};\n\n");
++    printf ("#define NUM_LANG_CHAR_SET	%d\n", i);
++    num_lang_set_map = (i + 31) / 32;
++    printf ("#define NUM_LANG_SET_MAP	%d\n", num_lang_set_map);
++    /*
++     * Dump indices with country codes
++     */
++    if (ncountry)
++    {
++	int	ncountry_ent = 0;
++	printf ("\n");
++	printf ("static const FcChar32 fcLangCountrySets[][NUM_LANG_SET_MAP] = {\n");
++	for (c = 0; c < ncountry; c++)
++	{
++	    i = country[c];
++	    if (i >= 0)
++	    {
++		int l = strchr (langs[i], '-') - langs[i];
++		int d, k;
++
++		for (k = 0; k < num_lang_set_map; k++)
++		    map[k] = 0;
++
++		BitSet (map, i);
++		for (d = c + 1; d < ncountry; d++)
++		{
++		    int j = country[d];
++		    if (j >= 0 && !strncmp (langs[j], langs[i], l))
++		    {
++			BitSet(map, j);
++			country[d] = -1;
++		    }
++		}
++		printf ("    {");
++		for (k = 0; k < num_lang_set_map; k++)
++		    printf (" 0x%08x,", map[k]);
++		printf (" }, /* %*.*s */\n",
++			l, l, langs[i]);
++		++ncountry_ent;
++	    }
++	}
++	printf ("};\n\n");
++	printf ("#define NUM_COUNTRY_SET %d\n", ncountry_ent);
++    }
++    
+     while (fgets (line, sizeof (line), stdin))
+ 	fputs (line, stdout);
+     
+diff -urN fontconfig.orig/fc-lang/fclang.h fontconfig/fc-lang/fclang.h
+--- fontconfig.orig/fc-lang/fclang.h	2002-10-21 19:03:47.000000000 +0200
++++ fontconfig/fc-lang/fclang.h	2002-12-16 11:16:29.000000000 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * $XFree86: xc/lib/fontconfig/fc-lang/fclang.h,v 1.20 2002/10/21 17:03:47 keithp Exp $
++ * $XFree86: xc/lib/fontconfig/fc-lang/fclang.h,v 1.21 2002/12/14 02:03:58 dawes Exp $
+  *
+  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
+  *
+@@ -3996,3 +3996,11 @@
+       { FC_REF_CONSTANT, 1, (FcCharLeaf **) leaves_fj, (FcChar16 *) numbers_fj } },
+ };
+ 
++#define NUM_LANG_CHAR_SET	175
++#define NUM_LANG_SET_MAP	6
++
++static const FcChar32 fcLangCountrySets[][NUM_LANG_SET_MAP] = {
++    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003e00, }, /* zh */
++};
++
++#define NUM_COUNTRY_SET 1
+diff -urN fontconfig.orig/fontconfig/fcprivate.h fontconfig/fontconfig/fcprivate.h
+--- fontconfig.orig/fontconfig/fcprivate.h	2002-08-22 09:36:44.000000000 +0200
++++ fontconfig/fontconfig/fcprivate.h	2002-12-05 00:45:28.000000000 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * $XFree86: xc/lib/fontconfig/fontconfig/fcprivate.h,v 1.6 2002/08/22 07:36:44 keithp Exp $
++ * $XFree86: xc/lib/fontconfig/fontconfig/fcprivate.h,v 1.7 2002/12/04 10:28:03 eich Exp $
+  *
+  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+  *
+@@ -87,7 +87,7 @@
+     if (!orig)							    \
+ 	FcPatternDestroy (__p__);				    \
+ _FcPatternVapBuild_bail0:					    \
+-    result = 0;							    \
++    result = (void*)0;						    \
+ 								    \
+ _FcPatternVapBuild_return:					    \
+     ;								    \
+diff -urN fontconfig.orig/setfontdirs fontconfig/setfontdirs
+--- fontconfig.orig/setfontdirs	2002-08-01 18:17:33.000000000 +0200
++++ fontconfig/setfontdirs	2002-12-20 08:29:39.000000000 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ #
+-# $XFree86: xc/lib/fontconfig/setfontdirs,v 1.4 2002/08/01 16:17:33 keithp Exp $
++# $XFree86: xc/lib/fontconfig/setfontdirs,v 1.5 2002/12/17 03:26:36 dawes Exp $
+ #
+ LANG=C
+ export LANG
+@@ -9,7 +9,17 @@
+ sh ./findfonts ${1+"$@"} > $FONTDIRS
+ cp fonts.conf.in fonts.conf
+ chmod +w fonts.conf
+-ed fonts.conf << EOF
++EDITOR=ed
++(echo q | ed) > /dev/null 2>&1
++if [ $? -ne 0 ]; then
++	EDITOR=ex
++	(echo q | ex) > /dev/null 2>&1
++	if [ $? -ne 0 ]; then
++		echo "$0: *** Error: Cannot find 'ed' or 'ex' editor"
++		exit 1
++	fi
++fi
++$EDITOR fonts.conf << EOF
+ /FONTPATH_END/a
+ <!-- Font directory list configured on `date` -->
+ .
+diff -urN fontconfig.orig/src/fclang.c fontconfig/src/fclang.c
+--- fontconfig.orig/src/fclang.c	2002-08-27 01:34:31.000000000 +0200
++++ fontconfig/src/fclang.c	2002-12-16 11:16:29.000000000 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * $XFree86: xc/lib/fontconfig/src/fclang.c,v 1.7 2002/08/26 23:34:31 keithp Exp $
++ * $XFree86: xc/lib/fontconfig/src/fclang.c,v 1.8 2002/12/14 02:03:59 dawes Exp $
+  *
+  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
+  *
+@@ -31,9 +31,6 @@
+ 
+ #include "../fc-lang/fclang.h"
+ 
+-#define NUM_LANG_CHAR_SET   (sizeof (fcLangCharSets) / sizeof (fcLangCharSets[0]))
+-#define NUM_LANG_SET_MAP    ((NUM_LANG_CHAR_SET + 31) / 32)
+-
+ struct _FcLangSet {
+     FcChar32	map[NUM_LANG_SET_MAP];
+     FcStrSet	*extra;
+@@ -339,13 +336,21 @@
+ FcLangResult
+ FcLangSetCompare (const FcLangSet *lsa, const FcLangSet *lsb)
+ {
+-    int		    i;
++    int		    i, j;
+     FcLangResult    best, r;
+ 
+     for (i = 0; i < NUM_LANG_SET_MAP; i++)
+ 	if (lsa->map[i] & lsb->map[i])
+ 	    return FcLangEqual;
+     best = FcLangDifferentLang;
++    for (j = 0; j < NUM_COUNTRY_SET; j++)
++	for (i = 0; i < NUM_LANG_SET_MAP; i++)
++	    if ((lsa->map[i] & fcLangCountrySets[j][i]) &&
++		(lsb->map[i] & fcLangCountrySets[j][i]))
++	    {
++		best = FcLangDifferentCountry;
++		break;
++	    }
+     if (lsa->extra)
+     {
+ 	r = FcLangSetCompareStrSet (lsb, lsa->extra);
+diff -urN fontconfig.orig/src/fcstr.c fontconfig/src/fcstr.c
+--- fontconfig.orig/src/fcstr.c	2002-09-01 00:17:32.000000000 +0200
++++ fontconfig/src/fcstr.c	2002-12-16 11:16:29.000000000 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * $XFree86: xc/lib/fontconfig/src/fcstr.c,v 1.10 2002/08/31 22:17:32 keithp Exp $
++ * $XFree86: xc/lib/fontconfig/src/fcstr.c,v 1.11 2002/12/14 01:59:38 dawes Exp $
+  *
+  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+  *
+@@ -283,7 +283,7 @@
+ 	if ((b & 0xfc00) != 0xdc00)
+ 	    return 0;
+ 	result = ((((FcChar32) a & 0x3ff) << 10) |
+-		  ((FcChar32) b & 0x3ff)) | 0x10000;
++		  ((FcChar32) b & 0x3ff)) + 0x10000;
+     }
+     else
+ 	result = a;
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.1-fixedwidth.patch b/media-libs/fontconfig/files/patch/fontconfig-2.1-fixedwidth.patch
new file mode 100644
index 000000000000..1228d36170c5
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.1-fixedwidth.patch
@@ -0,0 +1,52 @@
+diff -u -r1.18 -r1.20
+--- fontconfig/fonts.conf.in	2003/02/24 17:18:50	1.18
++++ fontconfig/fonts.conf.in	2003/02/27 08:12:13	1.20
+@@ -140,6 +140,31 @@
+ 	</match>
+ 	
+ <!--
++  Some Asian fonts misadvertise themselves as monospaced when
++  in fact they are dual-spaced (half and full).  This makes
++  FreeType very confused as it forces all widths to match.
++  Undo this magic by disabling the width forcing code -->
++	<match target="font">
++		<test name="family"><string>GulimChe</string></test>
++		<edit name="globaladvance"><bool>false</bool></edit>
++	</match>
++	
++	<match target="font">
++		<test name="family"><string>DotumChe</string></test>
++		<edit name="globaladvance"><bool>false</bool></edit>
++	</match>
++
++	<match target="font">
++		<test name="family"><string>BatangChe</string></test>
++		<edit name="globaladvance"><bool>false</bool></edit>
++	</match>
++
++	<match target="font">
++		<test name="family"><string>GungsuhChe</string></test>
++		<edit name="globaladvance"><bool>false</bool></edit>
++	</match>
++
++<!--
+   Load per-user customization file
+ -->
+ 	<include ignore_missing="yes">~/.fonts.conf</include>
+diff -u -r1.13 -r1.14
+--- fontconfig/src/fcfreetype.c	2003/02/06 17:46:06	1.13
++++ fontconfig/src/fcfreetype.c	2003/02/27 07:04:59	1.14
+@@ -467,7 +467,12 @@
+     if (!FcPatternAddString (pat, FC_SOURCE, (FcChar8 *) "FreeType"))
+ 	goto bail1;
+ 
+-#if 1
++#if 0
++    /*
++     * don't even try this -- CJK 'monospace' fonts are really
++     * dual width, and most other fonts don't bother to set
++     * the attribute.  Sigh.
++     */
+     if ((face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) != 0)
+ 	if (!FcPatternAddInteger (pat, FC_SPACING, FC_MONO))
+ 	    goto bail1;
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.1-slighthint.patch b/media-libs/fontconfig/files/patch/fontconfig-2.1-slighthint.patch
new file mode 100644
index 000000000000..b26785aac5db
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.1-slighthint.patch
@@ -0,0 +1,57 @@
+--- fontconfig/fontconfig/fontconfig.h.slighthint	Sun Aug 11 14:10:41 2002
++++ fontconfig/fontconfig/fontconfig.h	Mon Aug 12 16:23:51 2002
+@@ -55,6 +55,7 @@
+ #define FC_FOUNDRY	    "foundry"		/* String */
+ #define FC_ANTIALIAS	    "antialias"		/* Bool (depends) */
+ #define FC_HINTING	    "hinting"		/* Bool (true) */
++#define FC_HINT_STYLE	    "hintstyle"		/* Int */
+ #define FC_VERTICAL_LAYOUT  "verticallayout"	/* Bool (false) */
+ #define FC_AUTOHINT	    "autohint"		/* Bool (false) */
+ #define FC_GLOBAL_ADVANCE   "globaladvance"	/* Bool (true) */
+@@ -102,6 +103,12 @@
+ #define FC_RGBA_VRGB	    3
+ #define FC_RGBA_VBGR	    4
+ 
++/* hinting style */
++#define FC_HINT_NONE        0
++#define FC_HINT_SLIGHT      1
++#define FC_HINT_MEDIUM      2
++#define FC_HINT_FULL        3
++ 
+ typedef enum _FcType {
+     FcTypeVoid, 
+     FcTypeInteger, 
+--- fontconfig/src/fcdefault.c.slighthint	Tue Jul  9 18:08:14 2002
++++ fontconfig/src/fcdefault.c	Mon Aug 12 16:22:01 2002
+@@ -137,4 +137,9 @@
+ 		FcPatternAddString (pattern, FC_LANG, (FcChar8 *) lang);
+ 	}
+     }
++
++    if (FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch)
++    {
++	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
++    }
+ }
+--- fontconfig/src/fcname.c.slighthint	Sun Aug 11 14:10:42 2002
++++ fontconfig/src/fcname.c	Mon Aug 12 16:24:28 2002
+@@ -40,6 +40,7 @@
+     { FC_FOUNDRY,	FcTypeString, },
+ /*    { FC_CORE,		FcTypeBool, }, */
+     { FC_ANTIALIAS,	FcTypeBool, },
++    { FC_HINT_STYLE,    FcTypeInteger, },
+     { FC_HINTING,	FcTypeBool, },
+     { FC_VERTICAL_LAYOUT,   FcTypeBool, },
+     { FC_AUTOHINT,	FcTypeBool, },
+@@ -158,6 +158,11 @@
+     { (FcChar8 *) "vrgb",	    "rgba",	    FC_RGBA_VRGB },
+     { (FcChar8 *) "vbgr",	    "rgba",	    FC_RGBA_VBGR },
+     { (FcChar8 *) "none",	    "rgba",	    FC_RGBA_NONE },
++	
++    { (FcChar8 *) "hintnone",	    "hintstyle",   FC_HINT_NONE },
++    { (FcChar8 *) "hintslight",	    "hintstyle",   FC_HINT_SLIGHT },
++    { (FcChar8 *) "hintmedium",	    "hintstyle",   FC_HINT_MEDIUM },
++    { (FcChar8 *) "hintfull",	    "hintstyle",   FC_HINT_FULL },
+ };
+ 
+ #define NUM_FC_CONSTANTS   (sizeof _FcBaseConstants/sizeof _FcBaseConstants[0])
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure-v2.patch b/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure-v2.patch
new file mode 100644
index 000000000000..0e8425744a0e
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure-v2.patch
@@ -0,0 +1,23 @@
+--- fcpackage.2_1/fontconfig/setfontdirs.orig	2002-12-23 11:38:24.000000000 +0200
++++ fcpackage.2_1/fontconfig/setfontdirs	2002-12-23 11:40:02.000000000 +0200
+@@ -6,7 +6,7 @@
+ export LANG
+ FONTDIRS=fontdirs$$
+ trap "rm $FONTDIRS" 0
+-sh ./findfonts ${1+"$@"} > $FONTDIRS
++sh ./findfonts ${1+"$@"} | awk '!/\/usr\/X11R6\/lib\/X11\/fonts/ { print }' > $FONTDIRS
+ cp fonts.conf.in fonts.conf
+ chmod +w fonts.conf
+ EDITOR=ed
+@@ -21,10 +21,10 @@
+ fi
+ $EDITOR fonts.conf << EOF
+ /FONTPATH_END/a
+-<!-- Font directory list configured on `date` -->
+ .
+ +r $FONTDIRS
+ a
++	<dir>/usr/X11R6/lib/X11/fonts</dir>
+ 	<dir>~/.fonts</dir>
+ 
+ .
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure.patch b/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure.patch
new file mode 100644
index 000000000000..9e15ddd4afa8
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.1-x11fontpath-date-configure.patch
@@ -0,0 +1,20 @@
+--- fcpackage.2_1/fontconfig/setfontdirs.orig	2002-08-01 18:17:33.000000000 +0200
++++ fcpackage.2_1/fontconfig/setfontdirs	2002-12-11 21:31:37.000000000 +0200
+@@ -6,15 +6,15 @@
+ export LANG
+ FONTDIRS=fontdirs$$
+ trap "rm $FONTDIRS" 0
+-sh ./findfonts ${1+"$@"} > $FONTDIRS
++sh ./findfonts ${1+"$@"} |awk '!/\/usr\/X11R6\/lib\/X11\/fonts/ { print }' > $FONTDIRS
+ cp fonts.conf.in fonts.conf
+ chmod +w fonts.conf
+ ed fonts.conf << EOF
+ /FONTPATH_END/a
+-<!-- Font directory list configured on `date` -->
+ .
+ +r $FONTDIRS
+ a
++	<dir>/usr/X11R6/lib/X11/fonts</dir>
+ 	<dir>~/.fonts</dir>
+ 
+ .
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2-blacklist.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2-blacklist.patch
new file mode 100644
index 000000000000..bd181c33bdf3
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.2-blacklist.patch
@@ -0,0 +1,54 @@
+--- fontconfig/src/fcdir.c.blacklist	Mon Aug 26 15:57:40 2002
++++ fontconfig/src/fcdir.c	Fri Aug 30 14:59:05 2002
+@@ -150,6 +150,41 @@
+     return ret;
+ }
+ 
++static FcBool
++FcBlackListed (const char *name)
++{
++    static const char * const black_listed_names[] = {
++	"bodt.ttf",
++	"hrger.pfa",
++	"hrgrr.pfa",
++	"hritr.pfa",
++	"hrpld.pfa",
++	"hrpldi.pfa",
++	"hrplt.pfa",
++	"hrplti.pfa",
++	"hrscc.pfa",
++	"hrscs.pfa",
++	"u003043t.gsf",
++	"u004006t.gsf"
++    };
++
++    int low = 0;
++    int high = sizeof(black_listed_names) / sizeof(black_listed_names[0]) - 1;
++
++    while (low <= high) {
++	int mid = (low + high) / 2;
++	int res = strcmp (name, black_listed_names[mid]);
++	if (res == 0)
++	    return FcTrue;
++	else if (res < 0)
++	    high = mid - 1;
++	else
++	    low = mid + 1;
++    }
++
++    return FcFalse;
++}
++
+ #define FC_MAX_FILE_LEN	    4096
+ 
+ FcBool
+@@ -201,7 +235,8 @@
+     }
+     while (ret && (e = readdir (d)))
+     {
+-	if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN)
++	if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN &&
++	    !FcBlackListed (e->d_name))
+ 	{
+ 	    strcpy ((char *) base, (char *) e->d_name);
+ 	    ret = FcFileScan (set, dirs, cache, blanks, file, force);
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir-r1.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir-r1.patch
new file mode 100644
index 000000000000..ee0219f0d279
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.2-local_fontdir-r1.patch
@@ -0,0 +1,13 @@
+diff -ur fontconfig-2.1.94/fonts.conf.in fontconfig-2.1.94.patched/fonts.conf.in
+--- fontconfig-2.1.94/fonts.conf.in	2003-04-16 23:57:38.000000000 +0200
++++ fontconfig-2.1.94.patched/fonts.conf.in	2003-04-18 02:59:54.000000000 +0200
+@@ -25,6 +25,9 @@
+ 
+ 	<dir>@FC_DEFAULT_FONTS@</dir>
+ 	@FC_FONTPATH@
++	<dir>/usr/share/fonts</dir>
++	<dir>/usr/X11R6/lib/X11/fonts/75dpi</dir>
++	<dir>/usr/X11R6/lib/X11/fonts/100dpi</dir>
+ 	<dir>~/.fonts</dir>
+ 
+ <!--
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2-remove_subpixel_test.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2-remove_subpixel_test.patch
new file mode 100644
index 000000000000..8fc51a705f50
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.2-remove_subpixel_test.patch
@@ -0,0 +1,13 @@
+diff -ur fontconfig-2.2.0/local.conf fontconfig-2.2.0.patched/local.conf
+--- fontconfig-2.2.0/local.conf	2003-04-04 22:17:40.000000000 +0200
++++ fontconfig-2.2.0.patched/local.conf	2003-05-14 18:48:16.000000000 +0200
+@@ -5,9 +5,6 @@
+ <!--
+   Enable sub-pixel rendering
+ 	<match target="font">
+-		<test qual="all" name="rgba">
+-			<const>unknown</const>
+-		</test>
+ 		<edit name="rgba" mode="assign"><const>rgb</const></edit>
+ 	</match>
+ -->
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.2.0-cvs_bugfixes.patch b/media-libs/fontconfig/files/patch/fontconfig-2.2.0-cvs_bugfixes.patch
new file mode 100644
index 000000000000..b99d26a265c8
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.2.0-cvs_bugfixes.patch
@@ -0,0 +1,265 @@
+Only in fontconfig: .cvsignore
+Only in fontconfig: CVS
+diff -ur -I '$Id' fontconfig-2.2.0/ChangeLog fontconfig/ChangeLog
+--- fontconfig-2.2.0/ChangeLog	2003-04-17 19:43:04.000000000 +0200
++++ fontconfig/ChangeLog	2003-04-23 06:09:56.000000000 +0200
+@@ -1,3 +1,11 @@
++2003-04-23  James Henstridge  <james@daa.com.au>
++
++	* doc/fontconfig-devel.sgml: close the <para> element.
++
++	* doc/fcpattern.fncs: close the <para> element.
++
++	* doc/func.sgml: close the <refsynopsisdiv> element.
++
+ 2003-04-17  Colin Walters <walters@debian.org>
+ 
+ 	+ Remove some unused variables, and initialize some other ones so
+Only in fontconfig-2.2.0: Makefile.in
+Only in fontconfig-2.2.0: aclocal.m4
+Only in fontconfig: autogen.sh
+Only in fontconfig: config
+Only in fontconfig-2.2.0: config.guess
+Only in fontconfig-2.2.0: config.h.in
+Only in fontconfig-2.2.0: config.sub
+Only in fontconfig-2.2.0: configure
+Only in fontconfig: debian
+Only in fontconfig/doc: .cvsignore
+Only in fontconfig/doc: CVS
+Only in fontconfig-2.2.0/doc: FcAtomicCreate.3
+Only in fontconfig-2.2.0/doc: FcAtomicDeleteNew.3
+Only in fontconfig-2.2.0/doc: FcAtomicDestroy.3
+Only in fontconfig-2.2.0/doc: FcAtomicLock.3
+Only in fontconfig-2.2.0/doc: FcAtomicNewFile.3
+Only in fontconfig-2.2.0/doc: FcAtomicOrigFile.3
+Only in fontconfig-2.2.0/doc: FcAtomicReplaceOrig.3
+Only in fontconfig-2.2.0/doc: FcAtomicUnlock.3
+Only in fontconfig-2.2.0/doc: FcBlanksAdd.3
+Only in fontconfig-2.2.0/doc: FcBlanksCreate.3
+Only in fontconfig-2.2.0/doc: FcBlanksDestroy.3
+Only in fontconfig-2.2.0/doc: FcBlanksIsMember.3
+Only in fontconfig-2.2.0/doc: FcCharSetAddChar.3
+Only in fontconfig-2.2.0/doc: FcCharSetCopy.3
+Only in fontconfig-2.2.0/doc: FcCharSetCount.3
+Only in fontconfig-2.2.0/doc: FcCharSetCreate.3
+Only in fontconfig-2.2.0/doc: FcCharSetDestroy.3
+Only in fontconfig-2.2.0/doc: FcCharSetEqual.3
+Only in fontconfig-2.2.0/doc: FcCharSetFirstPage.3
+Only in fontconfig-2.2.0/doc: FcCharSetHasChar.3
+Only in fontconfig-2.2.0/doc: FcCharSetIntersect.3
+Only in fontconfig-2.2.0/doc: FcCharSetIntersectCount.3
+Only in fontconfig-2.2.0/doc: FcCharSetIsSubset.3
+Only in fontconfig-2.2.0/doc: FcCharSetNextPage.3
+Only in fontconfig-2.2.0/doc: FcCharSetSubtract.3
+Only in fontconfig-2.2.0/doc: FcCharSetSubtractCount.3
+Only in fontconfig-2.2.0/doc: FcCharSetUnion.3
+Only in fontconfig-2.2.0/doc: FcConfigAppFontAddDir.3
+Only in fontconfig-2.2.0/doc: FcConfigAppFontAddFile.3
+Only in fontconfig-2.2.0/doc: FcConfigAppFontClear.3
+Only in fontconfig-2.2.0/doc: FcConfigBuildFonts.3
+Only in fontconfig-2.2.0/doc: FcConfigCreate.3
+Only in fontconfig-2.2.0/doc: FcConfigDestroy.3
+Only in fontconfig-2.2.0/doc: FcConfigFilename.3
+Only in fontconfig-2.2.0/doc: FcConfigGetBlanks.3
+Only in fontconfig-2.2.0/doc: FcConfigGetCache.3
+Only in fontconfig-2.2.0/doc: FcConfigGetConfigDirs.3
+Only in fontconfig-2.2.0/doc: FcConfigGetConfigFiles.3
+Only in fontconfig-2.2.0/doc: FcConfigGetCurrent.3
+Only in fontconfig-2.2.0/doc: FcConfigGetFontDirs.3
+Only in fontconfig-2.2.0/doc: FcConfigGetFonts.3
+Only in fontconfig-2.2.0/doc: FcConfigGetRescanInverval.3
+Only in fontconfig-2.2.0/doc: FcConfigParseAndLoad.3
+Only in fontconfig-2.2.0/doc: FcConfigSetCurrent.3
+Only in fontconfig-2.2.0/doc: FcConfigSetRescanInverval.3
+Only in fontconfig-2.2.0/doc: FcConfigSubstitute.3
+Only in fontconfig-2.2.0/doc: FcConfigSubstituteWithPat.3
+Only in fontconfig-2.2.0/doc: FcConfigUptoDate.3
+Only in fontconfig-2.2.0/doc: FcDefaultSubstitute.3
+Only in fontconfig-2.2.0/doc: FcDirCacheValid.3
+Only in fontconfig-2.2.0/doc: FcDirSave.3
+Only in fontconfig-2.2.0/doc: FcDirScan.3
+Only in fontconfig-2.2.0/doc: FcFileScan.3
+Only in fontconfig-2.2.0/doc: FcFontList.3
+Only in fontconfig-2.2.0/doc: FcFontMatch.3
+Only in fontconfig-2.2.0/doc: FcFontRenderPrepare.3
+Only in fontconfig-2.2.0/doc: FcFontSetAdd.3
+Only in fontconfig-2.2.0/doc: FcFontSetCreate.3
+Only in fontconfig-2.2.0/doc: FcFontSetDestroy.3
+Only in fontconfig-2.2.0/doc: FcFontSort.3
+Only in fontconfig-2.2.0/doc: FcFreeTypeCharIndex.3
+Only in fontconfig-2.2.0/doc: FcFreeTypeCharSet.3
+Only in fontconfig-2.2.0/doc: FcFreeTypeQuery.3
+Only in fontconfig-2.2.0/doc: FcGetVersion.3
+Only in fontconfig-2.2.0/doc: FcInit.3
+Only in fontconfig-2.2.0/doc: FcInitBringUptoDate.3
+Only in fontconfig-2.2.0/doc: FcInitLoadConfig.3
+Only in fontconfig-2.2.0/doc: FcInitLoadConfigAndFonts.3
+Only in fontconfig-2.2.0/doc: FcInitReinitialize.3
+Only in fontconfig-2.2.0/doc: FcMatrixCopy.3
+Only in fontconfig-2.2.0/doc: FcMatrixEqual.3
+Only in fontconfig-2.2.0/doc: FcMatrixInit.3
+Only in fontconfig-2.2.0/doc: FcMatrixMultiply.3
+Only in fontconfig-2.2.0/doc: FcMatrixRotate.3
+Only in fontconfig-2.2.0/doc: FcMatrixScale.3
+Only in fontconfig-2.2.0/doc: FcMatrixShear.3
+Only in fontconfig-2.2.0/doc: FcNameConstant.3
+Only in fontconfig-2.2.0/doc: FcNameGetConstant.3
+Only in fontconfig-2.2.0/doc: FcNameGetObjectType.3
+Only in fontconfig-2.2.0/doc: FcNameParse.3
+Only in fontconfig-2.2.0/doc: FcNameRegisterConstants.3
+Only in fontconfig-2.2.0/doc: FcNameRegisterObjectTypes.3
+Only in fontconfig-2.2.0/doc: FcNameUnparse.3
+Only in fontconfig-2.2.0/doc: FcNameUnregisterConstants.3
+Only in fontconfig-2.2.0/doc: FcNameUnregisterObjectTypes.3
+Only in fontconfig-2.2.0/doc: FcObjectSetAdd.3
+Only in fontconfig-2.2.0/doc: FcObjectSetBuild.3
+Only in fontconfig-2.2.0/doc: FcObjectSetCreate.3
+Only in fontconfig-2.2.0/doc: FcObjectSetDestroy.3
+Only in fontconfig-2.2.0/doc: FcPatternAdd-Type.3
+Only in fontconfig-2.2.0/doc: FcPatternAdd.3
+Only in fontconfig-2.2.0/doc: FcPatternAddWeak.3
+Only in fontconfig-2.2.0/doc: FcPatternBuild.3
+Only in fontconfig-2.2.0/doc: FcPatternCreate.3
+Only in fontconfig-2.2.0/doc: FcPatternDel.3
+Only in fontconfig-2.2.0/doc: FcPatternDestroy.3
+Only in fontconfig-2.2.0/doc: FcPatternEqual.3
+Only in fontconfig-2.2.0/doc: FcPatternEqualSubset.3
+Only in fontconfig-2.2.0/doc: FcPatternGet-Type.3
+Only in fontconfig-2.2.0/doc: FcPatternGet.3
+Only in fontconfig-2.2.0/doc: FcPatternHash.3
+Only in fontconfig-2.2.0/doc: FcPatternPrint.3
+Only in fontconfig-2.2.0/doc: FcStrBasename.3
+Only in fontconfig-2.2.0/doc: FcStrCmpIgnoreCase.3
+Only in fontconfig-2.2.0/doc: FcStrCopy.3
+Only in fontconfig-2.2.0/doc: FcStrCopyFilename.3
+Only in fontconfig-2.2.0/doc: FcStrDirname.3
+Only in fontconfig-2.2.0/doc: FcStrListCreate.3
+Only in fontconfig-2.2.0/doc: FcStrListDone.3
+Only in fontconfig-2.2.0/doc: FcStrListNext.3
+Only in fontconfig-2.2.0/doc: FcStrSetAdd.3
+Only in fontconfig-2.2.0/doc: FcStrSetAddFilename.3
+Only in fontconfig-2.2.0/doc: FcStrSetCreate.3
+Only in fontconfig-2.2.0/doc: FcStrSetDel.3
+Only in fontconfig-2.2.0/doc: FcStrSetDestroy.3
+Only in fontconfig-2.2.0/doc: FcStrSetMember.3
+Only in fontconfig-2.2.0/doc: FcUcs4ToUtf8.3
+Only in fontconfig-2.2.0/doc: FcUtf16Len.3
+Only in fontconfig-2.2.0/doc: FcUtf16ToUcs4.3
+Only in fontconfig-2.2.0/doc: FcUtf8Len.3
+Only in fontconfig-2.2.0/doc: FcUtf8ToUcs4.3
+Only in fontconfig-2.2.0/doc: FcValueDestroy.3
+Only in fontconfig-2.2.0/doc: FcValueSave.3
+Only in fontconfig-2.2.0/doc: Makefile.in
+diff -ur -I '$Id' fontconfig-2.2.0/doc/fcpattern.fncs fontconfig/doc/fcpattern.fncs
+--- fontconfig-2.2.0/doc/fcpattern.fncs	2003-03-07 09:51:14.000000000 +0100
++++ fontconfig/doc/fcpattern.fncs	2003-04-23 06:09:56.000000000 +0200
+@@ -226,6 +226,7 @@
+ @DESC@
+ Builds a pattern using a list of objects, types and values.  Each
+ value to be entered in the pattern is specified with three arguments:
++</para>
+ <orderedlist>
+ <listitem><para>
+ Object name, a string describing the property to be added.
+Only in fontconfig-2.2.0/doc: fontconfig-devel
+diff -ur -I '$Id' fontconfig-2.2.0/doc/fontconfig-devel.sgml fontconfig/doc/fontconfig-devel.sgml
+--- fontconfig-2.2.0/doc/fontconfig-devel.sgml	2003-03-07 21:45:31.000000000 +0100
++++ fontconfig/doc/fontconfig-devel.sgml	2003-04-23 06:09:56.000000000 +0200
+@@ -476,6 +476,7 @@
+     <para>
+ These routines work with font files and directories, including font
+ directory cache files.
++    </para>
+     &fcfile;
+   </sect2>
+   <sect2><title>FcStrSet and FcStrList</title>
+Only in fontconfig-2.2.0/doc: fontconfig-devel.txt
+Only in fontconfig-2.2.0/doc: fontconfig-user.html
+Only in fontconfig-2.2.0/doc: fontconfig-user.txt
+Only in fontconfig-2.2.0/doc: fonts-conf.5
+diff -ur -I '$Id' fontconfig-2.2.0/doc/func.sgml fontconfig/doc/func.sgml
+--- fontconfig-2.2.0/doc/func.sgml	2003-03-07 21:50:44.000000000 +0100
++++ fontconfig/doc/func.sgml	2003-04-23 06:09:56.000000000 +0200
+@@ -76,6 +76,7 @@
+ 	</funcprototype>
+ @}PROTOTYPE@
+ 	</funcsynopsis>
++	</refsynopsisdiv>
+ 	<refsect1><title>Description</title>
+ 	    <para>
+ @DESC@
+Only in fontconfig/fc-cache: .cvsignore
+Only in fontconfig/fc-cache: CVS
+Only in fontconfig-2.2.0/fc-cache: Makefile.in
+Only in fontconfig/fc-lang: .cvsignore
+Only in fontconfig/fc-lang: CVS
+Only in fontconfig-2.2.0/fc-lang: Makefile.in
+Only in fontconfig/fc-lang: fc-lang.man
+Only in fontconfig-2.2.0/fc-lang: fclang.h
+Only in fontconfig/fc-lang: iso639-1
+Only in fontconfig/fc-lang: iso639-2
+Only in fontconfig/fc-list: .cvsignore
+Only in fontconfig/fc-list: CVS
+Only in fontconfig-2.2.0/fc-list: Makefile.in
+Only in fontconfig/fontconfig: .cvsignore
+Only in fontconfig/fontconfig: CVS
+Only in fontconfig-2.2.0/fontconfig: Makefile.in
+Only in fontconfig-2.2.0: fontconfig.spec
+Only in fontconfig-2.2.0: install-sh
+Only in fontconfig-2.2.0: ltmain.sh
+Only in fontconfig-2.2.0: missing
+Only in fontconfig-2.2.0: mkinstalldirs
+Only in fontconfig/src: .cvsignore
+Only in fontconfig/src: CVS
+Only in fontconfig-2.2.0/src: Makefile.in
+diff -ur -I '$Id' fontconfig-2.2.0/src/fccfg.c fontconfig/src/fccfg.c
+--- fontconfig-2.2.0/src/fccfg.c	2003-04-17 23:50:24.000000000 +0200
++++ fontconfig/src/fccfg.c	2003-04-22 08:29:31.000000000 +0200
+@@ -1232,6 +1232,14 @@
+ 		    !FcStrCmpIgnoreCase ((FcChar8 *) t->field, 
+ 					 (FcChar8 *) e->field))
+ 		{
++		    /* 
++		     * KLUDGE - the pattern may have been reallocated or
++		     * things may have been inserted or deleted above
++		     * this element by other edits.  Go back and find
++		     * the element again
++		     */
++		    if (e != s->edit && st[i].elt)
++			st[i].elt = FcPatternFindElt (p, t->field);
+ 		    if (!st[i].elt)
+ 			t = 0;
+ 		    break;
+diff -ur -I '$Id' fontconfig-2.2.0/src/fcfreetype.c fontconfig/src/fcfreetype.c
+--- fontconfig-2.2.0/src/fcfreetype.c	2003-04-20 05:35:58.000000000 +0200
++++ fontconfig/src/fcfreetype.c	2003-04-30 17:18:02.000000000 +0200
+@@ -156,7 +156,7 @@
+ } FcNoticeFoundries[] = {
+     { (const FcChar8*) "Bigelow",	(const FcChar8 *) "b&h" },
+     { (const FcChar8*) "Adobe",		(const FcChar8 *) "adobe" },
+-    { (const FcChar8*) "Bitstream",	(const FcChar8 *) "bitsteam" },
++    { (const FcChar8*) "Bitstream",	(const FcChar8 *) "bitstream" },
+     { (const FcChar8*) "Monotype",	(const FcChar8 *) "monotype" },
+     { (const FcChar8*) "Linotype",	(const FcChar8 *) "linotype" },
+     { (const FcChar8*) "LINOTYPE-HELL", (const FcChar8 *) "linotype" },
+@@ -769,10 +769,16 @@
+ 		}
+ 	}
+      
++#if 0
++	/* 
++	 * Don't bother with italic_angle; FreeType already extracts that
++	 * information for us and sticks it into style_flags
++	 */
+         if (psfontinfo.italic_angle < 0) 
+             slant = FC_SLANT_ITALIC; 
+         else if (psfontinfo.italic_angle >= 0) 
+             slant = FC_SLANT_ROMAN; 
++#endif
+ 
+         if(!foundry)
+             foundry = FcNoticeFoundry(psfontinfo.notice);
+Only in fontconfig-2.2.0: stamp-h.in
+Only in fontconfig/test: .cvsignore
+Only in fontconfig/test: CVS
+Only in fontconfig-2.2.0/test: Makefile.in