diff --git a/libX11.spec b/libX11.spec index cb292f9..3cbf694 100644 --- a/libX11.spec +++ b/libX11.spec @@ -3,7 +3,7 @@ Summary: X.Org X11 libX11 runtime library Name: libX11 Version: 1.1.3 -Release: 3.%{gitdate}%{?dist} +Release: 4.%{gitdate}%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -21,6 +21,7 @@ Patch3: bug-201284.patch Patch4: libX11-1.1.3-xkb-lock-fix.patch #bernie: already upstream #Patch5: brightness-keysyms.patch +Patch6: olpc_7474_libX11.patch BuildRequires: pkgconfig # xproto >= 7.0.6 required @@ -69,6 +70,7 @@ X.Org X11 libX11 development package %patch3 -p1 -b .3-bug201284 %patch4 -p1 -b .jx #%patch5 -p1 -b .brightness-keysyms +%patch6 -p1 -b .fix_am_compose %build #bernie: disable XCB for now @@ -272,6 +274,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Sat Aug 30 2008 Sayamindu Dasgupta - 1.1.3-4.git20071123 +- Backport Amharic Compose table fixes from F-9 branch + * Fri Nov 24 2007 Bernardo Innocenti - 1.1.3-3.git20071123 - Rebuild diff --git a/olpc_7474_libX11.patch b/olpc_7474_libX11.patch new file mode 100644 index 0000000..49e674d --- /dev/null +++ b/olpc_7474_libX11.patch @@ -0,0 +1,623 @@ +diff -Naur libX11-1.1.4/nls/am_ET.UTF-8/Compose.pre libX11-1.1.4.new/nls/am_ET.UTF-8/Compose.pre +--- libX11-1.1.4/nls/am_ET.UTF-8/Compose.pre 2008-03-07 02:15:06.000000000 +0530 ++++ libX11-1.1.4.new/nls/am_ET.UTF-8/Compose.pre 2008-08-23 02:13:35.000000000 +0530 +@@ -12,330 +12,330 @@ + XCOMM + + XCOMM Modifier: /u/ +- : "ሁ" # key h (base character ሀ) +- : "ሉ" # key l (base character ለ) +- : "ሙ" # key m (base character መ) +- : "ሩ" # key r (base character ረ) +- : "ሱ" # key s (base character ሰ) +- : "ቁ" # key q (base character ቀ) +- : "ቡ" # key b (base character በ) +- : "ቱ" # key t (base character ተ) +- : "ኑ" # key n (base character ነ) +- : "ኡ" # key x (base character አ) +- : "ኩ" # key k (base character ከ) +- : "ዉ" # key w (base character ወ) +- : "ዙ" # key z (base character ዘ) +- : "ዩ" # key y (base character የ) +- : "ዱ" # key d (base character ደ) +- : "ጁ" # key j (base character ጀ) +- : "ጉ" # key g (base character ገ) +- : "ፁ" # key [ (base character ፀ) +- : "ፉ" # key f (base character ፈ) +- : "ፑ" # key p (base character ፐ) +- : "ሹ" # key v (base character ሸ) +- : "ጩ" # key ] (base character ጨ) ++ : "ሁ" U1201 # key h (base character ሀ) ++ : "ሉ" U1209 # key l (base character ለ) ++ : "ሙ" U1219 # key m (base character መ) ++ : "ሩ" U1229 # key r (base character ረ) ++ : "ሱ" U1231 # key s (base character ሰ) ++ : "ቁ" U1241 # key q (base character ቀ) ++ : "ቡ" U1261 # key b (base character በ) ++ : "ቱ" U1271 # key t (base character ተ) ++ : "ኑ" U1291 # key n (base character ነ) ++ : "ኡ" U12A1 # key x (base character አ) ++ : "ኩ" U12A9 # key k (base character ከ) ++ : "ዉ" U12C9 # key w (base character ወ) ++ : "ዙ" U12D9 # key z (base character ዘ) ++ : "ዩ" U12E9 # key y (base character የ) ++ : "ዱ" U12F1 # key d (base character ደ) ++ : "ጁ" U1301 # key j (base character ጀ) ++ : "ጉ" U1309 # key g (base character ገ) ++ : "ፁ" U1341 # key [ (base character ፀ) ++ : "ፉ" U1349 # key f (base character ፈ) ++ : "ፑ" U1351 # key p (base character ፐ) ++ : "ሹ" U1239 # key v (base character ሸ) ++ : "ጩ" U1329 # key ] (base character ጨ) + + XCOMM Modifier: /i/ +- : "ሂ" # key h (base character ሀ) +- : "ሊ" # key l (base character ለ) +- : "ሚ" # key m (base character መ) +- : "ሪ" # key r (base character ረ) +- : "ሲ" # key s (base character ሰ) +- : "ቂ" # key q (base character ቀ) +- : "ቢ" # key b (base character በ) +- : "ቲ" # key t (base character ተ) +- : "ኒ" # key n (base character ነ) +- : "ኢ" # key x (base character አ) +- : "ኪ" # key k (base character ከ) +- : "ዊ" # key w (base character ወ) +- : "ዚ" # key z (base character ዘ) +- : "ዪ" # key y (base character የ) +- : "ዲ" # key d (base character ደ) +- : "ጂ" # key j (base character ጀ) +- : "ጊ" # key g (base character ገ) +- : "ፂ" # key [ (base character ፀ) +- : "ፊ" # key f (base character ፈ) +- : "ፒ" # key p (base character ፐ) +- : "ሺ" # key v (base character ሸ) +- : "ጪ" # key ] (base character ጨ) ++ : "ሂ" U1202 # key h (base character ሀ) ++ : "ሊ" U120A # key l (base character ለ) ++ : "ሚ" U121A # key m (base character መ) ++ : "ሪ" U122A # key r (base character ረ) ++ : "ሲ" U1232 # key s (base character ሰ) ++ : "ቂ" U1242 # key q (base character ቀ) ++ : "ቢ" U1262 # key b (base character በ) ++ : "ቲ" U1272 # key t (base character ተ) ++ : "ኒ" U1292 # key n (base character ነ) ++ : "ኢ" U12A2 # key x (base character አ) ++ : "ኪ" U12AA # key k (base character ከ) ++ : "ዊ" U12CA # key w (base character ወ) ++ : "ዚ" U12DA # key z (base character ዘ) ++ : "ዪ" U12EA # key y (base character የ) ++ : "ዲ" U12F2 # key d (base character ደ) ++ : "ጂ" U1302 # key j (base character ጀ) ++ : "ጊ" U130A # key g (base character ገ) ++ : "ፂ" U1342 # key [ (base character ፀ) ++ : "ፊ" U134A # key f (base character ፈ) ++ : "ፒ" U1352 # key p (base character ፐ) ++ : "ሺ" U123A # key v (base character ሸ) ++ : "ጪ" U132A # key ] (base character ጨ) + + XCOMM Modifier: /a/ +- : "ሃ" # key h (base character ሀ) +- : "ላ" # key l (base character ለ) +- : "ማ" # key m (base character መ) +- : "ራ" # key r (base character ረ) +- : "ሳ" # key s (base character ሰ) +- : "ቃ" # key q (base character ቀ) +- : "ባ" # key b (base character በ) +- : "ታ" # key t (base character ተ) +- : "ና" # key n (base character ነ) +- : "ኣ" # key x (base character አ) +- : "ካ" # key k (base character ከ) +- : "ዋ" # key w (base character ወ) +- : "ዛ" # key z (base character ዘ) +- : "ያ" # key y (base character የ) +- : "ዳ" # key d (base character ደ) +- : "ጃ" # key j (base character ጀ) +- : "ጋ" # key g (base character ገ) +- : "ፃ" # key [ (base character ፀ) +- : "ፋ" # key f (base character ፈ) +- : "ፓ" # key p (base character ፐ) +- : "ሻ" # key v (base character ሸ) +- : "ጫ" # key ] (base character ጨ) ++ : "ሃ" U1203 # key h (base character ሀ) ++ : "ላ" U120B # key l (base character ለ) ++ : "ማ" U121B # key m (base character መ) ++ : "ራ" U122B # key r (base character ረ) ++ : "ሳ" U1233 # key s (base character ሰ) ++ : "ቃ" U1243 # key q (base character ቀ) ++ : "ባ" U1263 # key b (base character በ) ++ : "ታ" U1273 # key t (base character ተ) ++ : "ና" U1293 # key n (base character ነ) ++ : "ኣ" U12A3 # key x (base character አ) ++ : "ካ" U12AB # key k (base character ከ) ++ : "ዋ" U12CB # key w (base character ወ) ++ : "ዛ" U12DB # key z (base character ዘ) ++ : "ያ" U12EB # key y (base character የ) ++ : "ዳ" U12F3 # key d (base character ደ) ++ : "ጃ" U1303 # key j (base character ጀ) ++ : "ጋ" U130B # key g (base character ገ) ++ : "ፃ" U1343 # key [ (base character ፀ) ++ : "ፋ" U134B # key f (base character ፈ) ++ : "ፓ" U1353 # key p (base character ፐ) ++ : "ሻ" U123B # key v (base character ሸ) ++ : "ጫ" U132B # key ] (base character ጨ) + + XCOMM Modifier: /e/ +- : "ሄ" # key h (base character ሀ) +- : "ሌ" # key l (base character ለ) +- : "ሜ" # key m (base character መ) +- : "ሬ" # key r (base character ረ) +- : "ሴ" # key s (base character ሰ) +- : "ቄ" # key q (base character ቀ) +- : "ቤ" # key b (base character በ) +- : "ቴ" # key t (base character ተ) +- : "ኔ" # key n (base character ነ) +- : "ኤ" # key x (base character አ) +- : "ኬ" # key k (base character ከ) +- : "ዌ" # key w (base character ወ) +- : "ዜ" # key z (base character ዘ) +- : "ዬ" # key y (base character የ) +- : "ዴ" # key d (base character ደ) +- : "ጄ" # key j (base character ጀ) +- : "ጌ" # key g (base character ገ) +- : "ፄ" # key [ (base character ፀ) +- : "ፌ" # key f (base character ፈ) +- : "ፔ" # key p (base character ፐ) +- : "ሼ" # key v (base character ሸ) +- : "ጬ" # key ] (base character ጨ) ++ : "ሄ" U1204 # key h (base character ሀ) ++ : "ሌ" U120C # key l (base character ለ) ++ : "ሜ" U121C # key m (base character መ) ++ : "ሬ" U122C # key r (base character ረ) ++ : "ሴ" U1234 # key s (base character ሰ) ++ : "ቄ" U1244 # key q (base character ቀ) ++ : "ቤ" U1264 # key b (base character በ) ++ : "ቴ" U1274 # key t (base character ተ) ++ : "ኔ" U1294 # key n (base character ነ) ++ : "ኤ" U12A4 # key x (base character አ) ++ : "ኬ" U12AC # key k (base character ከ) ++ : "ዌ" U12CC # key w (base character ወ) ++ : "ዜ" U12DC # key z (base character ዘ) ++ : "ዬ" U12EC # key y (base character የ) ++ : "ዴ" U12F4 # key d (base character ደ) ++ : "ጄ" U1304 # key j (base character ጀ) ++ : "ጌ" U130C # key g (base character ገ) ++ : "ፄ" U1344 # key [ (base character ፀ) ++ : "ፌ" U134C # key f (base character ፈ) ++ : "ፔ" U1354 # key p (base character ፐ) ++ : "ሼ" U123C # key v (base character ሸ) ++ : "ጬ" U132C # key ] (base character ጨ) + + XCOMM Modifier: /c/ +- : "ህ" # key h (base character ሀ) +- : "ል" # key l (base character ለ) +- : "ም" # key m (base character መ) +- : "ር" # key r (base character ረ) +- : "ስ" # key s (base character ሰ) +- : "ቅ" # key q (base character ቀ) +- : "ብ" # key b (base character በ) +- : "ት" # key t (base character ተ) +- : "ን" # key n (base character ነ) +- : "እ" # key x (base character አ) +- : "ክ" # key k (base character ከ) +- : "ው" # key w (base character ወ) +- : "ዝ" # key z (base character ዘ) +- : "ይ" # key y (base character የ) +- : "ድ" # key d (base character ደ) +- : "ጅ" # key j (base character ጀ) +- : "ግ" # key g (base character ገ) +- : "ፅ" # key [ (base character ፀ) +- : "ፍ" # key f (base character ፈ) +- : "ፕ" # key p (base character ፐ) +- : "ሽ" # key v (base character ሸ) +- : "ጭ" # key ] (base character ጨ) ++ : "ህ" U1205 # key h (base character ሀ) ++ : "ል" U120D # key l (base character ለ) ++ : "ም" U121D # key m (base character መ) ++ : "ር" U122D # key r (base character ረ) ++ : "ስ" U1235 # key s (base character ሰ) ++ : "ቅ" U1245 # key q (base character ቀ) ++ : "ብ" U1265 # key b (base character በ) ++ : "ት" U1275 # key t (base character ተ) ++ : "ን" U1295 # key n (base character ነ) ++ : "እ" U12A5 # key x (base character አ) ++ : "ክ" U12AD # key k (base character ከ) ++ : "ው" U12CD # key w (base character ወ) ++ : "ዝ" U12DD # key z (base character ዘ) ++ : "ይ" U12ED # key y (base character የ) ++ : "ድ" U12F5 # key d (base character ደ) ++ : "ጅ" U1305 # key j (base character ጀ) ++ : "ግ" U130D # key g (base character ገ) ++ : "ፅ" U1345 # key [ (base character ፀ) ++ : "ፍ" U134D # key f (base character ፈ) ++ : "ፕ" U1355 # key p (base character ፐ) ++ : "ሽ" U123D # key v (base character ሸ) ++ : "ጭ" U132D # key ] (base character ጨ) + + XCOMM Modifier: /o/ +- : "ሆ" # key h (base character ሀ) +- : "ሎ" # key l (base character ለ) +- : "ሞ" # key m (base character መ) +- : "ሮ" # key r (base character ረ) +- : "ሶ" # key s (base character ሰ) +- : "ቆ" # key q (base character ቀ) +- : "ቦ" # key b (base character በ) +- : "ቶ" # key t (base character ተ) +- : "ኖ" # key n (base character ነ) +- : "ኦ" # key x (base character አ) +- : "ኮ" # key k (base character ከ) +- : "ዎ" # key w (base character ወ) +- : "ዞ" # key z (base character ዘ) +- : "ዮ" # key y (base character የ) +- : "ዶ" # key d (base character ደ) +- : "ጆ" # key j (base character ጀ) +- : "ጎ" # key g (base character ገ) +- : "ፆ" # key [ (base character ፀ) +- : "ፎ" # key f (base character ፈ) +- : "ፖ" # key p (base character ፐ) +- : "ሾ" # key v (base character ሸ) +- : "ጮ" # key ] (base character ጨ) ++ : "ሆ" U1206 # key h (base character ሀ) ++ : "ሎ" U120E # key l (base character ለ) ++ : "ሞ" U121E # key m (base character መ) ++ : "ሮ" U122E # key r (base character ረ) ++ : "ሶ" U1236 # key s (base character ሰ) ++ : "ቆ" U1246 # key q (base character ቀ) ++ : "ቦ" U1266 # key b (base character በ) ++ : "ቶ" U1276 # key t (base character ተ) ++ : "ኖ" U1296 # key n (base character ነ) ++ : "ኦ" U12A6 # key x (base character አ) ++ : "ኮ" U12AE # key k (base character ከ) ++ : "ዎ" U12CE # key w (base character ወ) ++ : "ዞ" U12DE # key z (base character ዘ) ++ : "ዮ" U12EE # key y (base character የ) ++ : "ዶ" U12F6 # key d (base character ደ) ++ : "ጆ" U1306 # key j (base character ጀ) ++ : "ጎ" U130E # key g (base character ገ) ++ : "ፆ" U1346 # key [ (base character ፀ) ++ : "ፎ" U134E # key f (base character ፈ) ++ : "ፖ" U1356 # key p (base character ፐ) ++ : "ሾ" U123E # key v (base character ሸ) ++ : "ጮ" U132E # key ] (base character ጨ) + + XCOMM Modifier: /A/ +- : "ሏ" # key l (base character ለ) +- : "ሟ" # key m (base character መ) +- : "ሯ" # key r (base character ረ) +- : "ሷ" # key s (base character ሰ) +- : "ቋ" # key q (base character ቀ) +- : "ቧ" # key b (base character በ) +- : "ቷ" # key t (base character ተ) +- : "ኗ" # key n (base character ነ) +- : "ኧ" # key x (base character አ) +- : "ኳ" # key k (base character ከ) +- : "ዟ" # key z (base character ዘ) +- : "ዷ" # key d (base character ደ) +- : "ጇ" # key j (base character ጀ) +- : "ጓ" # key g (base character ገ) +- : "ፏ" # key f (base character ፈ) +- : "ፗ" # key p (base character ፐ) +- : "ሿ" # key v (base character ሸ) +- : "ጯ" # key ] (base character ጨ) ++ : "ሏ" U120F # key l (base character ለ) ++ : "ሟ" U121F # key m (base character መ) ++ : "ሯ" U122F # key r (base character ረ) ++ : "ሷ" U1237 # key s (base character ሰ) ++ : "ቋ" U124B # key q (base character ቀ) ++ : "ቧ" U1267 # key b (base character በ) ++ : "ቷ" U1277 # key t (base character ተ) ++ : "ኗ" U1297 # key n (base character ነ) ++ : "ኧ" U12A7 # key x (base character አ) ++ : "ኳ" U12B3 # key k (base character ከ) ++ : "ዟ" U12DF # key z (base character ዘ) ++ : "ዷ" U12F7 # key d (base character ደ) ++ : "ጇ" U1307 # key j (base character ጀ) ++ : "ጓ" U1313 # key g (base character ገ) ++ : "ፏ" U134F # key f (base character ፈ) ++ : "ፗ" U1357 # key p (base character ፐ) ++ : "ሿ" U123F # key v (base character ሸ) ++ : "ጯ" U132F # key ] (base character ጨ) + + XCOMM Modifier: /U/ +- : "ቍ" # key q (base character ቀ) +- : "ኵ" # key k (base character ከ) +- : "ጕ" # key g (base character ገ) ++ : "ቍ" U124D # key q (base character ቀ) ++ : "ኵ" U12B5 # key k (base character ከ) ++ : "ጕ" U1315 # key g (base character ገ) + + XCOMM Modifier: /I/ +- : "ቊ" # key q (base character ቀ) +- : "ኲ" # key k (base character ከ) +- : "ጒ" # key g (base character ገ) ++ : "ቊ" U124A # key q (base character ቀ) ++ : "ኲ" U12B2 # key k (base character ከ) ++ : "ጒ" U1312 # key g (base character ገ) + + XCOMM Modifier: /E/ +- : "ቌ" # key q (base character ቀ) +- : "ኴ" # key k (base character ከ) +- : "ጔ" # key g (base character ገ) ++ : "ቌ" U124C # key q (base character ቀ) ++ : "ኴ" U12B4 # key k (base character ከ) ++ : "ጔ" U1314 # key g (base character ገ) + + XCOMM Modifier: /O/ +- : "ቈ" # key q (base character ቀ) +- : "ኰ" # key k (base character ከ) +- : "ጐ" # key g (base character ገ) ++ : "ቈ" U1248 # key q (base character ቀ) ++ : "ኰ" U12B0 # key k (base character ከ) ++ : "ጐ" U1310 # key g (base character ገ) + + XCOMM + XCOMM Group II + XCOMM + XCOMM Modifier: /u/ +- : "ሑ" # key h (base character ሐ) +- : "ሡ" # key s (base character ሠ) +- : "ቑ" # key q (base character ቐ) +- : "ቹ" # key c (base character ቸ) +- : "ጡ" # key t (base character ጠ) +- : "ኙ" # key n (base character ኘ) +- : "ዑ" # key x (base character ዐ) +- : "ኹ" # key k (base character ኸ) +- : "ዡ" # key z (base character ዠ) +- : "ዹ" # key d (base character ዸ) +- : "ጙ" # key g (base character ጘ) +- : "ጹ" # key [ (base character ጸ) +- : "ጱ" # key p (base character ጰ) +- : "ኁ" # key ] (base character ኀ) +- : "ቩ" # key v (base character ቨ) ++ : "ሑ" U1211 # key h (base character ሐ) ++ : "ሡ" U1221 # key s (base character ሠ) ++ : "ቑ" U1251 # key q (base character ቐ) ++ : "ቹ" U1279 # key c (base character ቸ) ++ : "ጡ" U1321 # key t (base character ጠ) ++ : "ኙ" U1299 # key n (base character ኘ) ++ : "ዑ" U12D1 # key x (base character ዐ) ++ : "ኹ" U12B9 # key k (base character ኸ) ++ : "ዡ" U12E1 # key z (base character ዠ) ++ : "ዹ" U12F9 # key d (base character ዸ) ++ : "ጙ" U1319 # key g (base character ጘ) ++ : "ጹ" U1339 # key [ (base character ጸ) ++ : "ጱ" U1331 # key p (base character ጰ) ++ : "ኁ" U1281 # key ] (base character ኀ) ++ : "ቩ" U1269 # key v (base character ቨ) + + XCOMM Modifier: /i/ +- : "ሒ" # key h (base character ሐ) +- : "ሢ" # key s (base character ሠ) +- : "ቒ" # key q (base character ቐ) +- : "ቺ" # key c (base character ቸ) +- : "ጢ" # key t (base character ጠ) +- : "ኚ" # key n (base character ኘ) +- : "ዒ" # key x (base character ዐ) +- : "ኺ" # key k (base character ኸ) +- : "ዢ" # key z (base character ዠ) +- : "ዺ" # key d (base character ዸ) +- : "ጚ" # key g (base character ጘ) +- : "ጺ" # key [ (base character ጸ) +- : "ጲ" # key p (base character ጰ) +- : "ኂ" # key ] (base character ኀ) +- : "ቪ" # key v (base character ቨ) ++ : "ሒ" U1212 # key h (base character ሐ) ++ : "ሢ" U1222 # key s (base character ሠ) ++ : "ቒ" U1252 # key q (base character ቐ) ++ : "ቺ" U127A # key c (base character ቸ) ++ : "ጢ" U1322 # key t (base character ጠ) ++ : "ኚ" U129A # key n (base character ኘ) ++ : "ዒ" U12D2 # key x (base character ዐ) ++ : "ኺ" U12BA # key k (base character ኸ) ++ : "ዢ" U12E2 # key z (base character ዠ) ++ : "ዺ" U12FA # key d (base character ዸ) ++ : "ጚ" U131A # key g (base character ጘ) ++ : "ጺ" U133A # key [ (base character ጸ) ++ : "ጲ" U1332 # key p (base character ጰ) ++ : "ኂ" U1282 # key ] (base character ኀ) ++ : "ቪ" U126A # key v (base character ቨ) + + XCOMM Modifier: /a/ +- : "ሓ" # key h (base character ሐ) +- : "ሣ" # key s (base character ሠ) +- : "ቓ" # key q (base character ቐ) +- : "ቻ" # key c (base character ቸ) +- : "ጣ" # key t (base character ጠ) +- : "ኛ" # key n (base character ኘ) +- : "ዓ" # key x (base character ዐ) +- : "ኻ" # key k (base character ኸ) +- : "ዣ" # key z (base character ዠ) +- : "ዻ" # key d (base character ዸ) +- : "ጛ" # key g (base character ጘ) +- : "ጻ" # key [ (base character ጸ) +- : "ጳ" # key p (base character ጰ) +- : "ኃ" # key ] (base character ኀ) +- : "ቫ" # key v (base character ቨ) ++ : "ሓ" U1213 # key h (base character ሐ) ++ : "ሣ" U1223 # key s (base character ሠ) ++ : "ቓ" U1253 # key q (base character ቐ) ++ : "ቻ" U127B # key c (base character ቸ) ++ : "ጣ" U1323 # key t (base character ጠ) ++ : "ኛ" U129B # key n (base character ኘ) ++ : "ዓ" U12D3 # key x (base character ዐ) ++ : "ኻ" U12BB # key k (base character ኸ) ++ : "ዣ" U12E3 # key z (base character ዠ) ++ : "ዻ" U12FB # key d (base character ዸ) ++ : "ጛ" U131B # key g (base character ጘ) ++ : "ጻ" U133B # key [ (base character ጸ) ++ : "ጳ" U1333 # key p (base character ጰ) ++ : "ኃ" U1283 # key ] (base character ኀ) ++ : "ቫ" U126B # key v (base character ቨ) + + XCOMM Modifier: /e/ +- : "ሔ" # key h (base character ሐ) +- : "ሤ" # key s (base character ሠ) +- : "ቔ" # key q (base character ቐ) +- : "ቼ" # key c (base character ቸ) +- : "ጤ" # key t (base character ጠ) +- : "ኜ" # key n (base character ኘ) +- : "ዔ" # key x (base character ዐ) +- : "ኼ" # key k (base character ኸ) +- : "ዤ" # key z (base character ዠ) +- : "ዼ" # key d (base character ዸ) +- : "ጜ" # key g (base character ጘ) +- : "ጼ" # key [ (base character ጸ) +- : "ጴ" # key p (base character ጰ) +- : "ኄ" # key ] (base character ኀ) +- : "ቬ" # key v (base character ቨ) ++ : "ሔ" U1214 # key h (base character ሐ) ++ : "ሤ" U1224 # key s (base character ሠ) ++ : "ቔ" U1254 # key q (base character ቐ) ++ : "ቼ" U127C # key c (base character ቸ) ++ : "ጤ" U1324 # key t (base character ጠ) ++ : "ኜ" U129C # key n (base character ኘ) ++ : "ዔ" U12D4 # key x (base character ዐ) ++ : "ኼ" U12BC # key k (base character ኸ) ++ : "ዤ" U12E4 # key z (base character ዠ) ++ : "ዼ" U12FC # key d (base character ዸ) ++ : "ጜ" U131C # key g (base character ጘ) ++ : "ጼ" U133C # key [ (base character ጸ) ++ : "ጴ" U1334 # key p (base character ጰ) ++ : "ኄ" U1284 # key ] (base character ኀ) ++ : "ቬ" U126C # key v (base character ቨ) + + XCOMM Modifier: /c/ +- : "ሕ" # key h (base character ሐ) +- : "ሥ" # key s (base character ሠ) +- : "ቕ" # key q (base character ቐ) +- : "ች" # key c (base character ቸ) +- : "ጥ" # key t (base character ጠ) +- : "ኝ" # key n (base character ኘ) +- : "ዕ" # key x (base character ዐ) +- : "ኽ" # key k (base character ኸ) +- : "ዥ" # key z (base character ዠ) +- : "ዽ" # key d (base character ዸ) +- : "ጝ" # key g (base character ጘ) +- : "ጽ" # key [ (base character ጸ) +- : "ጵ" # key p (base character ጰ) +- : "ኅ" # key ] (base character ኀ) +- : "ቭ" # key v (base character ቨ) ++ : "ሕ" U1215 # key h (base character ሐ) ++ : "ሥ" U1225 # key s (base character ሠ) ++ : "ቕ" U1255 # key q (base character ቐ) ++ : "ች" U127D # key c (base character ቸ) ++ : "ጥ" U1325 # key t (base character ጠ) ++ : "ኝ" U129D # key n (base character ኘ) ++ : "ዕ" U12D5 # key x (base character ዐ) ++ : "ኽ" U12BD # key k (base character ኸ) ++ : "ዥ" U12E5 # key z (base character ዠ) ++ : "ዽ" U12FD # key d (base character ዸ) ++ : "ጝ" U131D # key g (base character ጘ) ++ : "ጽ" U133D # key [ (base character ጸ) ++ : "ጵ" U1335 # key p (base character ጰ) ++ : "ኅ" U1285 # key ] (base character ኀ) ++ : "ቭ" U126D # key v (base character ቨ) + + XCOMM Modifier: /o/ +- : "ሖ" # key h (base character ሐ) +- : "ሦ" # key s (base character ሠ) +- : "ቖ" # key q (base character ቐ) +- : "ቾ" # key c (base character ቸ) +- : "ጦ" # key t (base character ጠ) +- : "ኞ" # key n (base character ኘ) +- : "ዖ" # key x (base character ዐ) +- : "ኾ" # key k (base character ኸ) +- : "ዦ" # key z (base character ዠ) +- : "ዾ" # key d (base character ዸ) +- : "ጞ" # key g (base character ጘ) +- : "ጾ" # key [ (base character ጸ) +- : "ጶ" # key p (base character ጰ) +- : "ኆ" # key ] (base character ኀ) +- : "ቮ" # key v (base character ቨ) ++ : "ሖ" U1216 # key h (base character ሐ) ++ : "ሦ" U1226 # key s (base character ሠ) ++ : "ቖ" U1256 # key q (base character ቐ) ++ : "ቾ" U127E # key c (base character ቸ) ++ : "ጦ" U1326 # key t (base character ጠ) ++ : "ኞ" U129E # key n (base character ኘ) ++ : "ዖ" U12D6 # key x (base character ዐ) ++ : "ኾ" U12BE # key k (base character ኸ) ++ : "ዦ" U12E6 # key z (base character ዠ) ++ : "ዾ" U12FE # key d (base character ዸ) ++ : "ጞ" U131E # key g (base character ጘ) ++ : "ጾ" U133E # key [ (base character ጸ) ++ : "ጶ" U1336 # key p (base character ጰ) ++ : "ኆ" U1286 # key ] (base character ኀ) ++ : "ቮ" U126E # key v (base character ቨ) + + XCOMM Modifier: /A/ +- : "ሗ" # key h (base character ሐ) +- : "ሧ" # key s (base character ሠ) +- : "ቛ" # key q (base character ቐ) +- : "ቿ" # key c (base character ቸ) +- : "ጧ" # key t (base character ጠ) +- : "ኟ" # key n (base character ኘ) +- : "ዃ" # key k (base character ኸ) +- : "ዧ" # key z (base character ዠ) +- : "ዿ" # key d (base character ዸ) +- : "ጿ" # key [ (base character ጸ) +- : "ጷ" # key p (base character ጰ) +- : "ኋ" # key ] (base character ኀ) +- : "ቯ" # key v (base character ቨ) ++ : "ሗ" U1217 # key h (base character ሐ) ++ : "ሧ" U1227 # key s (base character ሠ) ++ : "ቛ" U125B # key q (base character ቐ) ++ : "ቿ" U127F # key c (base character ቸ) ++ : "ጧ" U1327 # key t (base character ጠ) ++ : "ኟ" U129F # key n (base character ኘ) ++ : "ዃ" U12C3 # key k (base character ኸ) ++ : "ዧ" U12E7 # key z (base character ዠ) ++ : "ዿ" U12FF # key d (base character ዸ) ++ : "ጿ" U133F # key [ (base character ጸ) ++ : "ጷ" U1337 # key p (base character ጰ) ++ : "ኋ" U128B # key ] (base character ኀ) ++ : "ቯ" U126F # key v (base character ቨ) + + XCOMM Modifier: /U/ +- : "ቝ" # key q (base character ቐ) +- : "ዅ" # key k (base character ኸ) ++ : "ቝ" U125D # key q (base character ቐ) ++ : "ዅ" U12C5 # key k (base character ኸ) + + XCOMM Modifier: /I/ +- : "ቚ" # key q (base character ቐ) +- : "ዂ" # key k (base character ኸ) ++ : "ቚ" U125A # key q (base character ቐ) ++ : "ዂ" U12C2 # key k (base character ኸ) + + XCOMM Modifier: /E/ +- : "ቜ" # key q (base character ቐ) +- : "ዄ" # key k (base character ኸ) ++ : "ቜ" U125C # key q (base character ቐ) ++ : "ዄ" U12C4 # key k (base character ኸ) + + XCOMM Modifier: /O/ +- : "ቘ" # key q (base character ቐ) +- : "ዀ" # key k (base character ኸ) ++ : "ቘ" U1258 # key q (base character ቐ) ++ : "ዀ" U12C0 # key k (base character ኸ) + + XCOMM + XCOMM Group III + XCOMM +- : "፥" # key " +- : "፦" # key " +- : "|" # key - +- : "¥" # key _ +- : "፧" # key ? ++ : "፥" U1365 # key " ++ : "፦" U1366 # key " ++ : "|" U007C # key - ++ : "¥" U00A5 # key _ ++ : "፧" U1367 # key ? +diff -Naur libX11-1.1.4/nls/compose.dir.pre libX11-1.1.4.new/nls/compose.dir.pre +--- libX11-1.1.4/nls/compose.dir.pre 2008-03-07 02:15:06.000000000 +0530 ++++ libX11-1.1.4.new/nls/compose.dir.pre 2008-08-23 02:01:56.000000000 +0530 +@@ -7,6 +7,7 @@ + XCOMM $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $ + XCOMM + iso8859-1/Compose: C ++am_ET.UTF-8/Compose: am_ET.UTF-8 + iso8859-1/Compose: af_ZA.ISO8859-1 + iso8859-6/Compose: ar_AA.ISO8859-6 + iso8859-6/Compose: ar_BH.ISO8859-6