X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=X11-glibc-locale_sync.patch;h=a7cce1e0b4b689f5d4080fb9c6f50fe52d7e0f3b;hb=bc079d42b3f0514c49a2687481a1548bfa2d28ee;hp=8cf6fd8ce801d594b32de5970ea81b0d6763ffbe;hpb=458a61b88e49881354f53bcb38c7e0229f1c7677;p=packages%2FX11.git diff --git a/X11-glibc-locale_sync.patch b/X11-glibc-locale_sync.patch index 8cf6fd8..a7cce1e 100644 --- a/X11-glibc-locale_sync.patch +++ b/X11-glibc-locale_sync.patch @@ -449,10 +449,7 @@ +END XLC_XLOCALE --- X11-6.8.1/xc/nls/locale.dir.orig 2004-09-22 09:38:51.000000000 +0200 +++ X11-6.8.1/xc/nls/locale.dir 2004-11-23 05:15:48.000000000 +0100 -@@ -1 +1,2 @@ -+# $XdotOrg: xc/nls/locale.dir,v 1.2 2004/04/23 18:44:33 eich Exp $ - XCOMM $XdotOrg: xc/nls/locale.dir,v 1.2 2004/04/23 18:44:33 eich Exp $ -@@ -11,4 +12,7 @@ +@@ -11,4 +11,7 @@ C/XLC_LOCALE: C +iso8859-1/XLC_LOCALE: aa_DJ.ISO8859-1 iso8859-1/XLC_LOCALE: af_ZA.ISO8859-1 @@ -460,20 +457,25 @@ iso8859-6/XLC_LOCALE: ar_AA.ISO8859-6 +iso8859-6/XLC_LOCALE: ar_AE.ISO8859-6 iso8859-6/XLC_LOCALE: ar_BH.ISO8859-6 -@@ -27,2 +31,4 @@ +@@ -27,2 +30,4 @@ iso8859-6/XLC_LOCALE: ar_SY.ISO8859-6 +iso8859-6/XLC_LOCALE: ar_SD.ISO8859-6 +iso8859-6/XLC_LOCALE: ar_SY.ISO8859-6 iso8859-6/XLC_LOCALE: ar_TN.ISO8859-6 -@@ -39,2 +45,3 @@ +@@ -30,3 +35,3 @@ + iso8859-9e/XLC_LOCALE: az_AZ.ISO8859-9E +-koi8-c/XLC_LOCALE: az_AZ.KOI8-C ++koi8-c/XLC_LOCALE: az_AZ.KOI8-K + iso8859-5/XLC_LOCALE: be_BY.ISO8859-5 +@@ -39,2 +44,3 @@ iso8859-15/XLC_LOCALE: br_FR.ISO8859-15 +iso8859-2/XLC_LOCALE: bs_BA.ISO8859-2 iso8859-1/XLC_LOCALE: ca_ES.ISO8859-1 -@@ -45,3 +52,2 @@ +@@ -45,3 +51,2 @@ iso8859-15/XLC_LOCALE: cy_GB.ISO8859-15 -iso8859-2/XLC_LOCALE: cz_CZ.ISO8859-2 iso8859-1/XLC_LOCALE: da_DK.ISO8859-1 -@@ -59,9 +65,10 @@ +@@ -59,9 +64,10 @@ iso8859-15/XLC_LOCALE: de_LU.ISO8859-15 +iso8859-7/XLC_LOCALE: el_CY.ISO8859-7 iso8859-7/XLC_LOCALE: el_GR.ISO8859-7 @@ -486,7 +488,7 @@ iso8859-1/XLC_LOCALE: en_CA.ISO8859-1 +iso8859-1/XLC_LOCALE: en_DK.ISO8859-1 iso8859-1/XLC_LOCALE: en_GB.ISO8859-1 -@@ -76,5 +83,7 @@ +@@ -76,5 +82,7 @@ iso8859-1/XLC_LOCALE: en_SG.ISO8859-1 +iso8859-1/XLC_LOCALE: en_PH.ISO8859-1 +iso8859-1/XLC_LOCALE: en_SG.ISO8859-1 @@ -496,25 +498,25 @@ +iso8859-1/XLC_LOCALE: en_GB.ISO8859-1 +iso8859-15/XLC_LOCALE: en_GB.ISO8859-15 iso8859-1/XLC_LOCALE: en_US.ISO8859-1 -@@ -104,2 +113,3 @@ +@@ -104,2 +112,3 @@ iso8859-1/XLC_LOCALE: es_US.ISO8859-1 +iso8859-1/XLC_LOCALE: es_US.ISO8859-1 iso8859-1/XLC_LOCALE: es_UY.ISO8859-1 -@@ -115,2 +125,3 @@ +@@ -115,2 +124,3 @@ iso8859-15/XLC_LOCALE: fi_FI.ISO8859-15 +iso8859-1/XLC_LOCALE: fil_PH.ISO8859-1 iso8859-1/XLC_LOCALE: fo_FO.ISO8859-1 -@@ -142,3 +153,5 @@ +@@ -142,3 +152,5 @@ iso8859-2/XLC_LOCALE: hr_HR.ISO8859-2 +iso8859-2/XLC_LOCALE: hsb_DE.ISO8859-2 iso8859-2/XLC_LOCALE: hu_HU.ISO8859-2 +iso8859-16/XLC_LOCALE: hu_HU.ISO8859-16 armscii-8/XLC_LOCALE: hy_AM.ARMSCII-8 -@@ -155,2 +168,3 @@ +@@ -155,2 +167,3 @@ georgian-ps/XLC_LOCALE: ka_GE.GEORGIAN-PS +XCOMM pt-154/XLC_LOCALE: kk_KZ.PT154 iso8859-1/XLC_LOCALE: kl_GL.ISO8859-1 -@@ -160,2 +174,7 @@ +@@ -160,2 +173,7 @@ iso8859-15/XLC_LOCALE: kw_GB.ISO8859-15 +iso8859-10/XLC_LOCALE: lg_UG.ISO8859-10 +iso8859-1/XLC_LOCALE: li_BE.ISO8859-1 @@ -522,19 +524,19 @@ +iso8859-1/XLC_LOCALE: li_NL.ISO8859-1 +iso8859-15/XLC_LOCALE: li_NL.ISO8859-15 ibm-cp1133/XLC_LOCALE: lo_LA.IBM-CP1133 -@@ -166,3 +185,3 @@ +@@ -166,3 +184,3 @@ iso8859-13/XLC_LOCALE: lv_LV.ISO8859-13 -iso8859-13/XLC_LOCALE: mi_NZ.ISO8859-13 +iso8859-1/XLC_LOCALE: mi_NZ.ISO8859-1 iso8859-5/XLC_LOCALE: mk_MK.ISO8859-5 -@@ -172,3 +191,5 @@ +@@ -172,3 +190,5 @@ iso8859-1/XLC_LOCALE: nb_NO.ISO8859-1 -iso8859-1/XLC_LOCALE: nb_NO.ISO8859-15 +iso8859-15/XLC_LOCALE: nb_NO.ISO8859-15 +iso8859-1/XLC_LOCALE: nds_DE.ISO8859-1 +iso8859-15/XLC_LOCALE: nds_DE.ISO8859-15 iso8859-1/XLC_LOCALE: nl_BE.ISO8859-1 -@@ -179,12 +200,11 @@ +@@ -179,12 +199,12 @@ iso8859-1/XLC_LOCALE: nn_NO.ISO8859-15 -iso8859-1/XLC_LOCALE: no_NO.ISO8859-1 -iso8859-1/XLC_LOCALE: no_NO.ISO8859-15 @@ -546,6 +548,7 @@ iso8859-15/XLC_LOCALE: oc_FR.ISO8859-15 +iso8859-1/XLC_LOCALE: om_KE.ISO8859-1 +iso8859-1/XLC_LOCALE: pap_AN.ISO8859-1 ++iso8859-15/XLC_LOCALE: pap_AN.ISO8859-15 iso8859-1/XLC_LOCALE: pd_DE.ISO8859-1 -iso8859-1/XLC_LOCALE: ph_PH.ISO8859-1 iso8859-2/XLC_LOCALE: pl_PL.ISO8859-2 @@ -581,17 +584,22 @@ +iso8859-1/XLC_LOCALE: ss_ZA.ISO8859-1 +iso8859-1/XLC_LOCALE: st_ZA.ISO8859-1 iso8859-1/XLC_LOCALE: sv_FI.ISO8859-1 -@@ -212,2 +239,3 @@ - koi8-c/XLC_LOCALE: tg_TJ.KOI8-C +@@ -211,3 +238,4 @@ + tscii-0/XLC_LOCALE: ta_IN.TSCII-0 +-koi8-c/XLC_LOCALE: tg_TJ.KOI8-C ++koi8-c/XLC_LOCALE: tg_TJ.KOI8-K +koi8-t/XLC_LOCALE: tg_TJ.KOI8-T th_TH/XLC_LOCALE: th_TH.TIS620 -@@ -215,3 +243,6 @@ +@@ -215,5 +243,8 @@ iso8859-1/XLC_LOCALE: tl_PH.ISO8859-1 +iso8859-10/XLC_LOCALE: tn_ZA.ISO8859-10 +iso8859-9/XLC_LOCALE: tr_CY.ISO8859-9 iso8859-9/XLC_LOCALE: tr_TR.ISO8859-9 +iso8859-1/XLC_LOCALE: ts_ZA.ISO8859-1 tatar-cyr/XLC_LOCALE: tt_RU.TATAR-CYR +-koi8-c/XLC_LOCALE: tt_RU.KOI8-C ++koi8-c/XLC_LOCALE: tt_RU.KOI8-K + iso8859-5/XLC_LOCALE: uk_UA.ISO8859-5 @@ -222,2 +253,3 @@ microsoft-cp1256/XLC_LOCALE: ur_PK.CP1256 +iso8859-1/XLC_LOCALE: uz_UZ.ISO8859-1 @@ -768,7 +776,7 @@ en_US.UTF-8/XLC_LOCALE: wa_BE.UTF-8 +en_US.UTF-8/XLC_LOCALE: xh_ZA.UTF-8 en_US.UTF-8/XLC_LOCALE: yi_US.UTF-8 -@@ -388,2 +472,3 @@ +@@ -388,2 +471,3 @@ zh_TW.UTF-8/XLC_LOCALE: zh_TW.UTF-8 +en_US.UTF-8/XLC_LOCALE: zu_ZA.UTF-8 #ifdef __uxp__ @@ -903,12 +911,12 @@ -a3_AZ.koi8c: a3_AZ.KOI8-C +az_AZ.utf8: az_AZ.UTF-8 +az_AZ.utf8@cyrillic: az_AZ.UTF-8 -+az_AZ.koi8c: az_AZ.KOI8-C -+az_AZ@cyrillic: az_AZ.KOI8-C -+az_AZ.koi8c@cyrillic: az_AZ.KOI8-C -+a3: az_AZ.KOI8-C -+a3_AZ: az_AZ.KOI8-C -+a3_AZ.koi8c: az_AZ.KOI8-C ++az_AZ.koi8k: az_AZ.KOI8-K ++az_AZ@cyrillic: az_AZ.KOI8-K ++az_AZ.koi8k@cyrillic: az_AZ.KOI8-K ++a3: az_AZ.KOI8-K ++a3_AZ: az_AZ.KOI8-K ++a3_AZ.koi8c: az_AZ.KOI8-K be: be_BY.CP1251 @@ -78,3 +156,2 @@ be_BY.utf8: be_BY.UTF-8 @@ -1642,7 +1650,7 @@ +ny_NO.iso885915: nn_NO.ISO8859-15 +no@nynorsk: nn_NO.ISO8859-1 nynorsk: nn_NO.ISO8859-1 -@@ -638,4 +1028,30 @@ +@@ -638,4 +1028,33 @@ oc_FR.iso88591: oc_FR.ISO8859-1 +oc_FR.ISO-8859-1: oc_FR.ISO8859-1 +oc_FR.ISO_8859-1: oc_FR.ISO8859-1 @@ -1671,9 +1679,12 @@ +pap_AN.iso88591: pap_AN.ISO8859-1 +pap_AN.ISO-8859-1: pap_AN.ISO8859-1 +pap_AN.ISO_8859-1: pap_AN.ISO8859-1 ++pap_AN.iso885915@euro: pap_AN.ISO8859-15 ++pap_AN.ISO-8859-15@euro: pap_AN.ISO8859-15 ++pap_AN.ISO_8859-15@euro: pap_AN.ISO8859-15 +pap_AN.utf8: pap_AN.UTF-8 pd: pd_US.ISO8859-1 -@@ -647,5 +1063,6 @@ +@@ -647,5 +1066,6 @@ pd_US.iso885915: pd_US.ISO8859-15 -ph: ph_PH.ISO8859-1 -ph_PH: ph_PH.ISO8859-1 @@ -1683,7 +1694,7 @@ +ph_PH.iso88591: fil_PH.ISO8859-1 +ph_PH.ISO8859-1 fil_PH.ISO8859-1 pl: pl_PL.ISO8859-2 -@@ -654,6 +1071,11 @@ +@@ -654,6 +1074,11 @@ pl_PL.ISO-8859-2: pl_PL.ISO8859-2 +pl_PL.ISO_8859-2: pl_PL.ISO8859-2 +pl_PL.iso885916: pl_PL.ISO8859-16 @@ -1698,17 +1709,17 @@ +pp_AN.iso88591: pap_AN.ISO8859-1 +pp_AN.ISO8859-1 pap_AN.ISO8859-1 pt: pt_PT.ISO8859-1 -@@ -665,3 +1087,2 @@ +@@ -665,3 +1090,2 @@ pt_BR.ISO_8859-1: pt_BR.ISO8859-1 -pt_BR.iso885915: pt_BR.ISO8859-15 pt_BR.utf8: pt_BR.UTF-8 -@@ -674,2 +1095,5 @@ +@@ -674,2 +1098,5 @@ pt_PT.iso885915: pt_PT.ISO8859-15 +pt_PT.iso885915@euro: pt_PT.ISO8859-15 +pt_PT.ISO-8859-15@euro: pt_PT.ISO8859-15 +pt_PT.ISO_8859-15@euro: pt_PT.ISO8859-15 pt_PT@euro: pt_PT.ISO8859-15 -@@ -681,7 +1105,12 @@ +@@ -681,7 +1108,12 @@ ro_RO.ISO-8859-2: ro_RO.ISO8859-2 +ro_RO.ISO_8859-2: ro_RO.ISO8859-2 +ro_RO.iso885916: ro_RO.ISO8859-16 @@ -1723,11 +1734,11 @@ ru_RU.ISO-8859-5: ru_RU.ISO8859-5 +ru_RU.ISO_8859-5: ru_RU.ISO8859-5 ru_RU.koi8r: ru_RU.KOI8-R -@@ -691,2 +1120,3 @@ +@@ -691,2 +1123,3 @@ ru_RU.MICROSOFT-CP1251: ru_RU.CP1251 +ru_RU.utf8: ru_RU.UTF-8 #if defined(INCLUDE_ru_SU) -@@ -703,9 +1133,22 @@ +@@ -703,9 +1136,22 @@ ru_UA.MICROSOFT-CP1251: ru_UA.CP1251 +ru_UA.utf8: ru_UA.UTF-8 +rw: rw_RW.ISO8859-1 @@ -1755,11 +1766,11 @@ +sid_ET: sid_ET.UTF-8 +sid_ET.utf8: sid_ET.UTF-8 sk: sk_SK.ISO8859-2 -@@ -713,2 +1156,3 @@ +@@ -713,2 +1159,3 @@ sk_SK.iso88592: sk_SK.ISO8859-2 +sk_SK.ISO_8859-2: sk_SK.ISO8859-2 sk_SK.ISO-8859-2: sk_SK.ISO8859-2 -@@ -719,25 +1163,77 @@ +@@ -719,25 +1166,77 @@ sl_SI.ISO-8859-2: sl_SI.ISO8859-2 +sl_SI.ISO_8859-2: sl_SI.ISO8859-2 +sl_SI.iso885916: sl_SI.ISO8859-16 @@ -1856,13 +1867,13 @@ +st_ZA.ISO_8859-1: st_ZA.ISO8859-1 +st_ZA.utf8: st_ZA.UTF-8 sv: sv_SE.ISO8859-1 -@@ -746,2 +1242,5 @@ +@@ -746,2 +1245,5 @@ sv_FI.iso885915: sv_FI.ISO8859-15 +sv_FI.iso885915@euro: sv_FI.ISO8859-15 +sv_FI.ISO-8859-15@euro: sv_FI.ISO8859-15 +sv_FI.ISO_8859-15@euro: sv_FI.ISO8859-15 sv_FI@euro: sv_FI.ISO8859-15 -@@ -757,12 +1256,20 @@ +@@ -757,12 +1259,21 @@ sv_SE.utf8: sv_SE.UTF-8 -ta: ta_IN.TSCII-0 -ta_IN: ta_IN.TSCII-0 @@ -1872,13 +1883,15 @@ ta_IN.tscii0: ta_IN.TSCII-0 -tg: tg_TJ.KOI8-C -tg_TJ: tg_TJ.KOI8-C +-tg_TJ.koi8c: tg_TJ.KOI8-C +ta_IN.utf8: ta_IN.UTF-8 +te: te_IN.UTF-8 +te_IN: te_IN.UTF-8 +te_IN.utf8: te_IN.UTF-8 +tg: tg_TJ.KOI8-T +tg_TJ: tg_TJ.KOI8-T - tg_TJ.koi8c: tg_TJ.KOI8-C ++tg_TJ.koi8c: tg_TJ.KOI8-K ++tg_TJ.koi8k: tg_TJ.KOI8-K +tg_TJ.koi8t: tg_TJ.KOI8-T +tg_TJ.utf8: tg_TJ.UTF-8 th: th_TH.ISO8859-11 @@ -1887,7 +1900,7 @@ th_TH.ISO-8859-11: th_TH.ISO8859-11 +th_TH.ISO_8859-11: th_TH.ISO8859-11 th_TH.tis620: th_TH.TIS620 -@@ -771,2 +1278,13 @@ +@@ -771,2 +1282,13 @@ th_TH.utf8: th_TH.UTF-8 +ti: ti_ER.UTF-8 +ti_ER: ti_ER.UTF-8 @@ -1901,7 +1914,7 @@ +tk_TM: tk_TM.UTF-8 +tk_TM.utf8: tk_TM.UTF-8 tl: tl_PH.ISO8859-1 -@@ -774,3 +1292,17 @@ +@@ -774,3 +1296,17 @@ tl_PH.iso88591: tl_PH.ISO8859-1 +tl_PH.ISO-8859-1: tl_PH.ISO8859-1 +tl_PH.ISO_8859-1: tl_PH.ISO8859-1 @@ -1919,7 +1932,7 @@ +tr_CY.ISO_8859-9: tr_CY.ISO8859-9 +tr_CY.utf8: tr_CY.UTF-8 tr_TR: tr_TR.ISO8859-9 -@@ -779,4 +1311,11 @@ +@@ -779,4 +1315,11 @@ tr_TR.ISO-8859-9: tr_TR.ISO8859-9 +tr_TR.ISO_8859-9: tr_TR.ISO8859-9 tr_TR.utf8: tr_TR.UTF-8 @@ -1931,16 +1944,19 @@ +ts_ZA.ISO_8859-1: ts_ZA.ISO8859-1 +ts_ZA.utf8: ts_ZA.UTF-8 tt: tt_RU.TATAR-CYR -@@ -785,2 +1324,3 @@ - tt_RU.koi8c: tt_RU.KOI8-C +@@ -784,3 +1327,5 @@ + tt_RU.tatarcyr: tt_RU.TATAR-CYR +-tt_RU.koi8c: tt_RU.KOI8-C ++tt_RU.koi8c: tt_RU.KOI8-K ++tt_RU.koi8k: tt_RU.KOI8-K +tt_RU.utf8: tt_RU.UTF-8 uk: uk_UA.KOI8-U -@@ -788,2 +1328,4 @@ +@@ -788,2 +1333,4 @@ uk_UA.iso88595: uk_UA.ISO8859-5 +uk_UA.ISO-8859-5: uk_UA.ISO8859-5 +uk_UA.ISO_8859-5: uk_UA.ISO8859-5 uk_UA.koi8u: uk_UA.KOI8-U -@@ -800,4 +1342,20 @@ +@@ -800,4 +1347,20 @@ ur_PK.MICROSOFT-CP1256: ur_PK.CP1256 +ur_PK.utf8: ur_PK.UTF-8 uz: uz_UZ.UTF-8 @@ -1961,11 +1977,11 @@ +ven_ZA: ve_ZA.UTF-8 +ven_ZA.utf-8: ve_ZA.UTF-8 vi: vi_VN.TCVN -@@ -808,2 +1366,3 @@ +@@ -808,2 +1371,3 @@ vi_VN.tcvn5712: vi_VN.TCVN +vi_VN.utf8: vi_VN.UTF-8 vi_VN.viscii: vi_VN.VISCII -@@ -815,4 +1374,16 @@ +@@ -815,4 +1379,16 @@ wa_BE.iso88591: wa_BE.ISO8859-1 +wa_BE.ISO-8859-1: wa_BE.ISO8859-1 +wa_BE.ISO_8859-1: wa_BE.ISO8859-1 @@ -1982,25 +1998,25 @@ +xh_ZA.ISO_8859-1: xh_ZA.ISO8859-1 +xh_ZA.utf8: xh_ZA.UTF-8 yi: yi_US.CP1255 -@@ -823,2 +1394,3 @@ +@@ -823,2 +1399,3 @@ yi_US.MICROSOFT-CP1255: yi_US.CP1255 +yi_US.utf8: yi_US.UTF-8 zh_CN: zh_CN.gb2312 -@@ -833,4 +1405,6 @@ +@@ -833,4 +1410,6 @@ zh_HK: zh_HK.big5hkscs +zh_HK.big5-hkscs: zh_HK.big5hkscs zh_HK.Big5hkscs: zh_HK.big5hkscs zh_HK.Big5-hkscs: zh_HK.big5hkscs +zh_HK.Big5-HKSCS: zh_HK.big5hkscs zh_HK.Big5_hkscs: zh_HK.big5hkscs -@@ -842,2 +1416,6 @@ +@@ -842,2 +1421,6 @@ ZH_HK.UTF-8: zh_CN.UTF-8 +zh_SG: zh_SG.gb2312 +zh_SG.GB2312: zh_SG.gb2312 +zh_SG.GBK: zh_SG.gbk +zh_SG.utf8: zh_SG.UTF-8 ZH_SG.UTF-8: zh_SG.UTF-8 -@@ -849,2 +1427,8 @@ +@@ -849,2 +1432,8 @@ ZH_TW.UTF-8: zh_TW.UTF-8 +zu: zu_ZA.ISO8859-1 +zu_ZA: zu_ZA.ISO8859-1 @@ -2028,7 +2044,7 @@ iso8859-9e/Compose: az_AZ.ISO8859-9E -koi8-c/Compose: a3_AZ.KOI8-C -microsoft-cp1251/Compose: be_BY.CP1251 -+koi8-c/Compose: az_AZ.KOI8-C ++koi8-c/Compose: az_AZ.KOI8-K +XCOMM microsoft-cp1251/Compose: be_BY.CP1251 iso8859-5/Compose: bg_BG.ISO8859-5 -microsoft-cp1251/Compose: bg_BG.CP1251 @@ -2120,7 +2136,7 @@ +iso8859-1/Compose: nds_DE.ISO8859-1 +iso8859-15/Compose: nds_DE.ISO8859-15 iso8859-1/Compose: nl_BE.ISO8859-1 -@@ -163,17 +189,14 @@ +@@ -163,17 +189,15 @@ iso8859-15/Compose: nl_NL.ISO8859-15 -iso8859-1/Compose: no_NO.ISO8859-1 -iso8859-15/Compose: no_NO.ISO8859-15 @@ -2136,6 +2152,7 @@ iso8859-15/Compose: oc_FR.ISO8859-15 +iso8859-1/Compose: om_KE.ISO8859-1 +iso8859-1/Compose: pap_AN.ISO8859-1 ++iso8859-15/Compose: pap_AN.ISO8859-15 iso8859-1/Compose: pd_DE.ISO8859-1 iso8859-1/Compose: pd_US.ISO8859-1 -iso8859-1/Compose: ph_PH.ISO8859-1 @@ -2143,7 +2160,7 @@ -iso8859-1/Compose: pp_AN.ISO8859-1 +iso8859-16/Compose: pl_PL.ISO8859-16 iso8859-1/Compose: pt_BR.ISO8859-1 -@@ -183,7 +206,9 @@ +@@ -183,7 +207,9 @@ iso8859-2/Compose: ro_RO.ISO8859-2 +iso8859-16/Compose: ro_RO.ISO8859-16 koi8-r/Compose: ru_RU.KOI8-R @@ -2155,7 +2172,7 @@ +XCOMM microsoft-cp1251/Compose: ru_UA.CP1251 +iso8859-1/Compose: rw_RW.ISO8859-1 iso8859-2/Compose: sk_SK.ISO8859-2 -@@ -191,7 +216,12 @@ +@@ -191,7 +217,12 @@ iso8859-2/Compose: sl_SI.ISO8859-2 -iso8859-5/Compose: sp_YU.ISO8859-5 +iso8859-16/Compose: sl_SI.ISO8859-16 @@ -2172,8 +2189,10 @@ +iso8859-1/Compose: ss_ZA.ISO8859-1 +iso8859-1/Compose: st_ZA.ISO8859-1 iso8859-1/Compose: sv_FI.ISO8859-1 -@@ -202,4 +232,8 @@ - koi8-c/Compose: tg_TJ.KOI8-C +@@ -201,9 +232,16 @@ + tscii-0/Compose: ta_IN.TSCII-0 +-koi8-c/Compose: tg_TJ.KOI8-C ++koi8-c/Compose: tg_TJ.KOI8-K +XCOMM koi8-t/Compose: tg_TJ.KOI8-T iso8859-1/Compose: tl_PH.ISO8859-1 +iso8859-10/Compose: tn_ZA.ISO8859-10 @@ -2181,7 +2200,8 @@ iso8859-9/Compose: tr_TR.ISO8859-9 +iso8859-1/Compose: ts_ZA.ISO8859-1 tatar-cyr/Compose: tt_RU.TATAR-CYR -@@ -207,3 +241,6 @@ +-koi8-c/Compose: tt_RU.KOI8-C ++koi8-c/Compose: tt_RU.KOI8-K koi8-u/Compose: uk_UA.KOI8-U -microsoft-cp1256/Compose: ur_PK.CP1256 +iso8859-5/Compose: uk_UA.ISO8859-5 @@ -2189,7 +2209,7 @@ +XCOMM microsoft-cp1256/Compose: ur_PK.CP1256 +iso8859-1/Compose: uz_UZ.ISO8859-1 vi_VN.viscii/Compose: vi_VN.VISCII -@@ -211,13 +248,22 @@ +@@ -211,13 +249,22 @@ iso8859-1/Compose: wa_BE.ISO8859-1 -microsoft-cp1255/Compose: yi_US.CP1256 +iso8859-15/Compose: wa_BE.ISO8859-15 @@ -2216,16 +2236,16 @@ 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 -@@ -225,2 +271,3 @@ +@@ -225,2 +272,3 @@ en_US.UTF-8/Compose: ar_EG.UTF-8 +en_US.UTF-8/Compose: ar_IN.UTF-8 en_US.UTF-8/Compose: ar_IQ.UTF-8 -@@ -234,2 +281,4 @@ +@@ -234,2 +282,4 @@ en_US.UTF-8/Compose: ar_SA.UTF-8 +en_US.UTF-8/Compose: ar_SD.UTF-8 +en_US.UTF-8/Compose: ar_SY.UTF-8 en_US.UTF-8/Compose: ar_TN.UTF-8 -@@ -237,10 +286,13 @@ +@@ -237,10 +289,13 @@ en_US.UTF-8/Compose: az_AZ.UTF-8 -en_US.UTF-8/Compose: a3_AZ.UTF-8 en_US.UTF-8/Compose: be_BY.UTF-8 @@ -2241,7 +2261,7 @@ en_US.UTF-8/Compose: cy_GB.UTF-8 -en_US.UTF-8/Compose: cz_CZ.UTF-8 en_US.UTF-8/Compose: da_DK.UTF-8 -@@ -252,14 +304,22 @@ +@@ -252,14 +305,22 @@ en_US.UTF-8/Compose: de_LU.UTF-8 +el_GR.UTF-8/Compose: el_CY.UTF-8 el_GR.UTF-8/Compose: el_GR.UTF-8 @@ -2265,25 +2285,25 @@ en_US.UTF-8/Compose: en_ZA.UTF-8 +en_US.UTF-8/Compose: en_ZW.UTF-8 en_US.UTF-8/Compose: eo_XX.UTF-8 -@@ -282,2 +342,3 @@ +@@ -282,2 +343,3 @@ en_US.UTF-8/Compose: es_SV.UTF-8 +en_US.UTF-8/Compose: es_US.UTF-8 en_US.UTF-8/Compose: es_UY.UTF-8 -@@ -288,2 +349,3 @@ +@@ -288,2 +350,3 @@ en_US.UTF-8/Compose: fi_FI.UTF-8 +en_US.UTF-8/Compose: fil_PH.UTF-8 en_US.UTF-8/Compose: fo_FO.UTF-8 -@@ -296,3 +358,5 @@ +@@ -296,3 +359,5 @@ en_US.UTF-8/Compose: gd_GB.UTF-8 +en_US.UTF-8/Compose: gez_ER.UTF-8 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 -@@ -301,2 +365,3 @@ +@@ -301,2 +366,3 @@ en_US.UTF-8/Compose: hr_HR.UTF-8 +en_US.UTF-8/Compose: hsb_DE.UTF-8 en_US.UTF-8/Compose: hu_HU.UTF-8 -@@ -309,4 +374,10 @@ +@@ -309,4 +375,10 @@ en_US.UTF-8/Compose: ka_GE.UTF-8 +en_US.UTF-8/Compose: kk_KZ.UTF-8 en_US.UTF-8/Compose: kl_GL.UTF-8 @@ -2294,7 +2314,7 @@ +en_US.UTF-8/Compose: li_BE.UTF-8 +en_US.UTF-8/Compose: li_NL.UTF-8 en_US.UTF-8/Compose: lo_LA.UTF-8 -@@ -315,15 +386,26 @@ +@@ -315,15 +387,26 @@ en_US.UTF-8/Compose: mi_NZ.UTF-8 +XCOMM mk_MK.UTF-8/Compose: mk_MK.UTF-8 en_US.UTF-8/Compose: mk_MK.UTF-8 @@ -2326,7 +2346,7 @@ en_US.UTF-8/Compose: pl_PL.UTF-8 -en_US.UTF-8/Compose: pp_AN.UTF-8 en_US.UTF-8/Compose: pt_BR.UTF-8 -@@ -333,6 +415,16 @@ +@@ -333,6 +416,16 @@ en_US.UTF-8/Compose: ru_UA.UTF-8 +en_US.UTF-8/Compose: rw_RW.UTF-8 +en_US.UTF-8/Compose: se_NO.UTF-8 @@ -2344,7 +2364,7 @@ +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 -@@ -340,6 +432,14 @@ +@@ -340,6 +433,14 @@ en_US.UTF-8/Compose: ta_IN.UTF-8 +en_US.UTF-8/Compose: te_IN.UTF-8 en_US.UTF-8/Compose: tg_TJ.UTF-8 @@ -2359,7 +2379,7 @@ 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 -@@ -348,4 +448,7 @@ +@@ -348,4 +449,7 @@ en_US.UTF-8/Compose: uz_UZ.UTF-8 +en_US.UTF-8/Compose: ve_ZA.UTF-8 en_US.UTF-8/Compose: vi_VN.UTF-8 @@ -2397,3 +2417,161 @@ ComposeTarget(iso8859-9e) ComposeTarget(ja) ComposeTarget(ja.JIS) +--- X11-6.8.1/xc/nls/Compose/koi8-t.orig 1970-01-01 01:00:00.000000000 +0100 ++++ X11-6.8.1/xc/nls/Compose/koi8-t 2004-11-23 22:57:41.000000000 +0100 +@@ -0,0 +1,72 @@ ++# ++# koi8-t Compose Sequence ++# ++# Sequence Definition ++# ++ ++# Means ++# Special Character ++ : "#" numbersign ++ : "'" apostrophe ++ : "'" apostrophe ++ : "@" at ++ : "[" bracketleft ++ : "\\" backslash ++ : "\\" backslash ++ : "\\" backslash ++ : "]" bracketright ++ : "^" asciicircum ++ : "^" asciicircum ++ : "^" asciicircum ++ : "^" asciicircum ++ : "`" grave ++ : "`" grave ++ : "{" braceleft ++ : "{" braceleft ++ : "|" bar ++ : "|" bar ++ : "|" bar ++ : "|" bar ++ : "|" bar ++ : "|" bar ++ : "}" braceright ++ : "}" braceright ++ : "~" asciitilde ++ : "~" asciitilde ++ : "~" asciitilde ++ : "~" asciitilde ++ ++ : "\240" nobreakspace ++ ++ : "\200" Cyrillic_ka_descender ++ : "\201" Cyrillic_ghe_bar ++ : "\203" Cyrillic_GHE_bar ++ : "\212" Cyrillic_ha_descender ++ : "\214" Cyrillic_HA_descender ++ : "\215" Cyrillic_che_descender ++ : "\216" Cyrillic_CHE_descender ++ : "\220" Cyrillic_KA_descender ++ : "\241" Cyrillic_u_macron ++ : "\242" Cyrillic_U_macron ++ : "\243" Cyrillic_io ++ : "\243" Cyrillic_io ++ : "\243" Cyrillic_io ++ : "\245" Cyrillic_i_macron ++ : "\263" Cyrillic_IO ++ : "\263" Cyrillic_IO ++ : "\263" Cyrillic_IO ++ : "\265" Cyrillic_I_macron ++ : "\300" Cyrillic_yu ++ : "\300" Cyrillic_yu ++ : "\303" Cyrillic_tse ++ : "\321" Cyrillic_ya ++ : "\321" Cyrillic_ya ++ : "\335" Cyrillic_shcha ++ : "\340" Cyrillic_YU ++ : "\340" Cyrillic_YU ++ : "\343" Cyrillic_TSE ++ : "\361" Cyrillic_YA ++ : "\361" Cyrillic_YA ++ : "\375" Cyrillic_SHCHA ++ ++# End of Sequence Definition +--- X11-6.8.1/xc/nls/XI18N_OBJS/koi8-t.orig 1970-01-01 01:00:00.000000000 +0100 ++++ X11-6.8.1/xc/nls/XI18N_OBJS/koi8-t 2004-11-23 22:57:37.000000000 +0100 +@@ -0,0 +1,7 @@ ++# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME ++# ++# XI18N objects table for koi8-t locale ++# ++XLC common/xlcDef _XlcDefaultLoader # XLC_open ++XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister ++XOM common/xomGeneric _XomGenericOpenOM # XOM_open +--- X11-6.8.1/xc/nls/XLC_LOCALE/koi8-t.orig 1970-01-01 01:00:00.000000000 +0100 ++++ X11-6.8.1/xc/nls/XLC_LOCALE/koi8-t 2004-11-23 22:57:33.000000000 +0100 +@@ -0,0 +1,70 @@ ++# XLocale Database Sample for koi8-t. ++# ++ ++# ++# XLC_FONTSET category ++# ++XLC_FONTSET ++# fs0 class (7 bit ASCII) ++fs0 { ++ charset { ++ name ISO8859-1:GL ++ } ++ font { ++ primary KOI8-T:GL ++ substitute ISO8859-1:GL ++ } ++} ++# fs1 class ++fs1 { ++ charset KOI8-T:GR ++ font KOI8-T:GR ++} ++END XLC_FONTSET ++ ++# ++# XLC_CHARSET_DEFINE category ++# ++XLC_CHARSET_DEFINE ++csd0 { ++ charset_name KOI8-T ++ side GR ++ length 1 ++ string_encoding False ++ sequence \x1b%/1 ++} ++END XLC_CHARSET_DEFINE ++ ++# ++# XLC_XLOCALE category ++# ++XLC_XLOCALE ++ ++encoding_name KOI8-T ++mb_cur_max 1 ++state_depend_encoding False ++ ++wc_encoding_mask \x30000000 ++wc_shift_bits 7 ++ ++use_stdc_env True ++ ++ ++# cs0 class ++cs0 { ++ side GL:Default ++ length 1 ++ wc_encoding \x00000000 ++ ct_encoding KOI8-T:GL; ISO8859-1:GL ++} ++ ++ ++# cs1 class ++cs1 { ++ side GR:Default ++ length 1 ++ wc_encoding \x30000000 ++ ct_encoding KOI8-T:GR ++} ++ ++END XLC_XLOCALE