summaryrefslogtreecommitdiff
path: root/x11/XFree86-4-libraries/files/patch-f
diff options
context:
space:
mode:
Diffstat (limited to 'x11/XFree86-4-libraries/files/patch-f')
-rw-r--r--x11/XFree86-4-libraries/files/patch-f215
1 files changed, 55 insertions, 160 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-f b/x11/XFree86-4-libraries/files/patch-f
index 93e7d910dadf..bac6e4ebf87a 100644
--- a/x11/XFree86-4-libraries/files/patch-f
+++ b/x11/XFree86-4-libraries/files/patch-f
@@ -1,106 +1,74 @@
---- nls/compose.dir~ Tue Dec 12 03:52:39 2000
-+++ nls/compose.dir Tue Dec 12 03:53:04 2000
-@@ -209,7 +209,7 @@
- zh/Compose zh_CN.eucCN
- zh/Compose zh_CN.GB2312
- zh_TW.big5/Compose zh_TW.big5
--zh_TW.big5/Compose zh_TW.Big5
-+zh_TW.Big5/Compose zh_TW.Big5
- zh_TW/Compose zh_TW.eucTW
- #endif /* R63_COMPAT */
-
-@@ -415,5 +415,5 @@
- zh/Compose: zh_CN.GB2312
- microsoft-cp1255/Compose: yi_US.CP1256
- zh_TW.big5/Compose: zh_TW.big5
--zh_TW.big5/Compose: zh_TW.Big5
-+zh_TW.Big5/Compose: zh_TW.Big5
- zh_TW/Compose: zh_TW.eucTW
---- nls/locale.alias~ Wed May 23 20:32:14 2001
-+++ nls/locale.alias Sat May 26 02:37:21 2001
-@@ -493,12 +493,12 @@
- zh zh_CN.eucCN
- zh_CN zh_CN.eucCN
- zh_CN.big5 zh_TW.big5
--zh_CN.Big5 zh_TW.big5
-+zh_CN.Big5 zh_TW.Big5
- zh_CN.EUC zh_CN.eucCN
- zh_CN.euc zh_CN.eucCN
- zh_CN.gb2312 zh_CN.eucCN
- zh_CN.gbk zh_CN.GBK
--zh_TW zh_TW.big5
-+zh_TW zh_TW.Big5
- zh_TW.EUC zh_TW.eucTW
- zh_TW.euc zh_TW.eucTW
-
-@@ -1182,13 +1182,13 @@
+--- nls/compose.dir.orig Thu Nov 22 07:29:11 2001
++++ nls/compose.dir Sat Jan 19 22:12:13 2002
+@@ -211,7 +211,7 @@
+ zh_CN/Compose: zh_CN.GB2312
+ zh_CN.gbk/Compose: zh_CN.GBK
+ zh_TW.big5/Compose: zh_TW.big5
+-zh_TW.big5/Compose: zh_TW.Big5
++zh_TW.Big5/Compose: zh_TW.Big5
+ zh_TW/Compose: zh_TW.eucTW
+ XCOMM
+ XCOMM
+--- nls/locale.alias.orig Thu Dec 20 06:29:40 2001
++++ nls/locale.alias Sat Jan 19 22:22:20 2002
+@@ -637,18 +637,18 @@
yi_US.MICROSOFT-CP1255: yi_US.CP1255
zh: zh_CN.eucCN
zh_CN: zh_CN.eucCN
--zh_CN.big5: zh_TW.big5
-zh_CN.Big5: zh_TW.big5
-+zh_CN.big5: zh_TW.Big5
+zh_CN.Big5: zh_TW.Big5
zh_CN.EUC: zh_CN.eucCN
+ zh_CN.GB2312: zh_CN.eucCN
+ zh_CN.GBK: zh_CN.gbk
+-zh_CN.big5: zh_TW.big5
++zh_CN.big5: zh_TW.Big5
zh_CN.euc: zh_CN.eucCN
zh_CN.gb2312: zh_CN.eucCN
- zh_CN.gbk: zh_CN.GBK
+ zh_HK: zh_HK.big5
+ zh_HK.Big5: zh_HK.big5
+ zh_HK.Big5HKSCS: zh_HK.big5hkscs
-zh_TW: zh_TW.big5
+-zh_TW.Big5: zh_TW.big5
+zh_TW: zh_TW.Big5
++zh_TW.Big5: zh_TW.Big5
zh_TW.EUC: zh_TW.eucTW
- zh_TW.euc: zh_TW.eucTW
- zh_TW.big5: zh_TW.big5
---- nls/locale.dir~ Tue Dec 12 03:18:29 2000
-+++ nls/locale.dir Tue Dec 12 04:01:54 2000
-@@ -199,7 +199,7 @@
- zh/XLC_LOCALE zh_CN.eucCN
- zh/XLC_LOCALE zh_CN.GB2312
- zh_TW.big5/XLC_LOCALE zh_TW.big5
--zh_TW.big5/XLC_LOCALE zh_TW.Big5
-+zh_TW.Big5/XLC_LOCALE zh_TW.Big5
- zh_TW/XLC_LOCALE zh_TW.eucTW
- XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
- en_US.UTF-8/XLC_LOCALE af_ZA.UTF-8
-@@ -533,7 +533,7 @@
- zh/XLC_LOCALE: zh_CN.eucCN
- zh/XLC_LOCALE: zh_CN.GB2312
- zh_TW.big5/XLC_LOCALE: zh_TW.big5
--zh_TW.big5/XLC_LOCALE: zh_TW.Big5
-+zh_TW.Big5/XLC_LOCALE: zh_TW.Big5
- zh_TW/XLC_LOCALE: zh_TW.eucTW
+
+ XCOMM The following locale names are used in SCO 3.0
+--- nls/locale.dir.orig Thu Jan 10 01:14:16 2002
++++ nls/locale.dir Sat Jan 19 22:16:56 2002
+@@ -216,7 +216,7 @@
+ zh_CN.gbk/XLC_LOCALE: zh_CN.gbk
+ zh_HK.big5/XLC_LOCALE: zh_HK.big5
+ zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs
+-zh_TW.big5/XLC_LOCALE: zh_TW.big5
++zh_TW.Big5/XLC_LOCALE: zh_TW.Big5
+ zh_TW/XLC_LOCALE: zh_TW.eucTW
XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
- en_US.UTF-8/XLC_LOCALE: af_ZA.UTF-8
---- nls/Compose/Imakefile.orig Fri Dec 8 02:52:48 2000
-+++ nls/Compose/Imakefile Tue Dec 12 03:18:29 2000
-@@ -58,5 +58,5 @@
- ComposeTarget(vi_VN.viscii)
- ComposeTarget(zh)
+ en_US.UTF-8/XLC_LOCALE: af_ZA.UTF-8
+--- nls/Compose/Imakefile.orig Sat Nov 3 08:29:28 2001
++++ nls/Compose/Imakefile Sat Jan 19 22:17:40 2002
+@@ -70,5 +70,5 @@
+ ComposeTarget(zh_CN)
+ ComposeTarget(zh_CN.gbk)
ComposeTarget(zh_TW)
-ComposeTarget(zh_TW.big5)
+ComposeTarget(zh_TW.Big5)
---- nls/Compose/zh_TW.Big5.orig Sun Jul 16 04:33:35 2000
-+++ nls/Compose/zh_TW.Big5 Sun Jul 16 04:33:35 2000
-@@ -0,0 +1,15 @@
-+#
-+# zh_TW.big5 Compose Sequence
-+#
-+# Sequence Definition
-+#
-+# $XFree86: xc/nls/Compose/zh_TW.big5,v 1.1 1999/08/28 09:00:40 dawes Exp $
-+#
-+# This file currently has no entries. It appears that a compose file (even
-+# just an empty one) is required for the appropriate keysyms to work for
-+# this encoding.
-+#
-+# <Multi_key> Means <Compose>
-+# Special Character
-+
-+# End of Sequence Definition
---- nls/XLC_LOCALE/Imakefile~ Tue Mar 6 19:54:45 2001
-+++ nls/XLC_LOCALE/Imakefile Sat May 26 02:38:44 2001
-@@ -88,7 +88,7 @@
- LTarget(zh_CN.gbk)
+--- nls/XI18N_OBJS/Imakefile.orig Fri Nov 16 09:52:31 2001
++++ nls/XI18N_OBJS/Imakefile Sun Jan 20 01:08:44 2002
+@@ -57,7 +57,7 @@
+ XI18NTarget(zh_CN.gbk)
+ XI18NTarget(zh_HK.big5hkscs)
+ XI18NTarget(zh_TW)
+-XI18NTarget(zh_TW.big5)
++XI18NTarget(zh_TW.Big5)
+ XI18NTarget(th_TH)
+ XI18NTarget(en_US.UTF-8)
+ #ifdef UXPArchitecture
+--- nls/XLC_LOCALE/Imakefile.orig Fri Nov 2 08:35:28 2001
++++ nls/XLC_LOCALE/Imakefile Sat Jan 19 22:19:27 2002
+@@ -89,7 +89,7 @@
+ LTarget(zh_HK.big5)
LTarget(zh_HK.big5hkscs)
LTarget(zh_TW)
-LTarget(zh_TW.big5)
@@ -108,76 +76,3 @@
LTarget(th_TH)
LTarget(en_US.UTF-8)
#ifdef UXPArchitecture
---- nls/XLC_LOCALE/zh_TW.Big5.orig Sun Jul 16 04:33:35 2000
-+++ nls/XLC_LOCALE/zh_TW.Big5 Sun Jul 16 04:36:58 2000
-@@ -0,0 +1,70 @@
-+XCOMM
-+XCOMM (c) 1996, X11R6 L10N for Taiwan and Big5 Encoding Project
-+XCOMM
-+XCOMM modified for X11R6.3 by Hung-Chi Chu <hcchu@r350.ee.ntu.edu.tw> 1998/01/10
-+XCOMM
-+XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_TW.big5,v 1.1 1999/08/28 09:00:41 dawes Exp $
-+XCOMM
-+XCOMM XLC_FONTSET category
-+XCOMM
-+XLC_FONTSET
-+XCOMM fs0 class (7 bit ASCII)
-+fs0 {
-+ charset {
-+ name ISO8859-1:GL
-+ }
-+ font {
-+ primary ISO8859-1:GL
-+ vertical_rotate all
-+ }
-+}
-+XCOMM fs1 class
-+fs1 {
-+ charset {
-+ name BIG5-0:GLGR
-+ }
-+ font {
-+ primary BIG5-0:GLGR
-+ substitute BIG5-0:GLGR
-+ }
-+}
-+END XLC_FONTSET
-+
-+XCOMM
-+XCOMM XLC_XLOCALE category
-+XCOMM
-+XLC_XLOCALE
-+
-+encoding_name zh_TW.Big5
-+mb_cur_max 2
-+state_depend_encoding False
-+
-+wc_encoding_mask \x00008000
-+wc_shift_bits 8
-+
-+use_stdc_env True
-+force_convert_to_mb True
-+
-+XCOMM cs0 class
-+cs0 {
-+ side GL:Default
-+ length 1
-+ wc_encoding \x00000000
-+ ct_encoding ISO8859-1:GL
-+}
-+
-+XCOMM cs1 class
-+cs1 {
-+ side none
-+ length 2
-+ byte1 \xa1,\xf9
-+ byte2 \x40,\x7e;\xa1,\xfe
-+
-+ wc_encoding \x00008000
-+ ct_encoding BIG5-0:GLGR:\x1b\x25\x2f\x32\x80\x89\x42\x49\x47\x35\x2d\x30\x02
-+
-+ mb_conversion [\xa140,\xf9fe]->\x2140
-+ ct_conversion [\x2140,\x79fe]->\xa140
-+}
-+
-+END XLC_XLOCALE