libiconv.patch

VLC Player Source Code

diff -Naur libiconv.old/lib/aliases.gperf libiconv/lib/aliases.gperf
--- libiconv.old/lib/aliases.gperf	2003-05-22 22:17:15.000000000 +0200
+++ libiconv/lib/aliases.gperf	2005-08-04 18:54:43.000000000 +0200
@@ -21,6 +21,7 @@
 US, ei_ascii
 CSASCII, ei_ascii
 UTF-8, ei_utf8
+UTF-8-MAC, ei_utf8mac
 UCS-2, ei_ucs2
 ISO-10646-UCS-2, ei_ucs2
 CSUNICODE, ei_ucs2
diff -Naur libiconv.old/lib/aliases.h libiconv/lib/aliases.h
--- libiconv.old/lib/aliases.h	2003-05-22 22:17:17.000000000 +0200
+++ libiconv/lib/aliases.h	2005-08-04 18:54:43.000000000 +0200
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0 */
+/* ANSI-C code produced by gperf version 3.0.1 */
 /* Command-line: gperf -m 10 lib/aliases.gperf  */
 /* Computed positions: -k'1,3-11,$' */
 
@@ -32,7 +32,7 @@
 #line 1 "lib/aliases.gperf"
 struct alias { int name; unsigned int encoding_index; };
 
-#define TOTAL_KEYWORDS 324
+#define TOTAL_KEYWORDS 325
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 45
 #define MIN_HASH_VALUE 15
@@ -55,11 +55,11 @@
       880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
       880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
       880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
-      880, 880, 880, 880, 880,   6,  69, 880,  44,   5,
-        6,  18,  60,   9,   8,  50,  14,  13, 271, 880,
+      880, 880, 880, 880, 880,   6, 142, 880,  44,   5,
+        6,  18,  60,   9,   8,  50,  14,  13, 291, 880,
       880, 880, 880, 880, 880, 107, 152,   5,  29,   7,
-       43, 112,  42,   5, 341, 106,  10, 158,   8,   5,
-        6, 880,  61,  38,  98, 152, 194, 112,  30,  10,
+      205, 112,  42,   5, 341, 106,  10, 158,   8,   5,
+        6, 880,  61,  38,  98, 152, 110, 112,  30,  10,
         6, 880, 880, 880, 880,  60, 880, 880, 880, 880,
       880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
       880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
@@ -205,6 +205,7 @@
     char stringpool_str171[sizeof("MAC")];
     char stringpool_str172[sizeof("ISO_8859-3")];
     char stringpool_str173[sizeof("ISO-IR-109")];
+    char stringpool_str174[sizeof("VISCII")];
     char stringpool_str175[sizeof("ISO8859-7")];
     char stringpool_str176[sizeof("ISO-8859-10")];
     char stringpool_str177[sizeof("CSASCII")];
@@ -212,6 +213,7 @@
     char stringpool_str179[sizeof("ISO-IR-179")];
     char stringpool_str182[sizeof("ISO-8859-7")];
     char stringpool_str184[sizeof("ISO-IR-203")];
+    char stringpool_str186[sizeof("CSVISCII")];
     char stringpool_str189[sizeof("ISO-IR-149")];
     char stringpool_str190[sizeof("MS-EE")];
     char stringpool_str191[sizeof("ISO-IR-148")];
@@ -237,34 +239,28 @@
     char stringpool_str222[sizeof("ISO-IR-14")];
     char stringpool_str225[sizeof("ELOT_928")];
     char stringpool_str227[sizeof("LATIN7")];
-    char stringpool_str228[sizeof("UTF-16")];
+    char stringpool_str228[sizeof("TCVN")];
     char stringpool_str230[sizeof("ISO_8859-10")];
     char stringpool_str232[sizeof("CSUNICODE")];
     char stringpool_str233[sizeof("UCS-2LE")];
-    char stringpool_str234[sizeof("UTF-8")];
     char stringpool_str235[sizeof("ISO-IR-100")];
     char stringpool_str236[sizeof("ISO_8859-7")];
-    char stringpool_str237[sizeof("UTF-32")];
     char stringpool_str238[sizeof("CHAR")];
     char stringpool_str241[sizeof("UNICODE-1-1")];
     char stringpool_str242[sizeof("CSUNICODE11")];
     char stringpool_str244[sizeof("TIS620")];
     char stringpool_str245[sizeof("EUCKR")];
-    char stringpool_str246[sizeof("UTF-16LE")];
     char stringpool_str247[sizeof("LATIN4")];
     char stringpool_str250[sizeof("KSC_5601")];
     char stringpool_str251[sizeof("TIS-620")];
     char stringpool_str252[sizeof("EUC-KR")];
     char stringpool_str254[sizeof("IBM-CP1133")];
     char stringpool_str256[sizeof("ISO_8859-4")];
-    char stringpool_str257[sizeof("UTF-32LE")];
-    char stringpool_str258[sizeof("VISCII")];
     char stringpool_str259[sizeof("KOI8-R")];
     char stringpool_str262[sizeof("ISO_8859-14")];
     char stringpool_str264[sizeof("CSKOI8R")];
     char stringpool_str266[sizeof("GREEK8")];
     char stringpool_str267[sizeof("MS-CYRL")];
-    char stringpool_str270[sizeof("CSVISCII")];
     char stringpool_str280[sizeof("IBM850")];
     char stringpool_str283[sizeof("ISO-IR-144")];
     char stringpool_str286[sizeof("BIG5")];
@@ -283,12 +279,11 @@
     char stringpool_str303[sizeof("KOREAN")];
     char stringpool_str304[sizeof("CSISOLATIN2")];
     char stringpool_str305[sizeof("CN-BIG5")];
-    char stringpool_str306[sizeof("UTF-7")];
+    char stringpool_str307[sizeof("TCVN-5712")];
     char stringpool_str308[sizeof("CSISOLATIN6")];
     char stringpool_str309[sizeof("CSISOLATINCYRILLIC")];
     char stringpool_str310[sizeof("CSISOLATIN5")];
-    char stringpool_str312[sizeof("TCVN")];
-    char stringpool_str315[sizeof("TIS620.2529-1")];
+    char stringpool_str312[sizeof("TCVN5712-1")];
     char stringpool_str318[sizeof("CSGB2312")];
     char stringpool_str320[sizeof("ISO-10646-UCS-2")];
     char stringpool_str321[sizeof("UCS-4")];
@@ -301,12 +296,12 @@
     char stringpool_str328[sizeof("CSISOLATIN3")];
     char stringpool_str329[sizeof("ISO646-US")];
     char stringpool_str331[sizeof("US-ASCII")];
-    char stringpool_str332[sizeof("TIS620.2533-1")];
     char stringpool_str333[sizeof("KOI8-T")];
     char stringpool_str334[sizeof("MS-ANSI")];
     char stringpool_str335[sizeof("KS_C_5601-1989")];
     char stringpool_str336[sizeof("GB_1988-80")];
     char stringpool_str339[sizeof("EUCTW")];
+    char stringpool_str342[sizeof("VISCII1.1-1")];
     char stringpool_str343[sizeof("GREEK")];
     char stringpool_str346[sizeof("EUC-TW")];
     char stringpool_str347[sizeof("WINDOWS-1251")];
@@ -314,7 +309,6 @@
     char stringpool_str349[sizeof("JP")];
     char stringpool_str350[sizeof("WINDOWS-1256")];
     char stringpool_str351[sizeof("WINDOWS-1255")];
-    char stringpool_str353[sizeof("VISCII1.1-1")];
     char stringpool_str354[sizeof("CSISO2022KR")];
     char stringpool_str356[sizeof("WINDOWS-1258")];
     char stringpool_str360[sizeof("WINDOWS-1253")];
@@ -323,7 +317,6 @@
     char stringpool_str368[sizeof("ROMAN8")];
     char stringpool_str369[sizeof("HZ-GB-2312")];
     char stringpool_str370[sizeof("EUCJP")];
-    char stringpool_str371[sizeof("TIS620.2533-0")];
     char stringpool_str372[sizeof("KS_C_5601-1987")];
     char stringpool_str373[sizeof("MACICELAND")];
     char stringpool_str374[sizeof("ISO-10646-UCS-4")];
@@ -331,76 +324,81 @@
     char stringpool_str377[sizeof("EUC-JP")];
     char stringpool_str386[sizeof("WINDOWS-1250")];
     char stringpool_str387[sizeof("ARABIC")];
-    char stringpool_str388[sizeof("UTF-16BE")];
-    char stringpool_str391[sizeof("TCVN-5712")];
+    char stringpool_str388[sizeof("TIS620.2529-1")];
+    char stringpool_str390[sizeof("UTF-16")];
     char stringpool_str392[sizeof("WINDOWS-1257")];
     char stringpool_str394[sizeof("CSPC862LATINHEBREW")];
-    char stringpool_str396[sizeof("TCVN5712-1")];
-    char stringpool_str399[sizeof("UTF-32BE")];
+    char stringpool_str396[sizeof("UTF-8")];
+    char stringpool_str399[sizeof("UTF-32")];
     char stringpool_str402[sizeof("WINDOWS-1254")];
     char stringpool_str404[sizeof("CSEUCKR")];
+    char stringpool_str405[sizeof("TIS620.2533-1")];
     char stringpool_str406[sizeof("ASMO-708")];
+    char stringpool_str408[sizeof("UTF-16LE")];
     char stringpool_str409[sizeof("CSISOLATINARABIC")];
     char stringpool_str410[sizeof("MACINTOSH")];
     char stringpool_str411[sizeof("UCS-2-INTERNAL")];
     char stringpool_str412[sizeof("CSISOLATIN4")];
     char stringpool_str416[sizeof("ECMA-114")];
     char stringpool_str418[sizeof("CN-GB-ISOIR165")];
-    char stringpool_str420[sizeof("ANSI_X3.4-1986")];
+    char stringpool_str419[sizeof("UTF-32LE")];
     char stringpool_str421[sizeof("CSISO57GB1988")];
     char stringpool_str423[sizeof("CSISO58GB231280")];
     char stringpool_str424[sizeof("HP-ROMAN8")];
-    char stringpool_str426[sizeof("ANSI_X3.4-1968")];
     char stringpool_str427[sizeof("MACTHAI")];
     char stringpool_str429[sizeof("UCS-4BE")];
     char stringpool_str430[sizeof("CSHPROMAN8")];
     char stringpool_str432[sizeof("CN-GB")];
     char stringpool_str434[sizeof("UNICODELITTLE")];
-    char stringpool_str435[sizeof("ISO_8859-5:1988")];
-    char stringpool_str438[sizeof("ISO_8859-9:1989")];
-    char stringpool_str440[sizeof("ISO_8859-8:1988")];
     char stringpool_str441[sizeof("KOI8-U")];
-    char stringpool_str444[sizeof("ISO_8859-3:1988")];
+    char stringpool_str444[sizeof("TIS620.2533-0")];
     char stringpool_str448[sizeof("ISO-2022-JP")];
     char stringpool_str449[sizeof("ISO-2022-JP-1")];
     char stringpool_str450[sizeof("ISO-2022-JP-2")];
     char stringpool_str451[sizeof("CSISOLATINHEBREW")];
     char stringpool_str454[sizeof("ISO646-JP")];
+    char stringpool_str455[sizeof("ISO_8859-5:1988")];
     char stringpool_str457[sizeof("EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE")];
+    char stringpool_str458[sizeof("ISO_8859-9:1989")];
+    char stringpool_str460[sizeof("ISO_8859-8:1988")];
+    char stringpool_str464[sizeof("ISO_8859-3:1988")];
     char stringpool_str465[sizeof("UCS-4-INTERNAL")];
-    char stringpool_str467[sizeof("ISO_8859-1:1987")];
-    char stringpool_str468[sizeof("ISO_8859-2:1987")];
-    char stringpool_str470[sizeof("ISO_8859-6:1987")];
+    char stringpool_str468[sizeof("UTF-7")];
     char stringpool_str479[sizeof("CSISO2022JP")];
     char stringpool_str480[sizeof("CSISO2022JP2")];
-    char stringpool_str486[sizeof("ISO_8859-4:1988")];
+    char stringpool_str485[sizeof("ISO_646.IRV:1991")];
+    char stringpool_str487[sizeof("ISO_8859-1:1987")];
+    char stringpool_str488[sizeof("ISO_8859-2:1987")];
     char stringpool_str489[sizeof("MACCENTRALEUROPE")];
+    char stringpool_str490[sizeof("ISO_8859-6:1987")];
     char stringpool_str492[sizeof("HEBREW")];
+    char stringpool_str493[sizeof("ANSI_X3.4-1986")];
     char stringpool_str494[sizeof("MS-HEBR")];
-    char stringpool_str496[sizeof("ISO_646.IRV:1991")];
     char stringpool_str498[sizeof("CSEUCTW")];
+    char stringpool_str499[sizeof("ANSI_X3.4-1968")];
     char stringpool_str503[sizeof("KOI8-RU")];
     char stringpool_str505[sizeof("WINDOWS-874")];
+    char stringpool_str506[sizeof("ISO_8859-4:1988")];
     char stringpool_str508[sizeof("JIS0208")];
     char stringpool_str509[sizeof("GEORGIAN-PS")];
-    char stringpool_str512[sizeof("ISO_8859-7:1987")];
     char stringpool_str514[sizeof("CSISOLATINGREEK")];
     char stringpool_str515[sizeof("JIS_C6226-1983")];
     char stringpool_str518[sizeof("MACROMAN")];
     char stringpool_str519[sizeof("UCS-2-SWAPPED")];
     char stringpool_str524[sizeof("CSMACINTOSH")];
-    char stringpool_str527[sizeof("BIGFIVE")];
     char stringpool_str528[sizeof("CSISO159JISX02121990")];
     char stringpool_str529[sizeof("CSISO14JISC6220RO")];
     char stringpool_str530[sizeof("CSPC850MULTILINGUAL")];
-    char stringpool_str534[sizeof("BIG-FIVE")];
+    char stringpool_str532[sizeof("ISO_8859-7:1987")];
     char stringpool_str541[sizeof("JIS_C6220-1969-RO")];
     char stringpool_str545[sizeof("JIS_X0212")];
     char stringpool_str549[sizeof("BIG5HKSCS")];
+    char stringpool_str550[sizeof("UTF-16BE")];
     char stringpool_str553[sizeof("JISX0201-1976")];
     char stringpool_str554[sizeof("GEORGIAN-ACADEMY")];
     char stringpool_str556[sizeof("BIG5-HKSCS")];
     char stringpool_str560[sizeof("CSISO87JISX0208")];
+    char stringpool_str561[sizeof("UTF-32BE")];
     char stringpool_str570[sizeof("MACGREEK")];
     char stringpool_str571[sizeof("MS-GREEK")];
     char stringpool_str573[sizeof("UCS-4-SWAPPED")];
@@ -410,25 +408,28 @@
     char stringpool_str594[sizeof("UNICODEBIG")];
     char stringpool_str599[sizeof("JIS_X0212-1990")];
     char stringpool_str600[sizeof("JIS_X0208")];
+    char stringpool_str605[sizeof("BIGFIVE")];
+    char stringpool_str612[sizeof("BIG-FIVE")];
     char stringpool_str614[sizeof("MACARABIC")];
-    char stringpool_str619[sizeof("CSHALFWIDTHKATAKANA")];
     char stringpool_str620[sizeof("JIS_X0208-1983")];
-    char stringpool_str621[sizeof("SHIFT-JIS")];
+    char stringpool_str621[sizeof("TCVN5712-1:1993")];
     char stringpool_str626[sizeof("MACUKRAINE")];
-    char stringpool_str635[sizeof("CSEUCPKDFMTJAPANESE")];
     char stringpool_str646[sizeof("JIS_X0208-1990")];
-    char stringpool_str663[sizeof("CSSHIFTJIS")];
-    char stringpool_str664[sizeof("JIS_X0212.1990-0")];
     char stringpool_str665[sizeof("MACHEBREW")];
-    char stringpool_str675[sizeof("SHIFT_JIS")];
-    char stringpool_str685[sizeof("TCVN5712-1:1993")];
+    char stringpool_str667[sizeof("UTF-8-MAC")];
+    char stringpool_str669[sizeof("JAVA")];
     char stringpool_str694[sizeof("MS-TURK")];
     char stringpool_str717[sizeof("MACTURKISH")];
     char stringpool_str731[sizeof("MACROMANIA")];
+    char stringpool_str737[sizeof("JIS_X0212.1990-0")];
     char stringpool_str750[sizeof("MS-ARAB")];
-    char stringpool_str753[sizeof("JAVA")];
+    char stringpool_str781[sizeof("CSHALFWIDTHKATAKANA")];
+    char stringpool_str783[sizeof("SHIFT-JIS")];
+    char stringpool_str797[sizeof("CSEUCPKDFMTJAPANESE")];
     char stringpool_str798[sizeof("MS_KANJI")];
     char stringpool_str799[sizeof("JOHAB")];
+    char stringpool_str825[sizeof("CSSHIFTJIS")];
+    char stringpool_str837[sizeof("SHIFT_JIS")];
     char stringpool_str879[sizeof("WINBALTRIM")];
   };
 static const struct stringpool_t stringpool_contents =
@@ -532,6 +533,7 @@
     "MAC",
     "ISO_8859-3",
     "ISO-IR-109",
+    "VISCII",
     "ISO8859-7",
     "ISO-8859-10",
     "CSASCII",
@@ -539,6 +541,7 @@
     "ISO-IR-179",
     "ISO-8859-7",
     "ISO-IR-203",
+    "CSVISCII",
     "ISO-IR-149",
     "MS-EE",
     "ISO-IR-148",
@@ -564,34 +567,28 @@
     "ISO-IR-14",
     "ELOT_928",
     "LATIN7",
-    "UTF-16",
+    "TCVN",
     "ISO_8859-10",
     "CSUNICODE",
     "UCS-2LE",
-    "UTF-8",
     "ISO-IR-100",
     "ISO_8859-7",
-    "UTF-32",
     "CHAR",
     "UNICODE-1-1",
     "CSUNICODE11",
     "TIS620",
     "EUCKR",
-    "UTF-16LE",
     "LATIN4",
     "KSC_5601",
     "TIS-620",
     "EUC-KR",
     "IBM-CP1133",
     "ISO_8859-4",
-    "UTF-32LE",