patches/pango-03-solaris-cjk-font-table.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 15544 bc842379dda6
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446

--- pango-1.24.0/pango/pango-script-lang-table.h.orig	2009-04-02 14:39:52.560031000 +0900
+++ pango-1.24.0/pango/pango-script-lang-table.h	2009-04-02 16:05:58.747953000 +0900
@@ -8,7 +8,7 @@
  */
 typedef struct _PangoScriptForLang {
   const char lang[7];
-  PangoScript scripts[3];
+  PangoScript scripts[6];
 } PangoScriptForLang;
 
 static const PangoScriptForLang pango_script_for_lang[] = {
@@ -103,7 +103,7 @@ static const PangoScriptForLang pango_sc
   { "is",     { PANGO_SCRIPT_LATIN/*70*/ } },
   { "it",     { PANGO_SCRIPT_LATIN/*72*/ } },
   { "iu",     { PANGO_SCRIPT_CANADIAN_ABORIGINAL/*161*/ } },
-  { "ja",     { PANGO_SCRIPT_HAN/*6356*/, PANGO_SCRIPT_KATAKANA/*88*/, PANGO_SCRIPT_HIRAGANA/*85*/ } },
+  { "ja",     { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*6356*/, PANGO_SCRIPT_KATAKANA/*88*/, PANGO_SCRIPT_HIRAGANA/*85*/ } },
   { "jv",     { PANGO_SCRIPT_LATIN/*56*/ } },
   { "ka",     { PANGO_SCRIPT_GEORGIAN/*33*/ } },
   { "kaa",    { PANGO_SCRIPT_CYRILLIC/*78*/ } },
@@ -114,7 +114,7 @@ static const PangoScriptForLang pango_sc
   { "kl",     { PANGO_SCRIPT_LATIN/*81*/ } },
   { "km",     { PANGO_SCRIPT_KHMER/*63*/ } },
   { "kn",     { PANGO_SCRIPT_KANNADA/*70*/ } },
-  { "ko",     { PANGO_SCRIPT_HANGUL/*2443*/ } },
+  { "ko",     { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_HANGUL/*2443*/ } },
   { "kok",    { PANGO_SCRIPT_DEVANAGARI/*68*/ } },
   { "kr",     { PANGO_SCRIPT_LATIN/*56*/ } },
   { "ks",     { PANGO_SCRIPT_ARABIC/*145*/ } },
@@ -243,10 +243,10 @@ static const PangoScriptForLang pango_sc
   { "yi",     { PANGO_SCRIPT_HEBREW/*27*/ } },
   { "yo",     { PANGO_SCRIPT_LATIN/*114*/ } },
   { "za",     { PANGO_SCRIPT_LATIN/*52*/ } },
-  { "zh-cn",  { PANGO_SCRIPT_HAN/*6763*/ } },
-  { "zh-hk",  { PANGO_SCRIPT_HAN/*2213*/ } },
-  { "zh-mo",  { PANGO_SCRIPT_HAN/*2213*/ } },
-  { "zh-sg",  { PANGO_SCRIPT_HAN/*6763*/ } },
-  { "zh-tw",  { PANGO_SCRIPT_HAN/*13063*/ } },
+  { "zh-cn",  { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*6763*/, PANGO_SCRIPT_KATAKANA, PANGO_SCRIPT_HIRAGANA } },
+  { "zh-hk",  { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*2213*/, PANGO_SCRIPT_KATAKANA, PANGO_SCRIPT_HIRAGANA } },
+  { "zh-mo",  { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*2213*/, PANGO_SCRIPT_KATAKANA, PANGO_SCRIPT_HIRAGANA } },
+  { "zh-sg",  { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*6763*/, PANGO_SCRIPT_KATAKANA, PANGO_SCRIPT_HIRAGANA } },
+  { "zh-tw",  { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*13063*/, PANGO_SCRIPT_KATAKANA, PANGO_SCRIPT_HIRAGANA } },
   { "zu",     { PANGO_SCRIPT_LATIN/*52*/ } }
 };