summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch101
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb1
2 files changed, 102 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch b/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch
new file mode 100644
index 0000000000..b7f5356e6c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch
@@ -0,0 +1,101 @@
1Upstream-Status: Backport
2
3Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
4
5From b64bee2ddb7b96f00713a8b8435f11ad9ac1c9e0 Mon Sep 17 00:00:00 2001
6From: Ran Benita <ran234@gmail.com>
7Date: Sun, 16 Feb 2014 15:24:58 +0200
8Subject: [PATCH] nls: always use XCOMM instead of # for comments in
9 Compose.pre files
10
11Lines starting with # are considered as preprocessor directives in the
12.pre files.
13
14Fixes warnings like:
15<stdin>:3:0: error: invalid preprocessing directive #Khmer
16
17Signed-off-by: Ran Benita <ran234@gmail.com>
18Signed-off-by: James Cloos <cloos@jhcloos.com>
19---
20 nls/km_KH.UTF-8/Compose.pre | 2 +-
21 nls/sr_CS.UTF-8/Compose.pre | 32 ++++++++++++++++----------------
22 2 files changed, 17 insertions(+), 17 deletions(-)
23
24diff --git a/nls/km_KH.UTF-8/Compose.pre b/nls/km_KH.UTF-8/Compose.pre
25index 77651d0..dc89119 100644
26--- a/nls/km_KH.UTF-8/Compose.pre
27+++ b/nls/km_KH.UTF-8/Compose.pre
28@@ -1,6 +1,6 @@
29 include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
30
31-# Khmer digraphs
32+XCOMM Khmer digraphs
33 <U17ff> : "ាំ"
34 <U17fe> : "ោះ"
35 <U17fd> : "េះ"
36diff --git a/nls/sr_CS.UTF-8/Compose.pre b/nls/sr_CS.UTF-8/Compose.pre
37index 119e23e..b2397f7 100644
38--- a/nls/sr_CS.UTF-8/Compose.pre
39+++ b/nls/sr_CS.UTF-8/Compose.pre
40@@ -1,17 +1,17 @@
41 include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
42
43-# Serbian accented Cyrillic
44-# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A
45-# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E
46-# о О - U+043E, U+041E Cyrillic_o, Cyrillic_O
47-# у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U
48-# и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I
49-#
50-# ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
51-# ́ - U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
52-# ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
53-# ̏ - U+030F <dead_diaeresis>, <dead_doubleacute>
54-# ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
55+XCOMM Serbian accented Cyrillic
56+XCOMM а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A
57+XCOMM е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E
58+XCOMM о О - U+043E, U+041E Cyrillic_o, Cyrillic_O
59+XCOMM у У - U+0443, U+0423 Cyrillic_u, Cyrillic_U
60+XCOMM и И - U+0438, U+0418 Cyrillic_i, Cyrillic_I
61+XCOMM
62+XCOMM ̀ - U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
63+XCOMM ́ - U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
64+XCOMM ̂ - U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
65+XCOMM ̏ - U+030F <dead_diaeresis>, <dead_doubleacute>
66+XCOMM ̀ - kratkouzlazni, U+0300 <dead_grave>, <combining_grave>, <Multi_key> <grave>
67 <dead_grave> <Cyrillic_a> : "а̀"
68 <combining_grave> <Cyrillic_a> : "а̀"
69 <Multi_key> <grave> <Cyrillic_a> : "а̀"
70@@ -42,7 +42,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
71 <dead_grave> <Cyrillic_U> : "У̀"
72 <combining_grave> <Cyrillic_U> : "У̀"
73 <Multi_key> <grave> <Cyrillic_U> : "У̀"
74-# ́ - dugouzlazni, U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
75+XCOMM ́ - dugouzlazni, U+0301 <dead_acute>, <Multi_key> <acute>, <Multi_key> <apostrophe>, <combining_acute>
76 <dead_acute> <Cyrillic_a> : "а́"
77 <combining_acute> <Cyrillic_a> : "а́"
78 <Multi_key> <acute> <Cyrillic_a> : "а́"
79@@ -83,7 +83,7 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
80 <combining_acute> <Cyrillic_U> : "У́"
81 <Multi_key> <acute> <Cyrillic_U> : "У́"
82 <Multi_key> <apostrophe> <Cyrillic_U> : "У́"
83-# ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
84+XCOMM ̂ - dugosilazni, U+0302 <dead_circumflex>, <Multi_key> <asciicircum>
85 <dead_circumflex> <Cyrillic_a> : "а̂"
86 <Multi_key> <asciicircum> <Cyrillic_a> : "а̂"
87 <dead_circumflex> <Cyrillic_A> : "А̂"
88@@ -104,8 +104,8 @@ include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
89 <Multi_key> <asciicircum> <Cyrillic_u> : "у̂"
90 <dead_circumflex> <Cyrillic_U> : "У̂"
91 <Multi_key> <asciicircum> <Cyrillic_U> : "У̂"
92-# ̏ - kratkosilazni, U+030F <dead_diaeresis>, <dead_doubleacute>
93-# there's no appropriate dead_doublegrave, so we use these two dead keys
94+XCOMM ̏ - kratkosilazni, U+030F <dead_diaeresis>, <dead_doubleacute>
95+XCOMM there's no appropriate dead_doublegrave, so we use these two dead keys
96 <dead_diaeresis> <Cyrillic_a> : "а̏"
97 <dead_doubleacute> <Cyrillic_a> : "а̏"
98 <dead_diaeresis> <Cyrillic_A> : "А̏"
99--
1001.7.9.5
101
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
index 2377d61c37..700bc3680f 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
@@ -4,6 +4,7 @@ inherit gettext
4BBCLASSEXTEND = "native nativesdk" 4BBCLASSEXTEND = "native nativesdk"
5 5
6SRC_URI += "file://disable_tests.patch \ 6SRC_URI += "file://disable_tests.patch \
7 file://nls-always-use-XCOMM-instead-of-for-comments-in-Comp.patch \
7 " 8 "
8 9
9SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5" 10SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-17 18:54:32 +0000