components/x11/xorg-server/patches/10-fontmod.patch

   1 # Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
   2 #
   3 # Permission is hereby granted, free of charge, to any person obtaining a
   4 # copy of this software and associated documentation files (the "Software"),
   5 # to deal in the Software without restriction, including without limitation
   6 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   7 # and/or sell copies of the Software, and to permit persons to whom the
   8 # Software is furnished to do so, subject to the following conditions:
   9 #
  10 # The above copyright notice and this permission notice (including the next
  11 # paragraph) shall be included in all copies or substantial portions of the
  12 # Software.
  13 #
  14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  15 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  16 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  20 # DEALINGS IN THE SOFTWARE.
  21
  22 Add Sun's old "bitstream" font module & IA & xtsol extension modules to the
  23 list of obsolete modules to ignore in xorg.conf files.
  24
  25 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
  26 index af8a89e..ab9a37a 100644
  27 --- a/hw/xfree86/common/xf86Config.c
  28 +++ b/hw/xfree86/common/xf86Config.c
  29 @@ -245,6 +245,7 @@ xf86ModulelistFromConfig(pointer **optlist)
  30
  31      const char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
  32          "freetype", "type1",
  33 +        "bitstream", "ia", "xtsol",
  34          NULL
  35      };
  36      pointer *optarray;