X Strike Force X.Org X11 SVN commit: r2624 - branches/7.1/lib/libx11/debian/patches
Author: dnusinow
Date: 2006-08-02 22:07:46 -0400 (Wed, 02 Aug 2006)
New Revision: 2624
Modified:
branches/7.1/lib/libx11/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff
branches/7.1/lib/libx11/debian/patches/014_add_Khmer_digraphs.diff
Log:
Refresh patches
Modified: branches/7.1/lib/libx11/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff
===================================================================
--- branches/7.1/lib/libx11/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff 2006-08-03 02:01:43 UTC (rev 2623)
+++ branches/7.1/lib/libx11/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff 2006-08-03 02:07:46 UTC (rev 2624)
@@ -1,8 +1,8 @@
Index: libx11/nls/locale.dir.pre
===================================================================
---- libx11.orig/nls/locale.dir.pre 2006-07-04 11:03:03.000000000 -0400
-+++ libx11/nls/locale.dir.pre 2006-07-04 11:05:49.000000000 -0400
-@@ -435,7 +435,7 @@
+--- libx11.orig/nls/locale.dir.pre 2006-08-02 22:04:01.000000000 +0000
++++ libx11/nls/locale.dir.pre 2006-08-02 22:04:04.000000000 +0000
+@@ -436,7 +436,7 @@
pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
@@ -14,7 +14,7 @@
Index: libx11/nls/ru_RU.UTF-8/XLC_LOCALE.pre
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/XLC_LOCALE.pre 2006-07-04 11:05:49.000000000 -0400
++++ libx11/nls/ru_RU.UTF-8/XLC_LOCALE.pre 2006-08-02 22:04:04.000000000 +0000
@@ -0,0 +1,169 @@
+XCOMM
+XCOMM XLocale Database Sample for ru_RU.UTF-8
@@ -188,7 +188,7 @@
Index: libx11/nls/ru_RU.UTF-8/XI18N_OBJS
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/XI18N_OBJS 2006-07-04 11:05:49.000000000 -0400
++++ libx11/nls/ru_RU.UTF-8/XI18N_OBJS 2006-08-02 22:04:04.000000000 +0000
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
+#
@@ -199,8 +199,8 @@
+XOM common/xomGeneric _XomGenericOpenOM # XOM_open
Index: libx11/configure.ac
===================================================================
---- libx11.orig/configure.ac 2006-07-03 14:10:58.000000000 -0400
-+++ libx11/configure.ac 2006-07-04 11:05:49.000000000 -0400
+--- libx11.orig/configure.ac 2006-08-02 20:31:39.000000000 +0000
++++ libx11/configure.ac 2006-08-02 22:04:04.000000000 +0000
@@ -400,6 +400,7 @@
nls/mulelao-1/Makefile
nls/nokhchi-1/Makefile
@@ -211,8 +211,8 @@
nls/th_TH.UTF-8/Makefile
Index: libx11/nls/Makefile.am
===================================================================
---- libx11.orig/nls/Makefile.am 2006-07-02 00:37:48.000000000 -0400
-+++ libx11/nls/Makefile.am 2006-07-04 11:05:49.000000000 -0400
+--- libx11.orig/nls/Makefile.am 2006-08-02 20:31:30.000000000 +0000
++++ libx11/nls/Makefile.am 2006-08-02 22:04:04.000000000 +0000
@@ -52,6 +52,7 @@
mulelao-1 \
nokhchi-1 \
@@ -224,13 +224,13 @@
Index: libx11/nls/ru_RU.UTF-8/Compose.pre
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/Compose.pre 2006-07-04 11:05:49.000000000 -0400
++++ libx11/nls/ru_RU.UTF-8/Compose.pre 2006-08-02 22:04:04.000000000 +0000
@@ -0,0 +1 @@
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
Index: libx11/nls/ru_RU.UTF-8/Makefile.am
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11/nls/ru_RU.UTF-8/Makefile.am 2006-07-04 11:05:49.000000000 -0400
++++ libx11/nls/ru_RU.UTF-8/Makefile.am 2006-08-02 22:04:04.000000000 +0000
@@ -0,0 +1,3 @@
+x11thislocaledir = $(X11_LOCALEDATADIR)/ru_RU.UTF-8
+
Modified: branches/7.1/lib/libx11/debian/patches/014_add_Khmer_digraphs.diff
===================================================================
--- branches/7.1/lib/libx11/debian/patches/014_add_Khmer_digraphs.diff 2006-08-03 02:01:43 UTC (rev 2623)
+++ branches/7.1/lib/libx11/debian/patches/014_add_Khmer_digraphs.diff 2006-08-03 02:07:46 UTC (rev 2624)
@@ -1,18 +1,18 @@
Index: libx11/nls/en_US.UTF-8/Compose.pre
===================================================================
---- libx11.orig/nls/en_US.UTF-8/Compose.pre
-+++ libx11/nls/en_US.UTF-8/Compose.pre
-@@ -5598,3 +5598,13 @@
- <Multi_key> <U1d1b9> <U1d165> <U1d16f> : "𝆹𝅥𝅯" U1D1BF # MUSICAL SYMBOL FUSA WHITE
- <Multi_key> <U1d1bc> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
- <Multi_key> <U1d1ba> <U1d165> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+--- libx11.orig/nls/en_US.UTF-8/Compose.pre 2006-08-02 22:04:02.000000000 +0000
++++ libx11/nls/en_US.UTF-8/Compose.pre 2006-08-02 22:07:22.000000000 +0000
+@@ -5592,3 +5592,13 @@
+ <Multi_key> <U1001D1B9> <U1001D165> <U1001D16F> : "?" U1D1BF # MUSICAL SYMBOL FUSA WHITE
+ <Multi_key> <U1001D1BC> <U1001D16F> : "?" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+ <Multi_key> <U1001D1BA> <U1001D165> <U1001D16F> : "?" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+
+XCOMM Khmer digraphs
+XCOMM A keystroke has to generate several characters, so they are defined
+XCOMM in this file
+
-+<U17fb> : "ុះ"
-+<U17fc> : "ុំ"
-+<U17fd> : "េះ"
-+<U17fe> : "ោះ"
-+<U17ff> : "ាំ"
++<U17fb> : "ុះ"
++<U17fc> : "ុំ"
++<U17fd> : "េះ"
++<U17fe> : "ោះ"
++<U17ff> : "ាំ"
Reply to: