- rel 5; upstream fixes

[packages/glibc.git] / glibc-new-charsets.patch

diff --git a/glibc-new-charsets.patch b/glibc-new-charsets.patch
index 785671fd91970bd3f31b01915b2646a0ecbc52f6..8109d57ad76368cbfe40cd015b9fc9e9f9bf7d92 100644 (file)
--- a/glibc-new-charsets.patch
+++ b/glibc-new-charsets.patch
@@ -10,34 +10,26 @@
           IBM1132 IBM1133 IBM1160 IBM1161 IBM1162 IBM1163 IBM1164       \
           IBM918 IBM1004 IBM1026 CP1125 CP1250 CP1251 CP1252 CP1253     \
           CP1254 CP1255 CP1256 CP1257 ISO-2022-JP MACINTOSH IEC_P27-1   \
-@@ -163,6 +166,9 @@
-             ibm922.c ibm922.h ibm1124.c ibm1124.h ibm1129.c ibm1129.h     \
-             ibm1132.c ibm1132.h ibm1133.c ibm1133.h ibm1162.c ibm1162.h   \
-             ibm1026.c ibm1047.c iec_p27-1.c inis.c inis-8.c viscii.c      \
-+            iscii-dev.c khmer-ns.c \
-+            mulelao-1.c tatar-cyr.c iso8859-7-euro.c \
-+            koi8-k.c koi8-c.c koi8-ru.c \
-             inis-cyrillic.c iso-2022-jp.c iso-2022-kr.c iso646.c          \
-             iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c   \
-             iso8859-6.c iso8859-7.c iso8859-8.c iso8859-9.c iso8859-10.c  \
 @@ -228,7 +228,7 @@
                    ebcdic-dk-no-a ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a  \
                    ebcdic-fr ebcdic-it ebcdic-pt ebcdic-us \
                    ibm037 ibm038 ibm274 ibm275 ibm423 ibm500 ibm870 ibm871 \
--                  ibm891 ibm903 ibm904 ibm905 ibm1047   \
+-                  ibm891 ibm903 ibm904 ibm905 ibm1047
 +                  ibm891 ibm903 ibm904 ibm905 ibm1047 koi8-c
  
  gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273           \
                        ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290   \
-@@ -232,6 +238,8 @@
-                       ibm865 ibm868 ibm869 ibm875 ibm880 ibm918 ibm1004  \
-                       ibm1026 cp1125 cp1250 cp1251 cp1252 cp1253 cp1254  \
-                       cp1256 cp1257 ibm866 iso8859-5 iso8859-7 iso8859-8 \
+@@ -172,7 +172,9 @@ gen-8bit-gap-modules := koi8-r latin-gre
+                       mac-centraleurope koi8-ru hp-roman8 hp-roman9      \
+                       ebcdic-es ebcdic-es-a ebcdic-is-friss ebcdic-uk    \
+                       iso8859-16 viscii iso8859-9e hp-turkish8           \
+-                      hp-thai8 hp-greek8 cp770 cp771 cp772 cp773 cp774
++                      hp-thai8 hp-greek8 cp770 cp771 cp772 cp773 cp774   \
 +                      iscii-dev khmer-ns mulelao-1 tatar-cyr \
-+                      koi8-k iso8859-7-euro \
-                       iso8859-10 macintosh iec_p27-1 asmo_449            \
-                       csn_369103 cwi dec-mcs ecma-cyrillic gost_19768-74 \
-                       greek-ccitt greek7 greek7-old inis inis-8          \
++                      koi8-k koi8-ru iso8859-7-euro
+ 
+ 
+ gen-special-modules := iso8859-7jp
 --- glibc-2.7/iconvdata/gconv-modules.orig     2007-09-30 06:00:14.000000000 +0200
 +++ glibc-2.7/iconvdata/gconv-modules  2007-10-23 20:47:36.423123001 +0200
 @@ -356,23 +356,28 @@
@@ -78,9 +70,9 @@
  alias ISO_8859-14//           ISO-8859-14//
  alias ISO-CELTIC//            ISO-8859-14//
 @@ -395,6 +401,8 @@
- alias ISO-IR-203//            ISO-8859-15//
  alias ISO_8859-15//           ISO-8859-15//
  alias LATIN-9//               ISO-8859-15//
+ alias LATIN9//                ISO-8859-15//
 +alias L9//                    ISO-8859-15//
 +alias 8859-15//               ISO-8859-15//
  alias ISO_8859-15:1998//      ISO-8859-15//
@@ -743,31 +735,18 @@ diff -uNr libc/localedata/charmaps/ISIRI-3342 libc.charsets/localedata/charmaps/
  % source: Iranian standard ISIRI 3342 (1993)
  % author: Pablo Saratxaga, and Roozbeh Pournader
  % email: pablo@mandrakesoft.com, roozbeh@sina.sharif.ac.ir
-- 
-+
+ 
 +% Changes from 0.2 to 0.3:
 +%
-+%     Changed the mnemonic for 0xA6 from <.+> to <.a>
++%      Changed the mnemonic for 0xA6 from <.+> to <.a>
 +%
-+%     Exchanged the Unicode equilavents for 0xE6 and 0xE7, to reflect
-+%     the change in the mirroring behaviour of U+00AB and U+00BB
-+%     between versions 2.1.5 and 2.1.8 of the Unicode Standard.
-+
- % I think the mnemonic for upper space (0xA0) should be different from
- % lower space (0x20). Because the semantics are different, although they
- % are mapped to a single Unicode character. This is specially important
-@@ -18,9 +27,9 @@
- % invented on the pattern of Unicode character names. --RP
- %
- % NOTE: Some entries were missing in the mnemonics.ds file; We invented our
--% own. Those are: <zwnj>, <zwj>, <!+>, <Rl>, <%+>, <.+>, <,f>, <(+>,
-+% own. Those are: <zwnj>, <zwj>, <!+>, <Rl>, <%+>, <.a>, <,f>, <(+>,
- % <)+>, <*X+>, <+f>, <-f>, <.f>, <//f>, <0f>..<9f>, <:f>, <<f>, <=f>,
--% </>f>, <kf>, <yf>, <)/>+>, <<(+>, <!)+>, <(!+>, <<<+>, </>/>+>, <*+>,
-+% </>f>, <yf>, <)/>+>, <<(+>, <!)+>, <(!+>, <<<+>, </>/>+>, <*+>,
- % <!!+>, and <////+>. Also, all character sequences
- % <NU>..<US>, <SP>, <DT> have counter-parts <NU+>..<US+>, <SP+>, <DT+>
-  
++%      Exchanged the Unicode equilavents for 0xE6 and 0xE7, to reflect
++%      the change in the mirroring behaviour of U+00AB and U+00BB
++%      between versions 2.1.5 and 2.1.8 of the Unicode Standard.
++
+ % Please note that the Unicode equivalents of the Persian part (0x80..0xFF)
+ % are for compatiblity purposes only. I have also changed the fourth
+ % column consisting of names to reflect the difference. The names are
 @@ -153,6 +162,7 @@
  <U007D>     /x7d         RIGHT CURLY BRACKET
  <U007E>     /x7e         TILDE