components/x11/libX11/patches/44.locale-ja.patch

   1 ###############################################################################
   2 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
   3 #
   4 # Permission is hereby granted, free of charge, to any person obtaining a
   5 # copy of this software and associated documentation files (the "Software"),
   6 # to deal in the Software without restriction, including without limitation
   7 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   8 # and/or sell copies of the Software, and to permit persons to whom the
   9 # Software is furnished to do so, subject to the following conditions:
  10 #
  11 # The above copyright notice and this permission notice (including the next
  12 # paragraph) shall be included in all copies or substantial portions of the
  13 # Software.
  14 #
  15 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  16 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  17 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  18 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  21 # DEALINGS IN THE SOFTWARE.
  22 #
  23
  24 diff --git a/nls/ja/XI18N_OBJS b/nls/ja/XI18N_OBJS
  25 index 50b51fe..f682a19 100644
  26 --- a/nls/ja/XI18N_OBJS
  27 +++ b/nls/ja/XI18N_OBJS
  28 @@ -4,8 +4,5 @@
  29  #
  30  XLC    ja/xlibi18n_ja  _XlcGenericLoader       # XLC_open
  31  XLC    common/xlibi18n _XlcGenericLoader       # XLC_open
  32 -#XIM   common/ximcp    _XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open    XIM_regiser XIM_unregister
  33 -XIM    common/ximp40   _Ximp_OpenIM            # XIM_open
  34 -XIM    common/ximlocal _XimpLocalOpenIM        # XIM_open
  35  XIM    common/ximcp    _XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open    XIM_regiser XIM_unregister
  36  XOM    common/xomGeneric       _XomGenericOpenOM # XOM_open
  37 diff --git a/nls/ja/XLC_LOCALE.pre b/nls/ja/XLC_LOCALE.pre
  38 index 99decf0..69af5a6 100644
  39 --- a/nls/ja/XLC_LOCALE.pre
  40 +++ b/nls/ja/XLC_LOCALE.pre
  41 @@ -39,16 +39,18 @@ fs2 {
  42                 vertical_rotate all
  43         }
  44  }
  45 +
  46  XCOMM  fs3 class (Supplementary Kanji)
  47 -XCOMM fs3      {
  48 -XCOMM  charset {
  49 -XCOMM          name            JISX0212.1990-0:GL
  50 -XCOMM          udc_area        \x7521,\x7e7e
  51 -XCOMM  }
  52 -XCOMM  font    {
  53 -XCOMM          primary         JISX0212.1990-0:GL
  54 -XCOMM  }
  55 -XCOMM }
  56 +fs3    {
  57 +       charset {
  58 +               name            JISX0212.1990-0:GL
  59 +               udc_area        \x7521,\x7e7e
  60 +       }
  61 +       font    {
  62 +               primary         JISX0212.1990-0:GL
  63 +       }
  64 +}
  65 +
  66  END XLC_FONTSET
  67
  68  XCOMM
  69 @@ -107,18 +109,17 @@ cs2       {
  70  }
  71
  72  XCOMM  cs3 class
  73 -XCOMM cs3      {
  74 -XCOMM  side            GL
  75 -XCOMM  length          2
  76 -XCOMM  mb_encoding     <SS> \x8f
  77 -XCOMM #if WCHAR32
  78 -XCOMM  wc_encoding     \x20000000
  79 -XCOMM #else
  80 -XCOMM  wc_encoding     \x00008000
  81 -XCOMM #endif
  82 -XCOMM  ct_encoding     JISX0212.1990-0:GL; JISX0212.1990-0:GR
  83 -XCOMM }
  84 -
  85 +cs3    {
  86 +       side            GL
  87 +       length          2
  88 +       mb_encoding     <SS> \x8f
  89 +#if WCHAR32
  90 +       wc_encoding     \x20000000
  91 +#else
  92 +       wc_encoding     \x00008000
  93 +#endif
  94 +       ct_encoding     JISX0212.1990-0:GL; JISX0212.1990-0:GR
  95 +}
  96
  97  END XLC_XLOCALE
  98