fontmod.patch revision 879
879N/A# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
851N/A# Use is subject to license terms.
234N/A#
234N/A# Permission is hereby granted, free of charge, to any person obtaining a
234N/A# copy of this software and associated documentation files (the
234N/A# "Software"), to deal in the Software without restriction, including
234N/A# without limitation the rights to use, copy, modify, merge, publish,
234N/A# distribute, and/or sell copies of the Software, and to permit persons
234N/A# to whom the Software is furnished to do so, provided that the above
234N/A# copyright notice(s) and this permission notice appear in all copies of
234N/A# the Software and that both the above copyright notice(s) and this
234N/A# permission notice appear in supporting documentation.
234N/A#
234N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
234N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
234N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
234N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
234N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
234N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
234N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
234N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
234N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
234N/A#
234N/A# Except as contained in this notice, the name of a copyright holder
234N/A# shall not be used in advertising or otherwise to promote the sale, use
234N/A# or other dealings in this Software without prior written authorization
234N/A# of the copyright holder.
234N/A
879N/AAdd Sun's old "bitstream" font module to the list of obsolete modules
879N/Ato ignore in xorg.conf files.
234N/A
234N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
879N/A--- hw/xfree86/common/xf86Config.c 2010-01-07 18:14:17.933694496 -0800
879N/A+++ hw/xfree86/common/xf86Config.c 2010-01-07 18:14:19.290141839 -0800
879N/A@@ -246,6 +246,7 @@ xf86ModulelistFromConfig(pointer **optli
606N/A char **modulearray;
879N/A char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
879N/A "freetype", "type1",
879N/A+ "bitstream",
879N/A NULL };
606N/A pointer *optarray;
606N/A XF86LoadPtr modp;