Skip to content
Snippets Groups Projects
0026-libiconv-full-Update-to-version-116.patch 1.11 MiB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000
From 739306ad13c585333be07552e6906206787a040b Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Mon, 25 Nov 2019 02:54:34 +0100
Subject: [PATCH] libiconv-full: Update to version 1.16

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---
 package/libs/libiconv-full/Makefile           |    12 +-
 .../patches/100-strip_charsets.patch          |  3438 --
 .../libiconv-full/patches/101-autotools.patch | 26014 ----------------
 .../patches/103-configure_ac_fix.patch        |    31 -
 .../patches/200-work-with-libtool2.patch      |    17 -
 .../patches/300-fortify-source-compat.patch   |    23 -
 6 files changed, 6 insertions(+), 29529 deletions(-)
 delete mode 100644 package/libs/libiconv-full/patches/100-strip_charsets.patch
 delete mode 100644 package/libs/libiconv-full/patches/101-autotools.patch
 delete mode 100644 package/libs/libiconv-full/patches/103-configure_ac_fix.patch
 delete mode 100644 package/libs/libiconv-full/patches/200-work-with-libtool2.patch
 delete mode 100644 package/libs/libiconv-full/patches/300-fortify-source-compat.patch

diff --git a/package/libs/libiconv-full/Makefile b/package/libs/libiconv-full/Makefile
index ac7bfddf56..f524bc6c8f 100644
--- a/package/libs/libiconv-full/Makefile
+++ b/package/libs/libiconv-full/Makefile
@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiconv-full
-PKG_VERSION:=1.11.1
-PKG_RELEASE:=3
-
-PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
+PKG_VERSION:=1.16
+PKG_RELEASE:=1
 
 PKG_SOURCE:=libiconv-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libiconv
-PKG_HASH:=e78c347a1a0cb15f2648519e9799151f4b4a934b61ad9ee7424478efe2b8257f
+PKG_HASH:=e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
 PKG_BUILD_DIR:=$(BUILD_DIR)/libiconv-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=LGPL-2.0
 PKG_LICENSE_FILES:=COPYING.LIB
 
@@ -25,7 +25,7 @@ PKG_FIXUP:=patch-libtool
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libiconv-full/Default
-  URL:=http://www.gnu.org/software/libiconv/
+  URL:=https://www.gnu.org/software/libiconv/
   TITLE:=Character set conversion
 endef
 
diff --git a/package/libs/libiconv-full/patches/100-strip_charsets.patch b/package/libs/libiconv-full/patches/100-strip_charsets.patch
deleted file mode 100644
index e4f49aec46..0000000000
--- a/package/libs/libiconv-full/patches/100-strip_charsets.patch
+++ /dev/null
@@ -1,3438 +0,0 @@
---- a/lib/aliases_dos.h
-+++ b/lib/aliases_dos.h
-@@ -2,47 +2,3 @@
-   S(dos_1, "IBM437", ei_cp437 )
-   S(dos_2, "437", ei_cp437 )
-   S(dos_3, "CSPC8CODEPAGE437", ei_cp437 )
--  S(dos_4, "CP737", ei_cp737 )
--  S(dos_5, "CP775", ei_cp775 )
--  S(dos_6, "IBM775", ei_cp775 )
--  S(dos_7, "CSPC775BALTIC", ei_cp775 )
--  S(dos_8, "CP852", ei_cp852 )
--  S(dos_9, "IBM852", ei_cp852 )
--  S(dos_10, "852", ei_cp852 )
--  S(dos_11, "CSPCP852", ei_cp852 )
--  S(dos_12, "CP853", ei_cp853 )
--  S(dos_13, "CP855", ei_cp855 )
--  S(dos_14, "IBM855", ei_cp855 )
--  S(dos_15, "855", ei_cp855 )
--  S(dos_16, "CSIBM855", ei_cp855 )
--  S(dos_17, "CP857", ei_cp857 )
--  S(dos_18, "IBM857", ei_cp857 )
--  S(dos_19, "857", ei_cp857 )
--  S(dos_20, "CSIBM857", ei_cp857 )
--  S(dos_21, "CP858", ei_cp858 )
--  S(dos_22, "CP860", ei_cp860 )
--  S(dos_23, "IBM860", ei_cp860 )
--  S(dos_24, "860", ei_cp860 )
--  S(dos_25, "CSIBM860", ei_cp860 )
--  S(dos_26, "CP861", ei_cp861 )
--  S(dos_27, "IBM861", ei_cp861 )
--  S(dos_28, "861", ei_cp861 )
--  S(dos_29, "CP-IS", ei_cp861 )
--  S(dos_30, "CSIBM861", ei_cp861 )
--  S(dos_31, "CP863", ei_cp863 )
--  S(dos_32, "IBM863", ei_cp863 )
--  S(dos_33, "863", ei_cp863 )
--  S(dos_34, "CSIBM863", ei_cp863 )
--  S(dos_35, "CP864", ei_cp864 )
--  S(dos_36, "IBM864", ei_cp864 )
--  S(dos_37, "CSIBM864", ei_cp864 )
--  S(dos_38, "CP865", ei_cp865 )
--  S(dos_39, "IBM865", ei_cp865 )
--  S(dos_40, "865", ei_cp865 )
--  S(dos_41, "CSIBM865", ei_cp865 )
--  S(dos_42, "CP869", ei_cp869 )
--  S(dos_43, "IBM869", ei_cp869 )
--  S(dos_44, "869", ei_cp869 )
--  S(dos_45, "CP-GR", ei_cp869 )
--  S(dos_46, "CSIBM869", ei_cp869 )
--  S(dos_47, "CP1125", ei_cp1125 )
---- a/lib/aliases.gperf
-+++ b/lib/aliases.gperf
-@@ -48,8 +48,6 @@ UCS-2-INTERNAL, ei_ucs2internal
- UCS-2-SWAPPED, ei_ucs2swapped
- UCS-4-INTERNAL, ei_ucs4internal
- UCS-4-SWAPPED, ei_ucs4swapped
--C99, ei_c99
--JAVA, ei_java
- ISO-8859-1, ei_iso8859_1
- ISO_8859-1, ei_iso8859_1
- ISO_8859-1:1987, ei_iso8859_1
-@@ -68,285 +66,16 @@ LATIN2, ei_iso8859_2
- L2, ei_iso8859_2
- CSISOLATIN2, ei_iso8859_2
- ISO8859-2, ei_iso8859_2
--ISO-8859-3, ei_iso8859_3
--ISO_8859-3, ei_iso8859_3
--ISO_8859-3:1988, ei_iso8859_3
--ISO-IR-109, ei_iso8859_3
--LATIN3, ei_iso8859_3
--L3, ei_iso8859_3
--CSISOLATIN3, ei_iso8859_3
--ISO8859-3, ei_iso8859_3
--ISO-8859-4, ei_iso8859_4
--ISO_8859-4, ei_iso8859_4
--ISO_8859-4:1988, ei_iso8859_4
--ISO-IR-110, ei_iso8859_4
--LATIN4, ei_iso8859_4
--L4, ei_iso8859_4
--CSISOLATIN4, ei_iso8859_4
--ISO8859-4, ei_iso8859_4
--ISO-8859-5, ei_iso8859_5
--ISO_8859-5, ei_iso8859_5
--ISO_8859-5:1988, ei_iso8859_5
--ISO-IR-144, ei_iso8859_5
--CYRILLIC, ei_iso8859_5
--CSISOLATINCYRILLIC, ei_iso8859_5
--ISO8859-5, ei_iso8859_5
--ISO-8859-6, ei_iso8859_6
--ISO_8859-6, ei_iso8859_6
--ISO_8859-6:1987, ei_iso8859_6
--ISO-IR-127, ei_iso8859_6
--ECMA-114, ei_iso8859_6
--ASMO-708, ei_iso8859_6
--ARABIC, ei_iso8859_6
--CSISOLATINARABIC, ei_iso8859_6
--ISO8859-6, ei_iso8859_6
--ISO-8859-7, ei_iso8859_7
--ISO_8859-7, ei_iso8859_7
--ISO_8859-7:1987, ei_iso8859_7
--ISO_8859-7:2003, ei_iso8859_7
--ISO-IR-126, ei_iso8859_7
--ECMA-118, ei_iso8859_7
--ELOT_928, ei_iso8859_7
--GREEK8, ei_iso8859_7
--GREEK, ei_iso8859_7
--CSISOLATINGREEK, ei_iso8859_7
--ISO8859-7, ei_iso8859_7
--ISO-8859-8, ei_iso8859_8
--ISO_8859-8, ei_iso8859_8
--ISO_8859-8:1988, ei_iso8859_8
--ISO-IR-138, ei_iso8859_8
--HEBREW, ei_iso8859_8
--CSISOLATINHEBREW, ei_iso8859_8
--ISO8859-8, ei_iso8859_8
--ISO-8859-9, ei_iso8859_9
--ISO_8859-9, ei_iso8859_9
--ISO_8859-9:1989, ei_iso8859_9
--ISO-IR-148, ei_iso8859_9
--LATIN5, ei_iso8859_9
--L5, ei_iso8859_9
--CSISOLATIN5, ei_iso8859_9
--ISO8859-9, ei_iso8859_9
--ISO-8859-10, ei_iso8859_10
--ISO_8859-10, ei_iso8859_10
--ISO_8859-10:1992, ei_iso8859_10
--ISO-IR-157, ei_iso8859_10
--LATIN6, ei_iso8859_10
--L6, ei_iso8859_10
--CSISOLATIN6, ei_iso8859_10
--ISO8859-10, ei_iso8859_10
--ISO-8859-11, ei_iso8859_11
--ISO_8859-11, ei_iso8859_11
--ISO8859-11, ei_iso8859_11
--ISO-8859-13, ei_iso8859_13
--ISO_8859-13, ei_iso8859_13
--ISO-IR-179, ei_iso8859_13
--LATIN7, ei_iso8859_13
--L7, ei_iso8859_13
--ISO8859-13, ei_iso8859_13
--ISO-8859-14, ei_iso8859_14
--ISO_8859-14, ei_iso8859_14
--ISO_8859-14:1998, ei_iso8859_14
--ISO-IR-199, ei_iso8859_14
--LATIN8, ei_iso8859_14
--L8, ei_iso8859_14
--ISO-CELTIC, ei_iso8859_14
--ISO8859-14, ei_iso8859_14
- ISO-8859-15, ei_iso8859_15
- ISO_8859-15, ei_iso8859_15
- ISO_8859-15:1998, ei_iso8859_15
- ISO-IR-203, ei_iso8859_15
- LATIN-9, ei_iso8859_15
- ISO8859-15, ei_iso8859_15
--ISO-8859-16, ei_iso8859_16
--ISO_8859-16, ei_iso8859_16
--ISO_8859-16:2001, ei_iso8859_16
--ISO-IR-226, ei_iso8859_16
--LATIN10, ei_iso8859_16
--L10, ei_iso8859_16
--ISO8859-16, ei_iso8859_16
- KOI8-R, ei_koi8_r
- CSKOI8R, ei_koi8_r
--KOI8-U, ei_koi8_u
--KOI8-RU, ei_koi8_ru
- CP1250, ei_cp1250
- WINDOWS-1250, ei_cp1250
- MS-EE, ei_cp1250
--CP1251, ei_cp1251
--WINDOWS-1251, ei_cp1251
--MS-CYRL, ei_cp1251
--CP1252, ei_cp1252
--WINDOWS-1252, ei_cp1252
--MS-ANSI, ei_cp1252
--CP1253, ei_cp1253
--WINDOWS-1253, ei_cp1253
--MS-GREEK, ei_cp1253
--CP1254, ei_cp1254
--WINDOWS-1254, ei_cp1254
--MS-TURK, ei_cp1254
--CP1255, ei_cp1255
--WINDOWS-1255, ei_cp1255
--MS-HEBR, ei_cp1255
--CP1256, ei_cp1256
--WINDOWS-1256, ei_cp1256
--MS-ARAB, ei_cp1256
--CP1257, ei_cp1257
--WINDOWS-1257, ei_cp1257
--WINBALTRIM, ei_cp1257
--CP1258, ei_cp1258
--WINDOWS-1258, ei_cp1258
--CP850, ei_cp850
--IBM850, ei_cp850
--850, ei_cp850
--CSPC850MULTILINGUAL, ei_cp850
--CP862, ei_cp862
--IBM862, ei_cp862
--862, ei_cp862
--CSPC862LATINHEBREW, ei_cp862
--CP866, ei_cp866
--IBM866, ei_cp866
--866, ei_cp866
--CSIBM866, ei_cp866
--MACROMAN, ei_mac_roman
--MACINTOSH, ei_mac_roman
--MAC, ei_mac_roman
--CSMACINTOSH, ei_mac_roman
--MACCENTRALEUROPE, ei_mac_centraleurope
--MACICELAND, ei_mac_iceland
--MACCROATIAN, ei_mac_croatian
--MACROMANIA, ei_mac_romania
--MACCYRILLIC, ei_mac_cyrillic
--MACUKRAINE, ei_mac_ukraine
--MACGREEK, ei_mac_greek
--MACTURKISH, ei_mac_turkish
--MACHEBREW, ei_mac_hebrew
--MACARABIC, ei_mac_arabic
--MACTHAI, ei_mac_thai
--HP-ROMAN8, ei_hp_roman8
--ROMAN8, ei_hp_roman8
--R8, ei_hp_roman8
--CSHPROMAN8, ei_hp_roman8
--NEXTSTEP, ei_nextstep
--ARMSCII-8, ei_armscii_8
--GEORGIAN-ACADEMY, ei_georgian_academy
--GEORGIAN-PS, ei_georgian_ps
--KOI8-T, ei_koi8_t
--PT154, ei_pt154
--PTCP154, ei_pt154
--CP154, ei_pt154
--CYRILLIC-ASIAN, ei_pt154
--CSPTCP154, ei_pt154
--MULELAO-1, ei_mulelao
--CP1133, ei_cp1133
--IBM-CP1133, ei_cp1133
--TIS-620, ei_tis620
--TIS620, ei_tis620
--TIS620-0, ei_tis620
--TIS620.2529-1, ei_tis620
--TIS620.2533-0, ei_tis620
--TIS620.2533-1, ei_tis620
--ISO-IR-166, ei_tis620
--CP874, ei_cp874
--WINDOWS-874, ei_cp874
--VISCII, ei_viscii
--VISCII1.1-1, ei_viscii
--CSVISCII, ei_viscii
--TCVN, ei_tcvn
--TCVN-5712, ei_tcvn
--TCVN5712-1, ei_tcvn
--TCVN5712-1:1993, ei_tcvn
--JIS_C6220-1969-RO, ei_iso646_jp
--ISO646-JP, ei_iso646_jp
--ISO-IR-14, ei_iso646_jp
--JP, ei_iso646_jp
--CSISO14JISC6220RO, ei_iso646_jp
--JIS_X0201, ei_jisx0201
--JISX0201-1976, ei_jisx0201
--X0201, ei_jisx0201
--CSHALFWIDTHKATAKANA, ei_jisx0201
--JIS_X0208, ei_jisx0208
--JIS_X0208-1983, ei_jisx0208
--JIS_X0208-1990, ei_jisx0208
--JIS0208, ei_jisx0208
--X0208, ei_jisx0208
--ISO-IR-87, ei_jisx0208
--JIS_C6226-1983, ei_jisx0208
--CSISO87JISX0208, ei_jisx0208
--JIS_X0212, ei_jisx0212
--JIS_X0212.1990-0, ei_jisx0212
--JIS_X0212-1990, ei_jisx0212
--X0212, ei_jisx0212
--ISO-IR-159, ei_jisx0212
--CSISO159JISX02121990, ei_jisx0212
--GB_1988-80, ei_iso646_cn
--ISO646-CN, ei_iso646_cn
--ISO-IR-57, ei_iso646_cn
--CN, ei_iso646_cn
--CSISO57GB1988, ei_iso646_cn
--GB_2312-80, ei_gb2312
--ISO-IR-58, ei_gb2312
--CSISO58GB231280, ei_gb2312
--CHINESE, ei_gb2312
--ISO-IR-165, ei_isoir165
--CN-GB-ISOIR165, ei_isoir165
--KSC_5601, ei_ksc5601
--KS_C_5601-1987, ei_ksc5601
--KS_C_5601-1989, ei_ksc5601
--ISO-IR-149, ei_ksc5601
--CSKSC56011987, ei_ksc5601
--KOREAN, ei_ksc5601
--EUC-JP, ei_euc_jp
--EUCJP, ei_euc_jp
--EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE, ei_euc_jp
--CSEUCPKDFMTJAPANESE, ei_euc_jp
--SHIFT_JIS, ei_sjis
--SHIFT-JIS, ei_sjis
--SJIS, ei_sjis
--MS_KANJI, ei_sjis
--CSSHIFTJIS, ei_sjis
--CP932, ei_cp932
--ISO-2022-JP, ei_iso2022_jp
--CSISO2022JP, ei_iso2022_jp
--ISO-2022-JP-1, ei_iso2022_jp1
--ISO-2022-JP-2, ei_iso2022_jp2
--CSISO2022JP2, ei_iso2022_jp2
--EUC-CN, ei_euc_cn
--EUCCN, ei_euc_cn
--GB2312, ei_euc_cn
--CN-GB, ei_euc_cn
--CSGB2312, ei_euc_cn
--GBK, ei_ces_gbk
--CP936, ei_cp936
--MS936, ei_cp936
--WINDOWS-936, ei_cp936
--GB18030, ei_gb18030
--ISO-2022-CN, ei_iso2022_cn
--CSISO2022CN, ei_iso2022_cn
--ISO-2022-CN-EXT, ei_iso2022_cn_ext
--HZ, ei_hz
--HZ-GB-2312, ei_hz
--EUC-TW, ei_euc_tw
--EUCTW, ei_euc_tw
--CSEUCTW, ei_euc_tw
--BIG5, ei_ces_big5
--BIG-5, ei_ces_big5
--BIG-FIVE, ei_ces_big5
--BIGFIVE, ei_ces_big5
--CN-BIG5, ei_ces_big5
--CSBIG5, ei_ces_big5
--CP950, ei_cp950
--BIG5-HKSCS:1999, ei_big5hkscs1999
--BIG5-HKSCS:2001, ei_big5hkscs2001
--BIG5-HKSCS, ei_big5hkscs2004
--BIG5HKSCS, ei_big5hkscs2004
--BIG5-HKSCS:2004, ei_big5hkscs2004
--EUC-KR, ei_euc_kr
--EUCKR, ei_euc_kr
--CSEUCKR, ei_euc_kr
--CP949, ei_cp949
--UHC, ei_cp949
--JOHAB, ei_johab
--CP1361, ei_johab
--ISO-2022-KR, ei_iso2022_kr
--CSISO2022KR, ei_iso2022_kr
- CHAR, ei_local_char
- WCHAR_T, ei_local_wchar_t
---- a/lib/aliases.h
-+++ b/lib/aliases.h
-@@ -1,6 +1,6 @@
- /* ANSI-C code produced by gperf version 3.0.2 */
- /* Command-line: gperf -m 10 lib/aliases.gperf  */
--/* Computed positions: -k'1,3-11,$' */
-+/* Computed positions: -k'4-7,10,$' */
- 
- #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-@@ -32,12 +32,12 @@
- #line 1 "lib/aliases.gperf"
- struct alias { int name; unsigned int encoding_index; };
- 
--#define TOTAL_KEYWORDS 341
-+#define TOTAL_KEYWORDS 70
- #define MIN_WORD_LENGTH 2
--#define MAX_WORD_LENGTH 45
--#define MIN_HASH_VALUE 13
--#define MAX_HASH_VALUE 997
--/* maximum key range = 985, duplicates = 0 */
-+#define MAX_WORD_LENGTH 17
-+#define MIN_HASH_VALUE 4
-+#define MAX_HASH_VALUE 98
-+/* maximum key range = 95, duplicates = 0 */
- 
- #ifdef __GNUC__
- __inline
-@@ -49,38 +49,31 @@ inline
- static unsigned int
- aliases_hash (register const char *str, register unsigned int len)
- {
--  static const unsigned short asso_values[] =
-+  static const unsigned char asso_values[] =
-     {
--      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
--      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
--      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
--      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
--      998, 998, 998, 998, 998,   4, 199, 998,  79,   6,
--       29,  65,  13,  15,   4,  88,  20,  22, 386, 998,
--      998, 998, 998, 998, 998,  47, 188, 110,   6,  26,
--       63,  19,  12,   5, 281, 202,   7, 166,  11,   5,
--       64, 998,   4,  11,  20, 185, 110, 152, 163,   4,
--        4, 998, 998, 998, 998,   5, 998, 998, 998, 998,
--      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
--      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
--      998, 998, 998, 998, 998, 998, 998, 998
-+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-+      99, 99, 99, 99, 99,  6, 99, 99, 22,  3,
-+       2,  2, 17,  3,  2,  7,  3,  2, 99, 99,
-+      99, 99, 99, 99, 99,  4, 53,  2, 21,  2,
-+      99,  7, 99, 15, 99, 99, 19, 99, 33,  2,
-+       4, 99, 11, 26, 17, 99, 99,  3, 26, 99,
-+      99, 99, 99, 99, 99, 10, 99, 99, 99, 99,
-+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-+      99, 99, 99, 99, 99, 99, 99, 99
-     };
-   register int hval = len;
- 
-   switch (hval)
-     {
-       default:
--        hval += asso_values[(unsigned char)str[10]];
--      /*FALLTHROUGH*/
--      case 10:
-         hval += asso_values[(unsigned char)str[9]];
-       /*FALLTHROUGH*/
-       case 9:
--        hval += asso_values[(unsigned char)str[8]];
--      /*FALLTHROUGH*/
-       case 8:
--        hval += asso_values[(unsigned char)str[7]];
--      /*FALLTHROUGH*/
-       case 7:
-         hval += asso_values[(unsigned char)str[6]];
-       /*FALLTHROUGH*/
-@@ -94,11 +87,7 @@ aliases_hash (register const char *str,
-         hval += asso_values[(unsigned char)str[3]];
-       /*FALLTHROUGH*/
-       case 3:
--        hval += asso_values[(unsigned char)str[2]];
--      /*FALLTHROUGH*/
-       case 2:
--      case 1:
--        hval += asso_values[(unsigned char)str[0]];
-         break;
-     }
-   return hval + asso_values[(unsigned char)str[len - 1]];
-@@ -106,1576 +95,306 @@ aliases_hash (register const char *str,
- 
- struct stringpool_t
-   {
--    char stringpool_str13[sizeof("L6")];
--    char stringpool_str15[sizeof("L1")];
--    char stringpool_str18[sizeof("HZ")];
--    char stringpool_str22[sizeof("L4")];
--    char stringpool_str24[sizeof("L5")];
--    char stringpool_str26[sizeof("R8")];
--    char stringpool_str29[sizeof("L8")];
--    char stringpool_str31[sizeof("866")];
--    char stringpool_str38[sizeof("L2")];
--    char stringpool_str42[sizeof("SJIS")];
--    char stringpool_str43[sizeof("ISO-IR-6")];
--    char stringpool_str55[sizeof("ISO-IR-166")];
--    char stringpool_str57[sizeof("LATIN6")];
--    char stringpool_str61[sizeof("LATIN1")];
--    char stringpool_str68[sizeof("ISO-IR-14")];
--    char stringpool_str74[sizeof("L3")];
--    char stringpool_str75[sizeof("LATIN4")];
--    char stringpool_str77[sizeof("ISO-IR-165")];
--    char stringpool_str79[sizeof("LATIN5")];
--    char stringpool_str80[sizeof("ISO-IR-126")];
--    char stringpool_str81[sizeof("862")];
--    char stringpool_str82[sizeof("ISO-IR-144")];
--    char stringpool_str89[sizeof("LATIN8")];
--    char stringpool_str91[sizeof("ISO-IR-58")];
--    char stringpool_str96[sizeof("ISO-IR-148")];
--    char stringpool_str97[sizeof("L7")];
--    char stringpool_str98[sizeof("LATIN-9")];
--    char stringpool_str100[sizeof("ISO-IR-149")];
--    char stringpool_str102[sizeof("ISO-IR-159")];
--    char stringpool_str103[sizeof("ISO-IR-226")];
--    char stringpool_str107[sizeof("LATIN2")];
--    char stringpool_str108[sizeof("ISO8859-6")];
--    char stringpool_str109[sizeof("ISO-IR-199")];
--    char stringpool_str112[sizeof("ISO8859-1")];
--    char stringpool_str113[sizeof("ISO-8859-6")];
--    char stringpool_str114[sizeof("ISO_8859-6")];
--    char stringpool_str115[sizeof("ISO8859-16")];
--    char stringpool_str116[sizeof("PT154")];
--    char stringpool_str117[sizeof("ISO-8859-1")];
--    char stringpool_str118[sizeof("ISO_8859-1")];
--    char stringpool_str119[sizeof("ISO8859-11")];
--    char stringpool_str120[sizeof("ISO-8859-16")];
--    char stringpool_str121[sizeof("ISO_8859-16")];
--    char stringpool_str123[sizeof("CN")];
--    char stringpool_str124[sizeof("ISO-8859-11")];
--    char stringpool_str125[sizeof("ISO_8859-11")];
--    char stringpool_str126[sizeof("ISO8859-4")];
--    char stringpool_str128[sizeof("ISO_8859-16:2001")];
--    char stringpool_str130[sizeof("ISO8859-5")];
--    char stringpool_str131[sizeof("ISO-8859-4")];
--    char stringpool_str132[sizeof("ISO_8859-4")];
--    char stringpool_str133[sizeof("ISO8859-14")];
--    char stringpool_str134[sizeof("ISO-IR-101")];
--    char stringpool_str135[sizeof("ISO-8859-5")];
--    char stringpool_str136[sizeof("ISO_8859-5")];
--    char stringpool_str137[sizeof("ISO8859-15")];
--    char stringpool_str138[sizeof("ISO-8859-14")];
--    char stringpool_str139[sizeof("ISO_8859-14")];
--    char stringpool_str140[sizeof("ISO8859-8")];
--    char stringpool_str142[sizeof("ISO-8859-15")];
--    char stringpool_str143[sizeof("ISO_8859-15")];
--    char stringpool_str144[sizeof("ISO8859-9")];
--    char stringpool_str145[sizeof("ISO-8859-8")];
--    char stringpool_str146[sizeof("ISO_8859-8")];
--    char stringpool_str147[sizeof("CP866")];
--    char stringpool_str148[sizeof("ISO-IR-138")];
--    char stringpool_str149[sizeof("ISO-8859-9")];
--    char stringpool_str150[sizeof("ISO_8859-9")];
--    char stringpool_str151[sizeof("ISO_8859-14:1998")];
--    char stringpool_str153[sizeof("ISO_8859-15:1998")];
--    char stringpool_str155[sizeof("ELOT_928")];
--    char stringpool_str156[sizeof("TCVN")];
--    char stringpool_str157[sizeof("C99")];
--    char stringpool_str158[sizeof("ISO8859-2")];
--    char stringpool_str162[sizeof("CP154")];
--    char stringpool_str163[sizeof("ISO-8859-2")];
--    char stringpool_str164[sizeof("ISO_8859-2")];
--    char stringpool_str166[sizeof("ISO-IR-109")];
--    char stringpool_str168[sizeof("L10")];
--    char stringpool_str169[sizeof("CHAR")];
--    char stringpool_str174[sizeof("CP1256")];
--    char stringpool_str175[sizeof("ISO-IR-179")];
--    char stringpool_str176[sizeof("ISO646-CN")];
--    char stringpool_str177[sizeof("ASCII")];
--    char stringpool_str178[sizeof("CP1251")];
--    char stringpool_str179[sizeof("LATIN3")];
--    char stringpool_str181[sizeof("850")];
--    char stringpool_str183[sizeof("GB2312")];
--    char stringpool_str185[sizeof("CP819")];
--    char stringpool_str192[sizeof("CP1254")];
--    char stringpool_str194[sizeof("CP949")];
--    char stringpool_str196[sizeof("CP1255")];
--    char stringpool_str197[sizeof("CP862")];
--    char stringpool_str198[sizeof("US")];
--    char stringpool_str203[sizeof("CP1361")];
--    char stringpool_str206[sizeof("CP1258")];
--    char stringpool_str207[sizeof("ISO-IR-110")];
--    char stringpool_str209[sizeof("IBM866")];
--    char stringpool_str210[sizeof("CP936")];
--    char stringpool_str211[sizeof("GEORGIAN-PS")];
--    char stringpool_str214[sizeof("LATIN10")];
--    char stringpool_str222[sizeof("CHINESE")];
--    char stringpool_str224[sizeof("CP1252")];
--    char stringpool_str225[sizeof("LATIN7")];
--    char stringpool_str226[sizeof("ISO_8859-10:1992")];
--    char stringpool_str227[sizeof("ISO-IR-57")];
--    char stringpool_str228[sizeof("TIS620")];
--    char stringpool_str230[sizeof("ISO8859-3")];
--    char stringpool_str231[sizeof("UCS-4")];
--    char stringpool_str232[sizeof("ISO-IR-87")];
--    char stringpool_str233[sizeof("TIS-620")];
--    char stringpool_str234[sizeof("ISO-IR-157")];
--    char stringpool_str235[sizeof("ISO-8859-3")];
--    char stringpool_str236[sizeof("ISO_8859-3")];
--    char stringpool_str237[sizeof("ISO8859-13")];
--    char stringpool_str240[sizeof("CSISOLATIN6")];
--    char stringpool_str241[sizeof("BIG5")];
--    char stringpool_str242[sizeof("ISO-8859-13")];
--    char stringpool_str243[sizeof("ISO_8859-13")];
--    char stringpool_str244[sizeof("CSISOLATIN1")];
--    char stringpool_str245[sizeof("KOI8-R")];
--    char stringpool_str246[sizeof("BIG-5")];
--    char stringpool_str247[sizeof("IBM819")];
--    char stringpool_str248[sizeof("ISO-IR-127")];
--    char stringpool_str249[sizeof("CP874")];
--    char stringpool_str251[sizeof("ISO646-US")];
--    char stringpool_str252[sizeof("VISCII")];
--    char stringpool_str253[sizeof("MS-EE")];
--    char stringpool_str256[sizeof("MS-ANSI")];
--    char stringpool_str258[sizeof("CSISOLATIN4")];
--    char stringpool_str259[sizeof("IBM862")];
--    char stringpool_str260[sizeof("CP932")];
--    char stringpool_str261[sizeof("X0212")];
--    char stringpool_str262[sizeof("CSISOLATIN5")];
--    char stringpool_str263[sizeof("UCS-2")];
--    char stringpool_str265[sizeof("ISO8859-10")];
--    char stringpool_str266[sizeof("MS936")];
--    char stringpool_str267[sizeof("WCHAR_T")];
--    char stringpool_str270[sizeof("ISO-8859-10")];
--    char stringpool_str271[sizeof("ISO_8859-10")];
--    char stringpool_str272[sizeof("UTF-16")];
--    char stringpool_str273[sizeof("EUCCN")];
--    char stringpool_str274[sizeof("ROMAN8")];
--    char stringpool_str275[sizeof("ISO-IR-203")];
--    char stringpool_str276[sizeof("ISO8859-7")];
--    char stringpool_str277[sizeof("KOI8-T")];
--    char stringpool_str278[sizeof("EUC-CN")];
--    char stringpool_str279[sizeof("UCS-4LE")];
--    char stringpool_str280[sizeof("ISO-IR-100")];
--    char stringpool_str281[sizeof("ISO-8859-7")];
--    char stringpool_str282[sizeof("ISO_8859-7")];
--    char stringpool_str283[sizeof("MULELAO-1")];
--    char stringpool_str284[sizeof("GB_1988-80")];
--    char stringpool_str288[sizeof("X0201")];
--    char stringpool_str289[sizeof("ECMA-114")];
--    char stringpool_str290[sizeof("CSISOLATIN2")];
--    char stringpool_str291[sizeof("GEORGIAN-ACADEMY")];
--    char stringpool_str292[sizeof("PTCP154")];
--    char stringpool_str295[sizeof("UCS-2LE")];
--    char stringpool_str296[sizeof("CP1253")];
--    char stringpool_str297[sizeof("UTF-8")];
--    char stringpool_str298[sizeof("HP-ROMAN8")];
--    char stringpool_str300[sizeof("CSASCII")];
--    char stringpool_str303[sizeof("ECMA-118")];
--    char stringpool_str304[sizeof("UCS-4-INTERNAL")];
--    char stringpool_str305[sizeof("TCVN5712-1")];
--    char stringpool_str307[sizeof("KOREAN")];
--    char stringpool_str308[sizeof("CP850")];
--    char stringpool_str309[sizeof("MS-CYRL")];
--    char stringpool_str310[sizeof("CP950")];
--    char stringpool_str313[sizeof("TIS620-0")];
--    char stringpool_str316[sizeof("X0208")];
--    char stringpool_str319[sizeof("GREEK8")];
--    char stringpool_str320[sizeof("UCS-2-INTERNAL")];
--    char stringpool_str321[sizeof("TCVN-5712")];
--    char stringpool_str323[sizeof("CP1133")];
--    char stringpool_str324[sizeof("CP1250")];
--    char stringpool_str327[sizeof("ISO-2022-CN")];
--    char stringpool_str329[sizeof("UTF-16LE")];
--    char stringpool_str335[sizeof("CYRILLIC-ASIAN")];
--    char stringpool_str337[sizeof("ISO-10646-UCS-4")];
--    char stringpool_str340[sizeof("ISO-2022-CN-EXT")];
--    char stringpool_str342[sizeof("CP1257")];
--    char stringpool_str345[sizeof("GB_2312-80")];
--    char stringpool_str347[sizeof("JP")];
--    char stringpool_str351[sizeof("EUCKR")];
--    char stringpool_str353[sizeof("ISO-10646-UCS-2")];
--    char stringpool_str354[sizeof("GB18030")];
--    char stringpool_str356[sizeof("EUC-KR")];
--    char stringpool_str357[sizeof("CSKOI8R")];
--    char stringpool_str358[sizeof("CSBIG5")];
--    char stringpool_str360[sizeof("CP367")];
--    char stringpool_str361[sizeof("MACINTOSH")];
--    char stringpool_str362[sizeof("CSISOLATIN3")];
--    char stringpool_str363[sizeof("CN-BIG5")];
--    char stringpool_str366[sizeof("CYRILLIC")];
--    char stringpool_str369[sizeof("CSVISCII")];
--    char stringpool_str370[sizeof("IBM850")];
--    char stringpool_str372[sizeof("MACTHAI")];
--    char stringpool_str374[sizeof("UNICODE-1-1")];
--    char stringpool_str376[sizeof("ISO_646.IRV:1991")];
--    char stringpool_str380[sizeof("US-ASCII")];
--    char stringpool_str381[sizeof("UTF-32")];
--    char stringpool_str384[sizeof("CN-GB-ISOIR165")];
--    char stringpool_str387[sizeof("NEXTSTEP")];
--    char stringpool_str389[sizeof("MAC")];
--    char stringpool_str393[sizeof("EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE")];
--    char stringpool_str394[sizeof("CSISOLATINARABIC")];
--    char stringpool_str395[sizeof("HZ-GB-2312")];
--    char stringpool_str397[sizeof("ARMSCII-8")];
--    char stringpool_str401[sizeof("CSISOLATINHEBREW")];
--    char stringpool_str405[sizeof("ISO-2022-KR")];
--    char stringpool_str407[sizeof("WINDOWS-1256")];
--    char stringpool_str408[sizeof("UHC")];
--    char stringpool_str409[sizeof("WINDOWS-1251")];
--    char stringpool_str411[sizeof("MS-HEBR")];
--    char stringpool_str412[sizeof("ISO-CELTIC")];
--    char stringpool_str413[sizeof("UTF-32LE")];
--    char stringpool_str416[sizeof("WINDOWS-1254")];
--    char stringpool_str418[sizeof("WINDOWS-1255")];
--    char stringpool_str420[sizeof("SHIFT-JIS")];
--    char stringpool_str421[sizeof("SHIFT_JIS")];
--    char stringpool_str422[sizeof("IBM367")];
--    char stringpool_str423[sizeof("WINDOWS-1258")];
--    char stringpool_str424[sizeof("CSPTCP154")];
--    char stringpool_str426[sizeof("GBK")];
--    char stringpool_str428[sizeof("UNICODELITTLE")];
--    char stringpool_str432[sizeof("WINDOWS-1252")];
--    char stringpool_str433[sizeof("UTF-7")];
--    char stringpool_str435[sizeof("KSC_5601")];
--    char stringpool_str437[sizeof("ASMO-708")];
--    char stringpool_str440[sizeof("CSISO2022CN")];
--    char stringpool_str444[sizeof("BIGFIVE")];
--    char stringpool_str447[sizeof("WINDOWS-936")];
--    char stringpool_str448[sizeof("CSUCS4")];
--    char stringpool_str449[sizeof("BIG-FIVE")];
--    char stringpool_str453[sizeof("ISO646-JP")];
--    char stringpool_str456[sizeof("TIS620.2529-1")];
--    char stringpool_str457[sizeof("CSISOLATINGREEK")];
--    char stringpool_str459[sizeof("CSISOLATINCYRILLIC")];
--    char stringpool_str460[sizeof("UCS-4BE")];
--    char stringpool_str462[sizeof("UNICODE-1-1-UTF-7")];
--    char stringpool_str465[sizeof("EUCTW")];
--    char stringpool_str468[sizeof("WINDOWS-1253")];
--    char stringpool_str469[sizeof("CSHPROMAN8")];
--    char stringpool_str470[sizeof("EUC-TW")];
--    char stringpool_str472[sizeof("KS_C_5601-1989")];
--    char stringpool_str476[sizeof("UCS-2BE")];
--    char stringpool_str479[sizeof("VISCII1.1-1")];
--    char stringpool_str480[sizeof("GREEK")];
--    char stringpool_str482[sizeof("WINDOWS-1250")];
--    char stringpool_str483[sizeof("CSGB2312")];
--    char stringpool_str486[sizeof("WINDOWS-874")];
--    char stringpool_str487[sizeof("CSUNICODE11")];
--    char stringpool_str489[sizeof("JAVA")];
--    char stringpool_str491[sizeof("WINDOWS-1257")];
--    char stringpool_str493[sizeof("CSUNICODE")];
--    char stringpool_str500[sizeof("CSHALFWIDTHKATAKANA")];
--    char stringpool_str502[sizeof("CSISO57GB1988")];
--    char stringpool_str504[sizeof("MACICELAND")];
--    char stringpool_str509[sizeof("CSIBM866")];
--    char stringpool_str510[sizeof("UTF-16BE")];
--    char stringpool_str513[sizeof("ARABIC")];
--    char stringpool_str514[sizeof("CN-GB")];
--    char stringpool_str518[sizeof("CSISO2022KR")];
--    char stringpool_str520[sizeof("CSMACINTOSH")];
--    char stringpool_str526[sizeof("JIS0208")];
--    char stringpool_str528[sizeof("MACROMAN")];
--    char stringpool_str530[sizeof("ISO_8859-4:1988")];
--    char stringpool_str532[sizeof("ISO_8859-5:1988")];
--    char stringpool_str535[sizeof("TIS620.2533-1")];
--    char stringpool_str536[sizeof("ANSI_X3.4-1986")];
--    char stringpool_str537[sizeof("ISO_8859-8:1988")];
--    char stringpool_str538[sizeof("KS_C_5601-1987")];
--    char stringpool_str539[sizeof("CSSHIFTJIS")];
--    char stringpool_str540[sizeof("HEBREW")];
--    char stringpool_str541[sizeof("ISO_8859-9:1989")];
--    char stringpool_str547[sizeof("MACCROATIAN")];
--    char stringpool_str548[sizeof("ISO-2022-JP-1")];
--    char stringpool_str550[sizeof("EUCJP")];
--    char stringpool_str552[sizeof("ANSI_X3.4-1968")];
--    char stringpool_str555[sizeof("EUC-JP")];
--    char stringpool_str561[sizeof("CSISO58GB231280")];
--    char stringpool_str562[sizeof("JIS_C6226-1983")];
--    char stringpool_str566[sizeof("IBM-CP1133")];
--    char stringpool_str569[sizeof("MACCENTRALEUROPE")];
--    char stringpool_str570[sizeof("CSISO159JISX02121990")];
--    char stringpool_str571[sizeof("ISO-2022-JP-2")];
--    char stringpool_str573[sizeof("CSUNICODE11UTF7")];
--    char stringpool_str574[sizeof("UCS-4-SWAPPED")];
--    char stringpool_str578[sizeof("UNICODEBIG")];
--    char stringpool_str579[sizeof("CSISO14JISC6220RO")];
--    char stringpool_str580[sizeof("JIS_C6220-1969-RO")];
--    char stringpool_str582[sizeof("ISO_8859-3:1988")];
--    char stringpool_str586[sizeof("CSPC862LATINHEBREW")];
--    char stringpool_str588[sizeof("BIG5HKSCS")];
--    char stringpool_str589[sizeof("ISO_8859-6:1987")];
--    char stringpool_str590[sizeof("UCS-2-SWAPPED")];
--    char stringpool_str591[sizeof("ISO_8859-1:1987")];
--    char stringpool_str593[sizeof("BIG5-HKSCS")];
--    char stringpool_str594[sizeof("UTF-32BE")];
--    char stringpool_str604[sizeof("ISO-2022-JP")];
--    char stringpool_str607[sizeof("KOI8-U")];
--    char stringpool_str608[sizeof("TIS620.2533-0")];
--    char stringpool_str612[sizeof("KOI8-RU")];
--    char stringpool_str614[sizeof("ISO_8859-2:1987")];
--    char stringpool_str618[sizeof("MACROMANIA")];
--    char stringpool_str641[sizeof("JIS_X0212")];
--    char stringpool_str648[sizeof("CSEUCKR")];
--    char stringpool_str649[sizeof("MACCYRILLIC")];
--    char stringpool_str650[sizeof("ISO_8859-7:2003")];
--    char stringpool_str651[sizeof("MS-ARAB")];
--    char stringpool_str657[sizeof("MS-GREEK")];
--    char stringpool_str666[sizeof("CSKSC56011987")];
--    char stringpool_str668[sizeof("JIS_X0201")];
--    char stringpool_str673[sizeof("ISO_8859-7:1987")];
--    char stringpool_str683[sizeof("CSISO2022JP2")];
--    char stringpool_str696[sizeof("JIS_X0208")];
--    char stringpool_str697[sizeof("JISX0201-1976")];
--    char stringpool_str706[sizeof("JIS_X0212-1990")];
--    char stringpool_str717[sizeof("CSISO2022JP")];
--    char stringpool_str721[sizeof("JOHAB")];
--    char stringpool_str730[sizeof("MS_KANJI")];
--    char stringpool_str734[sizeof("CSISO87JISX0208")];
--    char stringpool_str737[sizeof("MACTURKISH")];
--    char stringpool_str755[sizeof("TCVN5712-1:1993")];
--    char stringpool_str756[sizeof("JIS_X0208-1983")];
--    char stringpool_str762[sizeof("CSEUCTW")];
--    char stringpool_str763[sizeof("MACGREEK")];
--    char stringpool_str770[sizeof("JIS_X0208-1990")];
--    char stringpool_str776[sizeof("WINBALTRIM")];
--    char stringpool_str790[sizeof("MS-TURK")];
--    char stringpool_str792[sizeof("MACUKRAINE")];
--    char stringpool_str796[sizeof("MACARABIC")];
--    char stringpool_str802[sizeof("CSPC850MULTILINGUAL")];
--    char stringpool_str845[sizeof("MACHEBREW")];
--    char stringpool_str903[sizeof("JIS_X0212.1990-0")];
--    char stringpool_str979[sizeof("BIG5-HKSCS:2001")];
--    char stringpool_str986[sizeof("BIG5-HKSCS:2004")];
--    char stringpool_str995[sizeof("BIG5-HKSCS:1999")];
--    char stringpool_str997[sizeof("CSEUCPKDFMTJAPANESE")];
-+    char stringpool_str4[sizeof("L2")];
-+    char stringpool_str5[sizeof("L1")];
-+    char stringpool_str11[sizeof("MS-EE")];
-+    char stringpool_str12[sizeof("CP819")];
-+    char stringpool_str15[sizeof("UCS-2")];
-+    char stringpool_str16[sizeof("IBM819")];
-+    char stringpool_str17[sizeof("UTF-8")];
-+    char stringpool_str18[sizeof("UTF-32")];
-+    char stringpool_str19[sizeof("UTF-16")];
-+    char stringpool_str21[sizeof("CP367")];
-+    char stringpool_str22[sizeof("ISO8859-2")];
-+    char stringpool_str23[sizeof("ISO8859-1")];
-+    char stringpool_str24[sizeof("IBM367")];
-+    char stringpool_str25[sizeof("UTF-7")];
-+    char stringpool_str26[sizeof("CHAR")];
-+    char stringpool_str27[sizeof("ISO8859-15")];
-+    char stringpool_str28[sizeof("US")];
-+    char stringpool_str29[sizeof("ISO-8859-2")];
-+    char stringpool_str31[sizeof("ISO-8859-1")];
-+    char stringpool_str32[sizeof("ISO-8859-15")];
-+    char stringpool_str33[sizeof("ISO_8859-2")];
-+    char stringpool_str35[sizeof("ISO_8859-1")];
-+    char stringpool_str36[sizeof("ISO_8859-15")];
-+    char stringpool_str37[sizeof("KOI8-R")];
-+    char stringpool_str38[sizeof("UCS-2LE")];
-+    char stringpool_str39[sizeof("UTF-32LE")];
-+    char stringpool_str40[sizeof("UTF-16LE")];
-+    char stringpool_str41[sizeof("ISO_8859-15:1998")];
-+    char stringpool_str43[sizeof("ISO_8859-2:1987")];
-+    char stringpool_str44[sizeof("ISO_8859-1:1987")];
-+    char stringpool_str45[sizeof("UCS-4")];
-+    char stringpool_str47[sizeof("UNICODE-1-1")];
-+    char stringpool_str48[sizeof("ISO-IR-6")];
-+    char stringpool_str49[sizeof("CSKOI8R")];
-+    char stringpool_str50[sizeof("ASCII")];
-+    char stringpool_str51[sizeof("UNICODEBIG")];
-+    char stringpool_str52[sizeof("ISO-IR-203")];
-+    char stringpool_str53[sizeof("UCS-4LE")];
-+    char stringpool_str54[sizeof("ISO-IR-101")];
-+    char stringpool_str55[sizeof("CP1250")];
-+    char stringpool_str56[sizeof("ISO-10646-UCS-2")];
-+    char stringpool_str57[sizeof("UNICODE-1-1-UTF-7")];
-+    char stringpool_str58[sizeof("LATIN2")];
-+    char stringpool_str59[sizeof("UNICODELITTLE")];
-+    char stringpool_str60[sizeof("LATIN1")];
-+    char stringpool_str61[sizeof("ISO_646.IRV:1991")];
-+    char stringpool_str62[sizeof("ISO646-US")];
-+    char stringpool_str63[sizeof("CSUNICODE")];
-+    char stringpool_str64[sizeof("UCS-2-INTERNAL")];
-+    char stringpool_str65[sizeof("LATIN-9")];
-+    char stringpool_str66[sizeof("WCHAR_T")];
-+    char stringpool_str68[sizeof("CSUCS4")];
-+    char stringpool_str69[sizeof("CSUNICODE11")];
-+    char stringpool_str70[sizeof("US-ASCII")];
-+    char stringpool_str71[sizeof("ISO-10646-UCS-4")];
-+    char stringpool_str72[sizeof("UCS-2BE")];
-+    char stringpool_str73[sizeof("UTF-32BE")];
-+    char stringpool_str74[sizeof("UTF-16BE")];
-+    char stringpool_str75[sizeof("ANSI_X3.4-1986")];
-+    char stringpool_str76[sizeof("ANSI_X3.4-1968")];
-+    char stringpool_str77[sizeof("CSUNICODE11UTF7")];
-+    char stringpool_str78[sizeof("UCS-2-SWAPPED")];
-+    char stringpool_str79[sizeof("UCS-4-INTERNAL")];
-+    char stringpool_str80[sizeof("CSASCII")];
-+    char stringpool_str87[sizeof("UCS-4BE")];
-+    char stringpool_str88[sizeof("WINDOWS-1250")];
-+    char stringpool_str92[sizeof("ISO-IR-100")];
-+    char stringpool_str93[sizeof("UCS-4-SWAPPED")];
-+    char stringpool_str97[sizeof("CSISOLATIN2")];
-+    char stringpool_str98[sizeof("CSISOLATIN1")];
-   };
- static const struct stringpool_t stringpool_contents =
-   {
--    "L6",
--    "L1",
--    "HZ",
--    "L4",
--    "L5",
--    "R8",
--    "L8",
--    "866",
-     "L2",
--    "SJIS",
--    "ISO-IR-6",
--    "ISO-IR-166",
--    "LATIN6",
--    "LATIN1",
--    "ISO-IR-14",
--    "L3",
--    "LATIN4",
--    "ISO-IR-165",
--    "LATIN5",
--    "ISO-IR-126",
--    "862",
--    "ISO-IR-144",
--    "LATIN8",
--    "ISO-IR-58",
--    "ISO-IR-148",
--    "L7",
--    "LATIN-9",
--    "ISO-IR-149",
--    "ISO-IR-159",
--    "ISO-IR-226",
--    "LATIN2",
--    "ISO8859-6",
--    "ISO-IR-199",
-+    "L1",
-+    "MS-EE",
-+    "CP819",
-+    "UCS-2",
-+    "IBM819",
-+    "UTF-8",
-+    "UTF-32",
-+    "UTF-16",
-+    "CP367",
-+    "ISO8859-2",
-     "ISO8859-1",
--    "ISO-8859-6",
--    "ISO_8859-6",
--    "ISO8859-16",
--    "PT154",
--    "ISO-8859-1",
--    "ISO_8859-1",
--    "ISO8859-11",
--    "ISO-8859-16",
--    "ISO_8859-16",
--    "CN",
--    "ISO-8859-11",
--    "ISO_8859-11",
--    "ISO8859-4",
--    "ISO_8859-16:2001",
--    "ISO8859-5",
--    "ISO-8859-4",
--    "ISO_8859-4",
--    "ISO8859-14",
--    "ISO-IR-101",
--    "ISO-8859-5",
--    "ISO_8859-5",
-+    "IBM367",
-+    "UTF-7",
-+    "CHAR",
-     "ISO8859-15",
--    "ISO-8859-14",
--    "ISO_8859-14",
--    "ISO8859-8",
-+    "US",
-+    "ISO-8859-2",
-+    "ISO-8859-1",
-     "ISO-8859-15",
-+    "ISO_8859-2",
-+    "ISO_8859-1",
-     "ISO_8859-15",
--    "ISO8859-9",
--    "ISO-8859-8",
--    "ISO_8859-8",