open-src/app/xfs/config-warning.patch
author X gate hg captive account <xhg@xserver.us.oracle.com>
Wed, 19 Aug 2015 13:48:41 -0700
changeset 1484 bc8922b8e1d2
parent 1068 0dc26c96a5af
permissions -rw-r--r--
Added tag s11u3_30 for changeset 221e9d9cc9cb

###############################################################################
#
# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#

diff -urp -x '*~' -x '*.orig' config/config.cpp config/config.cpp
--- config/config.cpp	2010-08-06 18:40:29.000000000 -0700
+++ config/config.cpp	2011-01-28 18:01:17.331211005 -0800
@@ -1,6 +1,13 @@
 # X font server configuration file
 # See xfs(__appmansuffix__) man page for more information.
 
+XCOMM   DO NOT EDIT /usr/lib/X11/fs/config directly.
+XCOMM
+XCOMM   /usr/lib/X11/fs/config is a factory-default file and will
+XCOMM   be unconditionally overwritten upon subsequent installation.
+XCOMM   Before making changes to the file, copy it to the system configuration 
+XCOMM   location, /etc/X11/fs/config and edit it there.
+    
 clone-self = on
 use-syslog = off
 catalogue = DEFAULTFONTPATH