- updated to 1.7.0

- updated glibc-locale_sync patch

diff --git a/xorg-lib-libX11-glibc-locale_sync.patch b/xorg-lib-libX11-glibc-locale_sync.patch
index 17dce7098c3f6e8e45b4ad87a33280372e716358..de0e69ad9adec3b144d4b155847fa6040060fe49 100644 (file)
--- a/xorg-lib-libX11-glibc-locale_sync.patch
+++ b/xorg-lib-libX11-glibc-locale_sync.patch
@@ -641,8 +641,8 @@
   microsoft-cp1256         mulelao-1   nokhchi-1    pt_BR.UTF-8  pt_PT.UTF-8 \
   ru_RU.UTF-8  sr_CS.UTF-8 tatar-cyr   th_TH        th_TH.UTF-8  tscii-0 \
   vi_VN.tcvn   vi_VN.viscii            zh_CN        zh_CN.gb18030 \
---- libX11-1.6.8/nls/compose.dir.pre.orig      2019-06-17 16:47:35.000000000 +0200
-+++ libX11-1.6.8/nls/compose.dir.pre   2019-06-19 09:03:41.643835151 +0200
+--- libX11-1.7.0/nls/compose.dir.pre.orig      2020-11-20 20:08:11.000000000 +0100
++++ libX11-1.7.0/nls/compose.dir.pre   2020-11-27 17:28:48.609915129 +0100
 @@ -5,7 +5,9 @@
  XCOMM
  XCOMM
@@ -728,7 +728,7 @@
  ibm-cp1133/Compose:           lo_LA.IBM-CP1133
  mulelao-1/Compose:            lo_LA.MULELAO-1
  iso8859-4/Compose:            lt_LT.ISO8859-4
-@@ -183,51 +192,56 @@
+@@ -183,49 +192,56 @@
  iso8859-13/Compose:           lv_LV.ISO8859-13
  iso8859-13/Compose:           mi_NZ.ISO8859-13
  iso8859-5/Compose:            mk_MK.ISO8859-5
@@ -788,8 +788,6 @@
 +iso8859-1/Compose:            so_KE.ISO8859-1
 +iso8859-1/Compose:            so_SO.ISO8859-1
  iso8859-2/Compose:            sq_AL.ISO8859-2
--iso8859-2/Compose:            sr_CS.ISO8859-2
--iso8859-5/Compose:            sr_CS.ISO8859-5
 -iso8859-2/Compose:            sr_YU.ISO8859-2
 -microsoft-cp1251/Compose:     sr_YU.CP1251
 +iso8859-5/Compose:            sr_ME.ISO8859-5
@@ -800,7 +798,7 @@
  iso8859-5/Compose:            sr_YU.ISO8859-5
  iso8859-1/Compose:            ss_ZA.ISO8859-1
  iso8859-1/Compose:            st_ZA.ISO8859-1
-@@ -236,16 +250,18 @@
+@@ -234,16 +250,18 @@
  iso8859-1/Compose:            sv_SE.ISO8859-1
  iso8859-15/Compose:           sv_SE.ISO8859-15
  tscii-0/Compose:              ta_IN.TSCII-0
@@ -823,7 +821,7 @@
  koi8-u/Compose:                       uk_UA.KOI8-U
  iso8859-5/Compose:            uk_UA.ISO8859-5
  microsoft-cp1256/Compose:     ur_PK.CP1256
-@@ -268,8 +284,12 @@
+@@ -266,8 +284,12 @@
  XCOMM
  XCOMM
  en_US.UTF-8/Compose:          C.UTF-8
@@ -836,7 +834,7 @@
  en_US.UTF-8/Compose:          ar_AA.UTF-8
  en_US.UTF-8/Compose:          ar_AE.UTF-8
  en_US.UTF-8/Compose:          ar_BH.UTF-8
-@@ -299,11 +319,13 @@
+@@ -297,11 +319,13 @@
  en_US.UTF-8/Compose:          bo_IN.UTF-8
  en_US.UTF-8/Compose:          br_FR.UTF-8
  en_US.UTF-8/Compose:          bs_BA.UTF-8
@@ -850,7 +848,7 @@
  en_US.UTF-8/Compose:          cy_GB.UTF-8
  en_US.UTF-8/Compose:          da_DK.UTF-8
  en_US.UTF-8/Compose:          de_AT.UTF-8
-@@ -321,7 +343,6 @@
+@@ -319,7 +343,6 @@
  en_US.UTF-8/Compose:          en_BZ.UTF-8
  en_US.UTF-8/Compose:          en_CA.UTF-8
  en_US.UTF-8/Compose:          en_DK.UTF-8
@@ -858,7 +856,7 @@
  en_US.UTF-8/Compose:          en_GB.UTF-8
  en_US.UTF-8/Compose:          en_HK.UTF-8
  en_US.UTF-8/Compose:          en_IE.UTF-8
-@@ -332,7 +353,6 @@
+@@ -330,7 +353,6 @@
  en_US.UTF-8/Compose:          en_PH.UTF-8
  en_US.UTF-8/Compose:          en_SG.UTF-8
  en_US.UTF-8/Compose:          en_TT.UTF-8
@@ -866,7 +864,7 @@
  en_US.UTF-8/Compose:          en_US.UTF-8
  en_US.UTF-8/Compose:          en_ZA.UTF-8
  en_US.UTF-8/Compose:          en_ZW.UTF-8
-@@ -370,6 +390,7 @@
+@@ -368,6 +390,7 @@
  en_US.UTF-8/Compose:          fr_LU.UTF-8
  en_US.UTF-8/Compose:          ga_IE.UTF-8
  en_US.UTF-8/Compose:          gd_GB.UTF-8
@@ -874,7 +872,7 @@
  en_US.UTF-8/Compose:          gl_ES.UTF-8
  en_US.UTF-8/Compose:          gu_IN.UTF-8
  en_US.UTF-8/Compose:          gv_GB.UTF-8
-@@ -377,6 +398,7 @@
+@@ -375,6 +398,7 @@
  en_US.UTF-8/Compose:          hi_IN.UTF-8
  en_US.UTF-8/Compose:          hne_IN.UTF-8
  en_US.UTF-8/Compose:          hr_HR.UTF-8
@@ -882,7 +880,7 @@
  en_US.UTF-8/Compose:          hu_HU.UTF-8
  en_US.UTF-8/Compose:          hy_AM.UTF-8
  en_US.UTF-8/Compose:          id_ID.UTF-8
-@@ -396,6 +418,9 @@
+@@ -394,6 +418,9 @@
  en_US.UTF-8/Compose:          ku_TR.UTF-8
  en_US.UTF-8/Compose:          kw_GB.UTF-8
  en_US.UTF-8/Compose:          ky_KG.UTF-8
@@ -892,7 +890,7 @@
  en_US.UTF-8/Compose:          lo_LA.UTF-8
  en_US.UTF-8/Compose:          lt_LT.UTF-8
  en_US.UTF-8/Compose:          lv_LV.UTF-8
-@@ -403,27 +428,29 @@
+@@ -401,27 +428,29 @@
  en_US.UTF-8/Compose:          mi_NZ.UTF-8
  en_US.UTF-8/Compose:          mk_MK.UTF-8
  en_US.UTF-8/Compose:          ml_IN.UTF-8
@@ -926,7 +924,7 @@
  pt_BR.UTF-8/Compose:          pt_BR.UTF-8
  pt_PT.UTF-8/Compose:          pt_PT.UTF-8
  en_US.UTF-8/Compose:          ro_RO.UTF-8
-@@ -437,13 +464,16 @@
+@@ -435,12 +464,16 @@
  en_US.UTF-8/Compose:          sh_BA.UTF-8
  en_US.UTF-8/Compose:          sh_YU.UTF-8
  en_US.UTF-8/Compose:          si_LK.UTF-8
@@ -938,14 +936,13 @@
 +en_US.UTF-8/Compose:          so_KE.UTF-8
 +en_US.UTF-8/Compose:          so_SO.UTF-8
  en_US.UTF-8/Compose:          sq_AL.UTF-8
--sr_CS.UTF-8/Compose:          sr_CS.UTF-8
  en_US.UTF-8/Compose:          sr_ME.UTF-8
  en_US.UTF-8/Compose:          sr_RS.UTF-8
 -en_US.UTF-8/Compose:          sr_YU.UTF-8
  en_US.UTF-8/Compose:          ss_ZA.UTF-8
  en_US.UTF-8/Compose:          st_ZA.UTF-8
  en_US.UTF-8/Compose:          sv_FI.UTF-8
-@@ -454,8 +484,11 @@
+@@ -451,8 +484,11 @@
  th_TH.UTF-8/Compose:          th_TH.UTF-8
  en_US.UTF-8/Compose:          ti_ER.UTF-8
  en_US.UTF-8/Compose:          ti_ET.UTF-8
@@ -957,8 +954,8 @@
  en_US.UTF-8/Compose:          tr_TR.UTF-8
  en_US.UTF-8/Compose:          ts_ZA.UTF-8
  en_US.UTF-8/Compose:          tt_RU.UTF-8
---- libX11-1.6.4/nls/locale.alias.pre.orig     2016-08-17 10:56:16.000000000 +0200
-+++ libX11-1.6.4/nls/locale.alias.pre  2016-10-05 16:21:27.391353541 +0200
+--- libX11-1.7.0/nls/locale.alias.pre.orig     2020-11-20 20:08:11.000000000 +0100
++++ libX11-1.7.0/nls/locale.alias.pre  2020-11-27 17:53:24.555252581 +0100
 @@ -17,11 +17,21 @@
  English_United-States.437:                    C
  C.UTF-8:                                      en_US.UTF-8
@@ -986,7 +983,7 @@
  af_ZA:                                                af_ZA.ISO8859-1
  af_ZA.iso88591:                                       af_ZA.ISO8859-1
 @@ -29,6 +39,11 @@
- af_ZA.utf8:                           af_ZA.UTF-8
+ af_ZA.utf8:                                   af_ZA.UTF-8
  am:                                           am_ET.UTF-8
  am_ET:                                                am_ET.UTF-8
 +am_ET.utf8:                                   am_ET.UTF-8
@@ -1054,15 +1051,10 @@
  ca_FR:                                                ca_FR.ISO8859-1
  ca_FR@euro:                                   ca_FR.ISO8859-15
  ca_FR.iso88591:                                       ca_FR.ISO8859-1
-@@ -198,19 +223,23 @@
+@@ -198,14 +223,18 @@
  cs_CZ.ISO-8859-2:                             cs_CZ.ISO8859-2
  cs_CZ.ISO_8859-2:                             cs_CZ.ISO8859-2
  cs_CZ.utf8:                                   cs_CZ.UTF-8
--XCOMM cz is an old name for Czech (now cs), and should be deleted in the future.
--cz:                                           cs_CZ.ISO8859-2
--cz_CZ:                                                cs_CZ.ISO8859-2
--cz_CZ.utf8:                                   cs_CZ.UTF-8
--cz_CZ.UTF-8:                                  cs_CZ.UTF-8
 -cy:                                           cy_GB.ISO8859-1
 -cy_GB:                                                cy_GB.ISO8859-1
 +csb:                                          csb_PL.UTF-8
@@ -1077,15 +1069,10 @@
  cy_GB.iso885915:                              cy_GB.ISO8859-15
  cy_GB.ISO-8859-15:                            cy_GB.ISO8859-15
 +cy_GB.utf8:                                   cy_GB.UTF-8
-+XCOMM cz is an old name for Czech (now cs), and should be deleted in the future.
-+cz:                                           cs_CZ.ISO8859-2
-+cz_CZ:                                                cs_CZ.ISO8859-2
-+cz_CZ.utf8:                                   cs_CZ.UTF-8
-+cz_CZ.UTF-8:                                  cs_CZ.UTF-8
  da:                                           da_DK.ISO8859-1
  da.ISO8859-15:                                        da_DK.ISO8859-15
  da_DK:                                                da_DK.ISO8859-1
-@@ -234,18 +263,22 @@
+@@ -229,18 +258,22 @@
  de_AT.ISO_8859-1:                             de_AT.ISO8859-1
  de_AT.iso885915:                              de_AT.ISO8859-15
  de_AT.ISO-8859-15:                            de_AT.ISO8859-15
@@ -1109,7 +1096,7 @@
  de_BE.UTF-8@euro:                             de_BE.UTF-8
  de_CH:                                                de_CH.ISO8859-1
  de_CH.iso88591:                                       de_CH.ISO8859-1
-@@ -267,6 +300,7 @@
+@@ -262,6 +295,7 @@
  de_DE.ISO_8859-15:                            de_DE.ISO8859-15
  de_DE.8859-15:                                        de_DE.ISO8859-15
  de_DE.8859-15@euro:                           de_DE.ISO8859-15
@@ -1117,7 +1104,7 @@
  de_DE.ISO-8859-15@euro:                               de_DE.ISO8859-15
  de_DE.UTF-8@euro:                             de_DE.UTF-8
  de_DE.utf8:                                   de_DE.UTF-8
-@@ -275,22 +309,29 @@
+@@ -280,22 +314,29 @@
  de_LU.iso88591:                                       de_LU.ISO8859-1
  de_LU.ISO_8859-1:                             de_LU.ISO8859-1
  de_LU.ISO-8859-1:                             de_LU.ISO8859-1
@@ -1152,7 +1139,7 @@
  el_GR.utf8:                                   el_GR.UTF-8
  en:                                           en_US.ISO8859-1
  en.ISO-8859-1:                                        en_US.ISO8859-1
-@@ -311,7 +352,10 @@
+@@ -316,7 +357,10 @@
  en_CA.ISO-8859-1:                             en_CA.ISO8859-1
  en_CA.ISO_8859-1:                             en_CA.ISO8859-1
  en_CA.utf8:                                   en_CA.UTF-8
@@ -1164,7 +1151,7 @@
  en_GB:                                                en_GB.ISO8859-1
  en_GB.88591:                                  en_GB.ISO8859-1
  en_GB.88591.en:                                       en_GB.ISO8859-1
-@@ -322,6 +366,8 @@
+@@ -327,6 +371,8 @@
  en_GB.ISO-8859-15:                            en_GB.ISO8859-15
  en_GB.utf8:                                   en_GB.UTF-8
  en_UK:                                                en_GB.ISO8859-1
@@ -1173,7 +1160,7 @@
  ENG_GB.8859:                                  en_GB.ISO8859-1
  ENG_GB.8859.in:                                       en_GB.ISO8859-1
  en_HK:                                                en_HK.ISO8859-1
-@@ -333,6 +379,7 @@
+@@ -338,6 +384,7 @@
  en_IE.ISO-8859-1:                             en_IE.ISO8859-1
  en_IE.iso885915:                              en_IE.ISO8859-15
  en_IE.ISO-8859-15:                            en_IE.ISO8859-15
@@ -1181,24 +1168,20 @@
  en_IE.ISO-8859-15@euro:                               en_IE.ISO8859-15
  en_IE@euro:                                   en_IE.ISO8859-15
  en_IE.UTF-8@euro:                             en_IE.UTF-8
-@@ -377,11 +424,12 @@
- en_ZW.utf8:                                   en_ZS.UTF-8
+@@ -383,8 +430,11 @@
  en_ZW.iso88591:                                       en_ZW.ISO8859-1
  en_ZW.ISO-8859-1:                             en_ZW.ISO8859-1
-+en_ZW.utf8:                                   en_ZW.UTF-8
  eo:                                           eo_XX.ISO8859-3
 -eo_EO:                                                eo_EO.ISO8859-3
--eo_EO.ISO8859-3:                              eo_EO.ISO8859-3
--eo_XX:                                                eo_XX.ISO8859-3
--eo_XX.ISO8859-3:                              eo_XX.ISO8859-3
 +eo_EO:                                                eo_XX.ISO8859-3
 +eo_EO.ISO8859-3:                              eo_XX.ISO8859-3
+ eo_XX:                                                eo_XX.ISO8859-3
 +eo_XX.iso88593:                                       eo_XX.ISO8859-3
 +eo_XX.ISO-8859-3:                             eo_XX.ISO8859-3
  es:                                           es_ES.ISO8859-1
  es.UTF-8:                                     es_ES.UTF-8
  es_AR:                                                es_AR.ISO8859-1
-@@ -419,6 +467,7 @@
+@@ -422,6 +472,7 @@
  es_ES.ISO-8859-1:                             es_ES.ISO8859-1
  es_ES.ISO_8859-1:                             es_ES.ISO8859-1
  es_ES.iso885915:                              es_ES.ISO8859-15
@@ -1206,7 +1189,7 @@
  es_ES.ISO-8859-15:                            es_ES.ISO8859-15
  es_ES.ISO-8859-15@euro:                               es_ES.ISO8859-15
  es_ES@euro:                                   es_ES.ISO8859-15
-@@ -443,12 +492,10 @@
+@@ -446,12 +497,10 @@
  es_PA:                                                es_PA.ISO8859-1
  es_PA.iso88591:                                       es_PA.ISO8859-1
  es_PA.ISO-8859-1:                             es_PA.ISO8859-1
@@ -1219,7 +1202,7 @@
  es_PE.utf8:                                   es_PE.UTF-8
  es_PR:                                                es_PR.ISO8859-1
  es_PR.iso88591:                                       es_PR.ISO8859-1
-@@ -457,25 +504,26 @@
+@@ -460,25 +509,26 @@
  es_PY:                                                es_PY.ISO8859-1
  es_PY.iso88591:                                       es_PY.ISO8859-1
  es_PY.ISO-8859-1:                             es_PY.ISO8859-1
@@ -1248,7 +1231,7 @@
  es_VE.utf8:                                   es_VE.UTF-8
  #if defined(SVR4) && defined(sun)
  XCOMM Sun Solaris 2.6 has erroneously specified Estonian as a Latin-1
-@@ -483,8 +531,9 @@
+@@ -486,8 +536,9 @@
  #endif
  XCOMM According to Estonian local standards, ISO8859-4 is not a recommended
  XCOMM charset. EVS8:2000 specifies ISO8859-15 as the base charset.
@@ -1260,7 +1243,7 @@
  et_EE.iso88591:                                       et_EE.ISO8859-1
  et_EE.ISO-8859-1:                             et_EE.ISO8859-1
  et_EE.iso88594:                                       et_EE.ISO8859-4
-@@ -503,24 +552,31 @@
+@@ -506,24 +557,31 @@
  eu_ES.ISO-8859-15@euro:                               eu_ES.ISO8859-15
  eu_ES@euro:                                   eu_ES.ISO8859-15
  eu_ES.UTF-8@euro:                             eu_ES.UTF-8
@@ -1294,7 +1277,7 @@
  fo:                                           fo_FO.ISO8859-1
  fo_FO:                                                fo_FO.ISO8859-1
  fo_FO.iso88591:                                       fo_FO.ISO8859-1
-@@ -534,10 +590,12 @@
+@@ -537,10 +595,12 @@
  fr_BE:                                                fr_BE.ISO8859-1
  fr_BE.88591:                                  fr_BE.ISO8859-1
  fr_BE.88591.en:                                       fr_BE.ISO8859-1
@@ -1307,7 +1290,7 @@
  fr_BE.ISO-8859-15@euro:                               fr_BE.ISO8859-15
  fr_BE@euro:                                   fr_BE.ISO8859-15
  fr_BE.utf8:                                   fr_BE.UTF-8
-@@ -554,11 +612,14 @@
+@@ -557,11 +617,14 @@
  fr_CH:                                                fr_CH.ISO8859-1
  fr_CH.88591:                                  fr_CH.ISO8859-1
  fr_CH.88591.en:                                       fr_CH.ISO8859-1
@@ -1322,7 +1305,7 @@
  fr_FR:                                                fr_FR.ISO8859-1
  fr_FR.88591:                                  fr_FR.ISO8859-1
  fr_FR.88591.en:                                       fr_FR.ISO8859-1
-@@ -567,7 +628,6 @@
+@@ -570,7 +633,6 @@
  fr_FR.ISO_8859-1:                             fr_FR.ISO8859-1
  fr_FR.iso885915:                              fr_FR.ISO8859-15
  fr_FR.ISO-8859-15:                            fr_FR.ISO8859-15
@@ -1330,7 +1313,7 @@
  fr_FR@euro:                                   fr_FR.ISO8859-15
  fr_FR.UTF-8@euro:                             fr_FR.UTF-8
  fr_FR.utf8:                                   fr_FR.UTF-8
-@@ -578,6 +638,7 @@
+@@ -581,6 +643,7 @@
  fr_LU.ISO-8859-1:                             fr_LU.ISO8859-1
  fr_LU.ISO_8859-1:                             fr_LU.ISO8859-1
  fr_LU.iso885915:                              fr_LU.ISO8859-15
@@ -1338,7 +1321,7 @@
  fr_LU.ISO-8859-15:                            fr_LU.ISO8859-15
  fr_LU.ISO-8859-15@euro:                               fr_LU.ISO8859-15
  fr_LU@euro:                                   fr_LU.ISO8859-15
-@@ -593,6 +654,7 @@
+@@ -596,6 +659,7 @@
  ga_IE.ISO-8859-14:                            ga_IE.ISO8859-14
  ga_IE.iso885915:                              ga_IE.ISO8859-15
  ga_IE.ISO-8859-15:                            ga_IE.ISO8859-15
@@ -1346,7 +1329,7 @@
  ga_IE.ISO-8859-15@euro:                               ga_IE.ISO8859-15
  ga_IE@euro:                                   ga_IE.ISO8859-15
  ga_IE.UTF-8@euro:                             ga_IE.UTF-8
-@@ -605,16 +667,22 @@
+@@ -608,16 +672,22 @@
  gd_GB.ISO-8859-14:                            gd_GB.ISO8859-14
  gd_GB.iso885915:                              gd_GB.ISO8859-15
  gd_GB.ISO-8859-15:                            gd_GB.ISO8859-15
@@ -1369,7 +1352,7 @@
  gu_IN:                                                gu_IN.UTF-8
  gu_IN.utf8:                                   gu_IN.UTF-8
  gv:                                           gv_GB.ISO8859-1
-@@ -625,6 +693,7 @@
+@@ -628,6 +698,7 @@
  gv_GB.ISO-8859-14:                            gv_GB.ISO8859-14
  gv_GB.iso885915:                              gv_GB.ISO8859-15
  gv_GB.ISO-8859-15:                            gv_GB.ISO8859-15
@@ -1377,7 +1360,7 @@
  he:                                           he_IL.ISO8859-8
  he_IL:                                                he_IL.ISO8859-8
  HE_IL:                                                he_IL.ISO8859-8
-@@ -636,9 +705,9 @@
+@@ -639,9 +710,9 @@
  he_IL.MICROSOFT-CP1255:                               he_IL.CP1255
  he_IL.utf8:                                   he_IL.UTF-8
  HE_IL.UTF-8:                                  he_IL.UTF-8
@@ -1390,7 +1373,7 @@
  hi_IN.isciidev:                                       hi_IN.ISCII-DEV
  hi_IN.utf8:                                   hi_IN.UTF-8
  HI_IN.UTF-8:                                  hi_IN.UTF-8
-@@ -651,11 +720,27 @@
+@@ -654,13 +725,29 @@
  hr_HR.ISO-8859-2:                             hr_HR.ISO8859-2
  hr_HR.ISO_8859-2:                             hr_HR.ISO8859-2
  hr_HR.utf8:                                   hr_HR.UTF-8
@@ -1410,22 +1393,25 @@
 +hy_AM:                                                hy_AM.UTF-8
 +hy_AM.armscii8:                                       hy_AM.ARMSCII-8
 +hy_AM.utf8:                                   hy_AM.UTF-8
+ ia:                                           ia.UTF-8
+ ia.utf8:                                      ia.UTF-8
 +id:                                           id_ID.ISO8859-1
 +id_ID:                                                id_ID.ISO8859-1
 +id_ID.iso88591:                                       id_ID.ISO8859-1
 +id_ID.ISO-8859-1:                             id_ID.ISO8859-1
 +id_ID.utf8:                                   id_ID.UTF-8
- XCOMM in was the old ISO code for Indonesian (now id).  These lines should be
- XCOMM deleted in the future.
- in:                                           id_ID.ISO8859-1
-@@ -685,15 +770,16 @@
+ ie:                                           ie.UTF-8
+ ie.utf8:                                      ie.UTF-8
+ is:                                           is_IS.ISO8859-1
+@@ -687,6 +774,7 @@
+ it_IT.ISO-8859-1:                             it_IT.ISO8859-1
  it_IT.ISO_8859-1:                             it_IT.ISO8859-1
  it_IT.iso885915:                              it_IT.ISO8859-15
- it_IT.ISO-8859-15:                            it_IT.ISO8859-15
 +it_IT.iso885915@euro:                         it_IT.ISO8859-15
+ it_IT.ISO-8859-15:                            it_IT.ISO8859-15
  it_IT.ISO-8859-15@euro:                               it_IT.ISO8859-15
  it_IT@euro:                                   it_IT.ISO8859-15
- it_IT.utf8:                                   it_IT.UTF-8
+@@ -694,9 +782,9 @@
  it_IT.UTF-8@euro:                             it_IT.UTF-8
  XCOMM NUNACOM is an encoding for the Inuktitut syllabics
  XCOMM we have little else on this encoding.
@@ -1435,14 +1421,10 @@
 +iu:                                           iu_CA.UTF-8
 +iu_CA:                                                iu_CA.UTF-8
 +iu_CA.utf8:                                   iu_CA.UTF-8
- XCOMM iw was the old ISO code for Hebrew (now he).  These lines should be
- XCOMM deleted in the future.
- iw:                                           he_IL.ISO8859-8
-@@ -717,20 +803,23 @@
- ja_JP.jis7:                                   ja_JP.JIS7
- ja_JP.mscode:                                 ja_JP.SJIS
- ja_JP.PCK:                                    ja_JP.SJIS
--ja_JP.SJIS:                                   ja_JP.SJIS
+ ja_JP:                                                ja_JP.eucJP
+ ja:                                           ja_JP.eucJP
+ ja.JIS:                                               ja_JP.JIS7
+@@ -716,16 +804,20 @@
  ja_JP.sjis:                                   ja_JP.SJIS
  ja_JP.utf8:                                   ja_JP.UTF-8
  JA_JP.utf8:                                   ja_JP.UTF-8
@@ -1466,7 +1448,7 @@
  kl_GL.utf8:                                   kl_GL.UTF-8
  km_KH:                                                km_KH.UTF-8
  km_KH.utf8:                                   km_KH.UTF-8
-@@ -752,6 +841,9 @@
+@@ -747,6 +839,9 @@
  ks_IN.utf8:                                   ks_IN.UTF-8
  ks_IN@devanagari:                             ks_IN.UTF-8@devanagari
  ks_IN.utf8@devanagari:                                ks_IN.UTF-8@devanagari
@@ -1476,14 +1458,13 @@
  kw:                                           kw_GB.ISO8859-1
  kw_GB:                                                kw_GB.ISO8859-1
  kw_GB.iso88591:                                       kw_GB.ISO8859-1
-@@ -760,15 +852,37 @@
+@@ -755,14 +850,36 @@
  kw_GB.ISO-8859-14:                            kw_GB.ISO8859-14
  kw_GB.iso885915:                              kw_GB.ISO8859-15
  kw_GB.ISO-8859-15:                            kw_GB.ISO8859-15
 +kw_GB.utf8:                                   kw_GB.UTF-8
  ky:                                           ky_KG.UTF-8
  ky_KG:                                                        ky_KG.UTF-8
- ky_KG.UTF-8:                                  ky_KG.UTF-8
  ky_KG.utf8:                                   ky_KG.UTF-8
 -lo:                                           lo_LA.MULELAO-1
 -lo_LA:                                                lo_LA.MULELAO-1
@@ -1516,7 +1497,7 @@
  #if defined(VeryOldFreeBSD)
  XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's
  XCOMM generic Latin-1 locale name. N.B. "lt" is a bad code to use for a
-@@ -785,6 +899,8 @@
+@@ -779,6 +896,8 @@
  lt_LT.ISO-8859-13:                            lt_LT.ISO8859-13
  lt_LT.ISO_8859-13:                            lt_LT.ISO8859-13
  lt_LT.utf8:                                   lt_LT.UTF-8
@@ -1525,7 +1506,7 @@
  lv:                                           lv_LV.ISO8859-13
  lv_LV:                                                lv_LV.ISO8859-13
  lv_LV.iso88594:                                       lv_LV.ISO8859-4
-@@ -799,6 +915,8 @@
+@@ -793,6 +912,8 @@
  mi:                                           mi_NZ.ISO8859-1
  mi_NZ:                                                mi_NZ.ISO8859-1
  mi_NZ.iso88591:                                       mi_NZ.ISO8859-1
@@ -1534,7 +1515,7 @@
  mk:                                           mk_MK.ISO8859-5
  mk_MK:                                                mk_MK.ISO8859-5
  mk_MK.iso88595:                                       mk_MK.ISO8859-5
-@@ -811,6 +929,9 @@
+@@ -805,6 +926,9 @@
  ml:                                           ml_IN.UTF-8
  ml_IN:                                                ml_IN.UTF-8
  ml_IN.utf8:                                   ml_IN.UTF-8
@@ -1544,7 +1525,7 @@
  mr:                                           mr_IN.UTF-8
  mr_IN:                                                mr_IN.UTF-8
  mr_IN.utf8:                                   mr_IN.UTF-8
-@@ -818,9 +939,12 @@
+@@ -812,9 +936,12 @@
  ms_MY:                                                ms_MY.ISO8859-1
  ms_MY.iso88591:                                       ms_MY.ISO8859-1
  ms_MY.ISO-8859-1:                             ms_MY.ISO8859-1
@@ -1557,7 +1538,7 @@
  nb:                                           nb_NO.ISO8859-1
  nb_NO:                                                nb_NO.ISO8859-1
  nb_NO.88591:                                  nb_NO.ISO8859-1
-@@ -829,6 +953,19 @@
+@@ -823,6 +950,19 @@
  nb_NO.iso885915:                              nb_NO.ISO8859-15
  nb_NO.ISO-8859-15:                            nb_NO.ISO8859-15
  nb_NO.utf8:                                   nb_NO.UTF-8
@@ -1577,7 +1558,7 @@
  ne_NP:                                                ne_NP.UTF-8
  ne_NP.utf8:                                   ne_NP.UTF-8
  nl:                                           nl_NL.ISO8859-1
-@@ -840,8 +977,9 @@
+@@ -834,8 +974,9 @@
  nl_BE.ISO-8859-1:                             nl_BE.ISO8859-1
  nl_BE.ISO_8859-1:                             nl_BE.ISO8859-1
  nl_BE.iso885915:                              nl_BE.ISO8859-15
@@ -1588,7 +1569,7 @@
  nl_BE@euro:                                   nl_BE.ISO8859-15
  nl_BE.utf8:                                   nl_BE.UTF-8
  nl_BE.UTF-8@euro:                             nl_BE.UTF-8
-@@ -849,11 +987,12 @@
+@@ -843,11 +984,12 @@
  nl_NL.88591:                                  nl_NL.ISO8859-1
  nl_NL.88591.en:                                       nl_NL.ISO8859-1
  nl_NL.iso88591:                                       nl_NL.ISO8859-1
@@ -1602,7 +1583,7 @@
  nl_NL@euro:                                   nl_NL.ISO8859-15
  nl_NL.utf8:                                   nl_NL.UTF-8
  nl_NL.UTF-8@euro:                             nl_NL.UTF-8
-@@ -865,31 +1004,35 @@
+@@ -859,31 +1001,35 @@
  nn_NO.iso885915:                              nn_NO.ISO8859-15
  nn_NO.ISO-8859-15:                            nn_NO.ISO8859-15
  nn_NO.utf8:                                   nn_NO.UTF-8
@@ -1628,9 +1609,9 @@
 +no_NO.iso885915:                              nb_NO.ISO8859-15
 +no_NO.ISO-8859-15:                            nb_NO.ISO8859-15
 +no_NO.utf8:                                   nb_NO.UTF-8
- nr:                                                   nr_ZA.ISO8859-1
+ nr:                                           nr_ZA.ISO8859-1
  nr_ZA:                                                nr_ZA.ISO8859-1
- nr_ZA.iso88591:                               nr_ZA.ISO8859-1
+ nr_ZA.iso88591:                                       nr_ZA.ISO8859-1
 +nr_ZA.ISO-8859-1:                             nr_ZA.ISO8859-1
  nr_ZA.utf8:                                   nr_ZA.UTF-8
 -nso:                                          nso_ZA.ISO8859-15
@@ -1639,9 +1620,9 @@
 +nso_ZA:                                               nso_ZA.ISO8859-10
 +nso_ZA.iso885910:                             nso_ZA.ISO8859-10
 +nso_ZA.ISO-8859-10:                           nso_ZA.ISO8859-10
- nso_ZA.iso885915:                     nso_ZA.ISO8859-15
+ nso_ZA.iso885915:                             nso_ZA.ISO8859-15
 +nso_ZA.ISO-8859-15:                           nso_ZA.ISO8859-15
- nso_ZA.utf8:                          nso_ZA.UTF-8
+ nso_ZA.utf8:                                  nso_ZA.UTF-8
 -ny:                                           ny_NO.ISO8859-1
 -ny_NO:                                                ny_NO.ISO8859-1
 -ny_NO.88591:                                  ny_NO.ISO8859-1
@@ -1651,13 +1632,13 @@
 +ny:                                           nn_NO.ISO8859-1
 +ny_NO:                                                nn_NO.ISO8859-1
 +ny_NO.88591:                                  nn_NO.ISO8859-1
-+ny_NO.ISO-8859-1:                             nn_NO.ISO8859-1
++ny_NO.ISO_8859-1:                             nn_NO.ISO8859-1
 +ny_NO.iso885915:                              nn_NO.ISO8859-15
 +no@nynorsk:                                   nn_NO.ISO8859-1
  nynorsk:                                      nn_NO.ISO8859-1
  oc:                                           oc_FR.ISO8859-1
  oc_FR:                                                oc_FR.ISO8859-1
-@@ -897,14 +1040,31 @@
+@@ -891,14 +1037,31 @@
  oc_FR.ISO-8859-1:                             oc_FR.ISO8859-1
  oc_FR.iso885915:                              oc_FR.ISO8859-15
  oc_FR.ISO-8859-15:                            oc_FR.ISO8859-15
@@ -1689,7 +1670,7 @@
  pd:                                           pd_US.ISO8859-1
  pd_DE:                                                pd_DE.ISO8859-1
  pd_US:                                                pd_US.ISO8859-1
-@@ -912,18 +1072,22 @@
+@@ -906,18 +1069,22 @@
  pd_US.iso88591:                                       pd_US.ISO8859-1
  pd_DE.iso885915:                              pd_DE.ISO8859-15
  pd_US.iso885915:                              pd_US.ISO8859-15
@@ -1718,7 +1699,7 @@
  pt:                                           pt_PT.ISO8859-1
  pt.ISO8859-15:                                        pt_PT.ISO8859-15
  pt_BR:                                                pt_BR.ISO8859-1
-@@ -932,7 +1096,6 @@
+@@ -926,7 +1093,6 @@
  pt_BR.iso88591:                                       pt_BR.ISO8859-1
  pt_BR.ISO-8859-1:                             pt_BR.ISO8859-1
  pt_BR.ISO_8859-1:                             pt_BR.ISO8859-1
@@ -1726,7 +1707,7 @@
  pt_BR.utf8:                                   pt_BR.UTF-8
  pt_PT:                                                pt_PT.ISO8859-1
  pt_PT.88591:                                  pt_PT.ISO8859-1
-@@ -941,8 +1104,9 @@
+@@ -935,8 +1101,9 @@
  pt_PT.ISO-8859-1:                             pt_PT.ISO8859-1
  pt_PT.ISO_8859-1:                             pt_PT.ISO8859-1
  pt_PT.iso885915:                              pt_PT.ISO8859-15
@@ -1737,7 +1718,7 @@
  pt_PT@euro:                                   pt_PT.ISO8859-15
  pt_PT.utf8:                                   pt_PT.UTF-8
  pt_PT.UTF-8@euro:                             pt_PT.UTF-8
-@@ -950,6 +1114,8 @@
+@@ -944,6 +1111,8 @@
  ro_RO:                                                ro_RO.ISO8859-2
  ro_RO.iso88592:                                       ro_RO.ISO8859-2
  ro_RO.ISO-8859-2:                             ro_RO.ISO8859-2
@@ -1746,21 +1727,21 @@
  ro_RO.utf8:                                   ro_RO.UTF-8
  ru:                                           ru_RU.UTF-8
  ru.koi8-r:                                    ru_RU.KOI8-R
-@@ -975,10 +1141,12 @@
+@@ -969,10 +1138,12 @@
  ru_UA.microsoftcp1251:                                ru_UA.CP1251
  ru_UA.microsoft-cp1251:                               ru_UA.CP1251
  ru_UA.MICROSOFT-CP1251:                               ru_UA.CP1251
 +ru_UA.utf8:                                   ru_UA.UTF-8
- rw:                         rw_RW.ISO8859-1
- rw_RW:                      rw_RW.ISO8859-1
- rw_RW.iso8859-1:            rw_RW.ISO8859-1
- rw_RW.ISO-8859-1:           rw_RW.ISO8859-1
-+rw_RW.ISO_8859-1:           rw_RW.ISO8859-1
- rw_RW.utf8:                 rw_RW.UTF-8
+ rw:                                           rw_RW.ISO8859-1
+ rw_RW:                                                rw_RW.ISO8859-1
+ rw_RW.iso8859-1:                              rw_RW.ISO8859-1
+ rw_RW.ISO-8859-1:                             rw_RW.ISO8859-1
++rw_RW.ISO_8859-1:                             rw_RW.ISO8859-1
+ rw_RW.utf8:                                   rw_RW.UTF-8
  sd:                                           sd_IN.UTF-8
  sd_IN.utf8:                                   sd_IN.UTF-8
-@@ -998,6 +1166,10 @@
- sh_YU.utf8:                                   sr_RS.UTF-8@latin
+@@ -983,6 +1154,10 @@
+ se_NO.utf8:                                   se_NO.UTF-8
  si:                                           si_LK.UTF-8
  si_LK:                                                si_LK.UTF-8
 +si_LK.utf8:                                   si_LK.UTF-8
@@ -1770,7 +1751,7 @@
  sk:                                           sk_SK.ISO8859-2
  sk_SK:                                                sk_SK.ISO8859-2
  sk_SK.iso88592:                                       sk_SK.ISO8859-2
-@@ -1007,11 +1179,27 @@
+@@ -992,11 +1167,27 @@
  sl_SI:                                                sl_SI.ISO8859-2
  sl_SI.iso88592:                                       sl_SI.ISO8859-2
  sl_SI.ISO-8859-2:                             sl_SI.ISO8859-2
@@ -1800,27 +1781,27 @@
 +sq_AL.iso88591:                                       sq_AL.ISO8859-1
 +sq_AL.ISO-8859-1:                             sq_AL.ISO8859-1
  sq_AL.utf8:                                   sq_AL.UTF-8
- XCOMM YU was the old ISO code for Yugoslavia (later CS for Serbia&Montenegro).
- XCOMM CS was the old ISO code for Serbia&Montenegro (now separate RS and ME).
-@@ -1035,13 +1223,17 @@
+ sr:                                           sr_RS.UTF-8
+ sr@cyrillic:                                  sr_RS.UTF-8
+@@ -1009,13 +1200,17 @@
  sr_RS.utf8:                                   sr_RS.UTF-8
  sr_ME:                                                sr_ME.UTF-8
  sr_ME.utf8:                                   sr_ME.UTF-8
 +sr@ije:                                               sr_ME.UTF-8
 +sr_CS@ije:                                    sr_ME.UTF-8
- ss:                                                   ss_ZA.ISO8859-1
+ ss:                                           ss_ZA.ISO8859-1
  ss_ZA:                                                ss_ZA.ISO8859-1
- ss_ZA.iso88591:                               ss_ZA.ISO8859-1
+ ss_ZA.iso88591:                                       ss_ZA.ISO8859-1
 +ss_ZA.ISO-8859-1:                             ss_ZA.ISO8859-1
  ss_ZA.utf8:                                   ss_ZA.UTF-8
- st:                                                   st_ZA.ISO8859-1
+ st:                                           st_ZA.ISO8859-1
  st_ZA:                                                st_ZA.ISO8859-1
- st_ZA.iso88591:                               st_ZA.ISO8859-1
+ st_ZA.iso88591:                                       st_ZA.ISO8859-1
 +st_ZA.ISO-8859-1:                             st_ZA.ISO8859-1
  st_ZA.utf8:                                   st_ZA.UTF-8
  sv:                                           sv_SE.ISO8859-1
  sv.ISO8859-15:                                        sv_SE.ISO8859-15
-@@ -1051,6 +1243,7 @@
+@@ -1025,6 +1220,7 @@
  sv_FI.ISO-8859-1:                             sv_FI.ISO8859-1
  sv_FI.iso885915:                              sv_FI.ISO8859-15
  sv_FI.ISO-8859-15:                            sv_FI.ISO8859-15
@@ -1828,7 +1809,7 @@
  sv_FI.ISO-8859-15@euro:                               sv_FI.ISO8859-15
  sv_FI@euro:                                   sv_FI.ISO8859-15
  sv_FI.UTF-8@euro:                             sv_FI.UTF-8
-@@ -1065,32 +1258,56 @@
+@@ -1039,32 +1235,56 @@
  sv_SE.ISO-8859-15:                            sv_SE.ISO8859-15
  sv_SE@euro:                                   sv_SE.ISO8859-15
  sv_SE.utf8:                                   sv_SE.UTF-8
@@ -1875,16 +1856,16 @@
  tl_PH.iso88591:                                       tl_PH.ISO8859-1
  tl_PH.ISO-8859-1:                             tl_PH.ISO8859-1
 -tn:                                           tn_ZA.ISO8859-15
--tn_ZA:                                        tn_ZA.ISO8859-15
--tn_ZA.iso8859-15:             tn_ZA.ISO8859-15
+-tn_ZA:                                                tn_ZA.ISO8859-15
+-tn_ZA.iso8859-15:                             tn_ZA.ISO8859-15
 +tl_PH.utf8:                                   tl_PH.UTF-8
 +tn:                                           tn_ZA.ISO8859-10
-+tn_ZA:                                        tn_ZA.ISO8859-10
++tn_ZA:                                                tn_ZA.ISO8859-10
 +tn_ZA.iso885910:                              tn_ZA.ISO8859-10
 +tn_ZA.ISO-8859-10:                            tn_ZA.ISO8859-10
-+tn_ZA.iso885915:              tn_ZA.ISO8859-15
++tn_ZA.iso885915:                              tn_ZA.ISO8859-15
 +tn_ZA.ISO-8859-15:                            tn_ZA.ISO8859-15
- tn_ZA.utf8:                           tn_ZA.UTF-8
+ tn_ZA.utf8:                                   tn_ZA.UTF-8
  tr:                                           tr_TR.ISO8859-9
 +tr_CY:                                                tr_CY.ISO8859-9
 +tr_CY.iso88599:                                       tr_CY.ISO8859-9
@@ -1893,10 +1874,10 @@
  tr_TR:                                                tr_TR.ISO8859-9
  TR_TR:                                                tr_TR.ISO8859-9
  tr_TR.iso88599:                                       tr_TR.ISO8859-9
-@@ -1100,14 +1317,18 @@
- ts:                                                   ts_ZA.ISO8859-1
+@@ -1074,14 +1294,18 @@
+ ts:                                           ts_ZA.ISO8859-1
  ts_ZA:                                                ts_ZA.ISO8859-1
- ts_ZA.iso88591:                               ts_ZA.ISO8859-1
+ ts_ZA.iso88591:                                       ts_ZA.ISO8859-1
 +ts_ZA.ISO-8859-1:                             ts_ZA.ISO8859-1
  ts_ZA.utf8:                                   ts_ZA.UTF-8
  tt:                                           tt_RU.TATAR-CYR
@@ -1913,7 +1894,7 @@
  uk_UA.koi8u:                                  uk_UA.KOI8-U
  uk_UA.cp1251:                                 uk_UA.CP1251
  uk_UA.microsoftcp1251:                                uk_UA.CP1251
-@@ -1123,23 +1344,33 @@
+@@ -1097,14 +1321,24 @@
  ur_PK.microsoftcp1256:                                ur_PK.CP1256
  ur_PK.microsoft-cp1256:                               ur_PK.CP1256
  ur_PK.MICROSOFT-CP1256:                               ur_PK.CP1256
@@ -1930,27 +1911,15 @@
 +uz_UZ.utf8@cyrillic:                          uz_UZ.UTF-8
  uz_UZ.UTF-8@cyrillic:                         uz_UZ.UTF-8
  ve:                                           ve_ZA.UTF-8
--ve_ZA:                                        ve_ZA.UTF-8
--ve_ZA.utf8:                           ve_ZA.UTF-8
-+ve_ZA:                                                ve_ZA.UTF-8
-+ve_ZA.utf8:                                   ve_ZA.UTF-8
+ ve_ZA:                                                ve_ZA.UTF-8
+ ve_ZA.utf8:                                   ve_ZA.UTF-8
 +ven:                                          ve_ZA.UTF-8
 +ven_ZA:                                               ve_ZA.UTF-8
 +ven_ZA.utf8:                                  ve_ZA.UTF-8
  vi:                                           vi_VN.TCVN
  vi_VN:                                                vi_VN.TCVN
  Vi_VN:                                                vi_VN.TCVN
- VI_VN:                                                vi_VN.TCVN
- vi_VN.tcvn:                                   vi_VN.TCVN
- vi_VN.tcvn5712:                                       vi_VN.TCVN
-+vi_VN.utf8:                                   vi_VN.UTF-8
- vi_VN.viscii:                                 vi_VN.VISCII
- vi_VN.viscii111:                              vi_VN.VISCII
--vi_VN.utf8:                                   vi_VN.UTF-8
- VI_VN.UTF-8:                                  vi_VN.UTF-8
- wa:                                           wa_BE.ISO8859-1
- wa_BE:                                                wa_BE.ISO8859-1
-@@ -1147,11 +1378,14 @@
+@@ -1121,11 +1355,14 @@
  wa_BE.ISO-8859-1:                             wa_BE.ISO8859-1
  wa_BE.iso885915:                              wa_BE.ISO8859-15
  wa_BE.ISO-8859-15:                            wa_BE.ISO8859-15
@@ -1958,14 +1927,14 @@
  wa_BE.ISO-8859-15@euro:                               wa_BE.ISO8859-15
  wa_BE@euro:                                   wa_BE.ISO8859-15
 +wa_BE.utf8:                                   wa_BE.UTF-8
- xh:                                                   xh_ZA.ISO8859-1
+ xh:                                           xh_ZA.ISO8859-1
  xh_ZA:                                                xh_ZA.ISO8859-1
- xh_ZA.iso88591:                               xh_ZA.ISO8859-1
+ xh_ZA.iso88591:                                       xh_ZA.ISO8859-1
 +xh_ZA.ISO-8859-1:                             xh_ZA.ISO8859-1
  xh_ZA.utf8:                                   xh_ZA.UTF-8
  yi:                                           yi_US.CP1255
  yi_US:                                                yi_US.CP1255
-@@ -1159,6 +1393,7 @@
+@@ -1133,6 +1370,7 @@
  yi_US.microsoftcp1255:                                yi_US.CP1255
  yi_US.microsoft-cp1255:                               yi_US.CP1255
  yi_US.MICROSOFT-CP1255:                               yi_US.CP1255
@@ -1973,7 +1942,7 @@
  zh_CN:                                                zh_CN.gb2312
  zh_CN.Big5:                                   zh_TW.big5
  zh_CN.EUC:                                    zh_CN.eucCN
-@@ -1171,8 +1406,10 @@
+@@ -1145,8 +1383,10 @@
  ZH_CN.UTF-8:                                  zh_CN.UTF-8
  zh_HK:                                                zh_HK.big5hkscs
  zh_HK.BIG5HK:                                 zh_HK.big5hkscs
@@ -1984,7 +1953,7 @@
  zh_HK.Big5_hkscs:                             zh_HK.big5hkscs
  zh_HK.Big5HKSCS:                              zh_HK.big5hkscs
  zh_HK.BIG5-HKSCS:                             zh_HK.big5hkscs
-@@ -1184,6 +1421,10 @@
+@@ -1158,6 +1398,10 @@
  zh_HK.Big5:                                   zh_HK.big5
  zh_HK.utf8:                                   zh_HK.UTF-8
  ZH_HK.UTF-8:                                  zh_HK.UTF-8
@@ -1995,22 +1964,17 @@
  ZH_SG.UTF-8:                                  zh_SG.UTF-8
  zh_TW:                                                zh_TW.big5
  zh_TW.Big5:                                   zh_TW.big5
-@@ -1193,9 +1434,11 @@
- zh_TW.EUC-TW:                                 zh_TW.eucTW
- zh_TW.utf8:                                   zh_TW.UTF-8
- ZH_TW.UTF-8:                                  zh_TW.UTF-8
--zu:                                                   zu_ZA.ISO8859-1
-+zu:                                           zu_ZA.ISO8859-1
+@@ -1170,6 +1414,8 @@
+ zu:                                           zu_ZA.ISO8859-1
  zu_ZA:                                                zu_ZA.ISO8859-1
--zu_ZA.iso88591:                               zu_ZA.ISO8859-1
-+zu_ZA.iso88591:                                       zu_ZA.ISO8859-1
+ zu_ZA.iso88591:                                       zu_ZA.ISO8859-1
 +zu_ZA.ISO-8859-1:                             zu_ZA.ISO8859-1
 +zu_ZA.ISO_8859-1:                             zu_ZA.ISO8859-1
  zu_ZA.utf8:                                   zu_ZA.UTF-8
  
  XCOMM The following locale names are used in SCO 3.0
---- libX11-1.6.4/nls/locale.dir.pre.orig       2016-08-17 10:56:16.000000000 +0200
-+++ libX11-1.6.4/nls/locale.dir.pre    2016-10-05 16:24:58.051351064 +0200
+--- libX11-1.7.0/nls/locale.dir.pre.orig       2020-11-20 20:08:11.000000000 +0100
++++ libX11-1.7.0/nls/locale.dir.pre    2020-11-27 17:57:42.863853203 +0100
 @@ -6,8 +6,11 @@
  XCOMM
  
@@ -2041,7 +2005,7 @@
  iso8859-15/XLC_LOCALE:                        ca_AD.ISO8859-15
  iso8859-1/XLC_LOCALE:                 ca_ES.ISO8859-1
 @@ -62,15 +66,16 @@
- iso8859-1/XLC_LOCALE:                 de_LI.ISO8859-15
+ iso8859-15/XLC_LOCALE:                        de_LI.ISO8859-15
  iso8859-1/XLC_LOCALE:                 de_LU.ISO8859-1
  iso8859-15/XLC_LOCALE:                        de_LU.ISO8859-15
 +iso8859-7/XLC_LOCALE:                 el_CY.ISO8859-7
@@ -2104,7 +2068,7 @@
  ibm-cp1133/XLC_LOCALE:                        lo_LA.IBM-CP1133
  mulelao-1/XLC_LOCALE:                 lo_LA.MULELAO-1
  iso8859-4/XLC_LOCALE:                 lt_LT.ISO8859-4
-@@ -188,48 +200,51 @@
+@@ -188,46 +200,52 @@
  iso8859-1/XLC_LOCALE:                 ms_MY.ISO8859-1
  iso8859-3/XLC_LOCALE:                 mt_MT.ISO8859-3
  iso8859-1/XLC_LOCALE:                 nb_NO.ISO8859-1
@@ -2136,8 +2100,8 @@
  iso8859-15/XLC_LOCALE:                        pd_US.ISO8859-15
 -iso8859-1/XLC_LOCALE:                 ph_PH.ISO8859-1
  iso8859-2/XLC_LOCALE:                 pl_PL.ISO8859-2
--iso8859-1/XLC_LOCALE:                 pp_AN.ISO8859-1
 +iso8859-16/XLC_LOCALE:                        pl_PL.ISO8859-16
+ iso8859-1/XLC_LOCALE:                 pp_AN.ISO8859-1
  iso8859-1/XLC_LOCALE:                 pt_BR.ISO8859-1
  iso8859-15/XLC_LOCALE:                        pt_BR.ISO8859-15
  iso8859-1/XLC_LOCALE:                 pt_PT.ISO8859-1
@@ -2154,8 +2118,6 @@
  iso8859-2/XLC_LOCALE:                         sk_SK.ISO8859-2
  iso8859-2/XLC_LOCALE:                         sl_SI.ISO8859-2
 -iso8859-2/XLC_LOCALE:                         sq_AL.ISO8859-2
--iso8859-2/XLC_LOCALE:                 sr_CS.ISO8859-2
--iso8859-5/XLC_LOCALE:                 sr_CS.ISO8859-5
 -iso8859-2/XLC_LOCALE:                 sr_YU.ISO8859-2
 -iso8859-5/XLC_LOCALE:                 sr_YU.ISO8859-5
 -microsoft-cp1251/XLC_LOCALE:          sr_YU.CP1251
@@ -2171,7 +2133,7 @@
  iso8859-1/XLC_LOCALE:                 ss_ZA.ISO8859-1
  iso8859-1/XLC_LOCALE:                 st_ZA.ISO8859-1
  iso8859-1/XLC_LOCALE:                 sv_FI.ISO8859-1
-@@ -237,15 +252,17 @@
+@@ -235,15 +253,17 @@
  iso8859-1/XLC_LOCALE:                 sv_SE.ISO8859-1
  iso8859-15/XLC_LOCALE:                        sv_SE.ISO8859-15
  tscii-0/XLC_LOCALE:                   ta_IN.TSCII-0
@@ -2192,7 +2154,7 @@
  iso8859-5/XLC_LOCALE:                         uk_UA.ISO8859-5
  microsoft-cp1251/XLC_LOCALE:          uk_UA.CP1251
  koi8-u/XLC_LOCALE:                    uk_UA.KOI8-U
-@@ -262,13 +279,16 @@
+@@ -260,13 +280,16 @@
  zh_CN.gbk/XLC_LOCALE:                 zh_CN.gbk
  zh_CN.gb18030/XLC_LOCALE:             zh_CN.gb18030
  zh_HK.big5/XLC_LOCALE:                        zh_HK.big5
@@ -2210,7 +2172,7 @@
  en_US.UTF-8/XLC_LOCALE:                       ar_AA.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ar_AE.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ar_BH.UTF-8
-@@ -282,7 +302,6 @@
+@@ -280,7 +303,6 @@
  en_US.UTF-8/XLC_LOCALE:                       ar_LY.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ar_MA.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ar_OM.UTF-8
@@ -2218,7 +2180,7 @@
  en_US.UTF-8/XLC_LOCALE:                       ar_QA.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ar_SA.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ar_SD.UTF-8
-@@ -317,11 +317,14 @@ en_US.UTF-8/XLC_LOCALE:                  bn_BD.UTF-8
+@@ -297,11 +319,14 @@
  en_US.UTF-8/XLC_LOCALE:                       bn_IN.UTF-8
  en_US.UTF-8/XLC_LOCALE:                 bo_IN.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       br_FR.UTF-8
@@ -2233,7 +2195,7 @@
  en_US.UTF-8/XLC_LOCALE:                       cy_GB.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       da_DK.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       de_AT.UTF-8
-@@ -331,7 +353,6 @@
+@@ -330,7 +355,6 @@
  en_US.UTF-8/XLC_LOCALE:                       en_PH.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       en_SG.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       en_TT.UTF-8
@@ -2241,7 +2203,7 @@
  en_US.UTF-8/XLC_LOCALE:                       en_US.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       en_ZA.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       en_ZW.UTF-8
-@@ -361,6 +382,7 @@
+@@ -360,6 +384,7 @@
  en_US.UTF-8/XLC_LOCALE:                       eu_ES.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       fa_IR.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       fi_FI.UTF-8
@@ -2249,7 +2211,7 @@
  en_US.UTF-8/XLC_LOCALE:                       fo_FO.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       fr_BE.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       fr_CA.UTF-8
-@@ -369,6 +391,7 @@
+@@ -368,6 +393,7 @@
  en_US.UTF-8/XLC_LOCALE:                       fr_LU.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ga_IE.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       gd_GB.UTF-8
@@ -2257,15 +2219,15 @@
  en_US.UTF-8/XLC_LOCALE:                       gl_ES.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       gu_IN.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       gv_GB.UTF-8
-@@ -376,6 +399,7 @@
+@@ -375,6 +401,7 @@
  en_US.UTF-8/XLC_LOCALE:                       hi_IN.UTF-8
  en_US.UTF-8/XLC_LOCALE:                 hne_IN.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       hr_HR.UTF-8
 +en_US.UTF-8/XLC_LOCALE:                       hsb_DE.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       hu_HU.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       hy_AM.UTF-8
- en_US.UTF-8/XLC_LOCALE:                       id_ID.UTF-8
-@@ -395,6 +419,9 @@
+ en_US.UTF-8/XLC_LOCALE:                       ia.UTF-8
+@@ -396,6 +423,9 @@
  en_US.UTF-8/XLC_LOCALE:                       ku_TR.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       kw_GB.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ky_KG.UTF-8
@@ -2275,7 +2237,7 @@
  en_US.UTF-8/XLC_LOCALE:                       lo_LA.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       lt_LT.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       lv_LV.UTF-8
-@@ -402,26 +429,27 @@
+@@ -403,26 +433,27 @@
  en_US.UTF-8/XLC_LOCALE:                       mi_NZ.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       mk_MK.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ml_IN.UTF-8
@@ -2307,7 +2269,7 @@
  pt_BR.UTF-8/XLC_LOCALE:                       pt_BR.UTF-8
  pt_PT.UTF-8/XLC_LOCALE:                       pt_PT.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ro_RO.UTF-8
-@@ -432,17 +460,19 @@
+@@ -433,16 +464,19 @@
  en_US.UTF-8/XLC_LOCALE:                 sd_IN.UTF-8
  en_US.UTF-8/XLC_LOCALE:                 sd_IN.UTF-8@devanagari
  en_US.UTF-8/XLC_LOCALE:                       se_NO.UTF-8
@@ -2322,7 +2284,6 @@
 +en_US.UTF-8/XLC_LOCALE:                       so_KE.UTF-8
 +en_US.UTF-8/XLC_LOCALE:                       so_SO.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       sq_AL.UTF-8
--en_US.UTF-8/XLC_LOCALE:                       sr_CS.UTF-8
 +en_US.UTF-8/XLC_LOCALE:                       sr_BA.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       sr_ME.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       sr_RS.UTF-8
@@ -2331,7 +2292,7 @@
  en_US.UTF-8/XLC_LOCALE:                       ss_ZA.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       st_ZA.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       sv_FI.UTF-8
-@@ -453,8 +483,11 @@
+@@ -453,8 +487,11 @@
  th_TH.UTF-8/XLC_LOCALE:                       th_TH.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ti_ER.UTF-8
  en_US.UTF-8/XLC_LOCALE:                       ti_ET.UTF-8

diff --git a/xorg-lib-libX11.spec b/xorg-lib-libX11.spec
index 69d5ff23e0e518538ad3ee9a6734d484e2177976..ba300c2e1df96de8d5950e3cab10f15b1524fb7d 100644 (file)
--- a/xorg-lib-libX11.spec
+++ b/xorg-lib-libX11.spec
@@ -5,12 +5,12 @@
 Summary:       Core X11 protocol client library
 Summary(pl.UTF-8):     Podstawowa biblioteka kliencka protokołu X11
 Name:          xorg-lib-libX11
-Version:       1.6.12
+Version:       1.7.0
 Release:       1
 License:       MIT
 Group:         X11/Libraries
 Source0:       https://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
-# Source0-md5: 046aae3133f35bc12a183e4e107cb690
+# Source0-md5: f46572566e2cec801609d25f735285b7
 # sync locales and their encodings with glibc
 Patch0:                %{name}-glibc-locale_sync.patch
 URL:           https://xorg.freedesktop.org/
@@ -29,7 +29,7 @@ BuildRequires:        xorg-proto-inputproto-devel
 BuildRequires: xorg-proto-kbproto-devel
 BuildRequires: xorg-proto-xextproto-devel
 BuildRequires: xorg-proto-xf86bigfontproto-devel >= 1.2.0
-BuildRequires: xorg-proto-xproto-devel >= 7.0.21
+BuildRequires: xorg-proto-xproto-devel >= 7.0.25
 BuildRequires: xorg-sgml-doctools >= 1.10
 BuildRequires: xorg-util-util-macros >= 1.15
 Requires:      %{name}-data = %{version}-%{release}
@@ -66,7 +66,7 @@ Requires:     %{name} = %{version}-%{release}
 Requires:      libxcb-devel >= 1.11.1
 # after <X11/extensions/XKBgeom.h> removal
 Requires:      xorg-proto-kbproto-devel >= 1.0.7-2019.1.3
-Requires:      xorg-proto-xproto-devel >= 7.0.21
+Requires:      xorg-proto-xproto-devel >= 7.0.25
 Obsoletes:     libX11-devel
 
 %description devel
@@ -138,9 +138,6 @@ done
 # for xorg-app-x11perf and possibly others
 install -d $RPM_BUILD_ROOT%{_libdir}/X11
 
-# obsolete locale (rename to sr_RS / sr_ME?)
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/X11/locale/sr_CS.UTF-8
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -225,6 +222,7 @@ fi
 %lang(pt_BR) %{_datadir}/X11/locale/pt_BR.UTF-8
 %lang(pt) %{_datadir}/X11/locale/pt_PT.UTF-8
 %lang(ru) %{_datadir}/X11/locale/ru_RU.UTF-8
+%lang(sr) %{_datadir}/X11/locale/sr_RS.UTF-8
 %lang(th) %{_datadir}/X11/locale/th_TH
 %lang(th) %{_datadir}/X11/locale/th_TH.UTF-8
 %lang(vi) %{_datadir}/X11/locale/vi_VN.tcvn