components/x11/xorg-server/patches/05-cli-nobanner.patch

   1 # Copyright (c) 2006, 2012, 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 diff --git a/os/utils.c b/os/utils.c
  23 index fd9feed..78ec675 100644
  24 --- a/os/utils.c
  25 +++ b/os/utils.c
  26 @@ -902,6 +902,11 @@
  27          else if (strcmp(argv[i], "-reset") == 0) {
  28              dispatchExceptionAtReset = DE_RESET;
  29          }
  30 +#ifdef SUNSOFT
  31 +        else if (strcmp(argv[i], "-nobanner") == 0) {
  32 +          /* ignore - just maintaining compatibility with Xsun CLI */
  33 +        }
  34 +#endif
  35          else if (strcmp(argv[i], "-p") == 0) {
  36              if (++i < argc)
  37                  defaultScreenSaverInterval = ((CARD32) atoi(argv[i])) *