fontmod.patch revision 606
1351N/A# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
1351N/A# Use subject to license terms.
1351N/A#
1351N/A# Permission is hereby granted, free of charge, to any person obtaining a
1351N/A# copy of this software and associated documentation files (the
1351N/A# "Software"), to deal in the Software without restriction, including
1351N/A# without limitation the rights to use, copy, modify, merge, publish,
1351N/A# distribute, and/or sell copies of the Software, and to permit persons
1351N/A# to whom the Software is furnished to do so, provided that the above
1351N/A# copyright notice(s) and this permission notice appear in all copies of
1351N/A# the Software and that both the above copyright notice(s) and this
1351N/A# permission notice appear in supporting documentation.
1351N/A#
1351N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
1351N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1351N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
1351N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
#
# Except as contained in this notice, the name of a copyright holder
# shall not be used in advertising or otherwise to promote the sale, use
# or other dealings in this Software without prior written authorization
# of the copyright holder.
Replace "type1" and "bitstream" font modules in xorg.conf files with
"freetype"
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
--- hw/xfree86/common/xf86Config.c 2008-09-24 20:21:42.861097000 -0700
+++ hw/xfree86/common/xf86Config.c 2008-09-24 20:21:55.754653000 -0700
@@ -254,7 +254,9 @@
{
int count = 0, i = 0;
char **modulearray;
- char *ignore[] = { "GLcore", "speedo", "bitmap", "drm", NULL };
+ char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
+ "type1", "bitstream",
+ NULL };
pointer *optarray;
XF86LoadPtr modp;
Bool found;