From 154488fd1b3c9388b0d0ce4039a5a4fd2ee0f539 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 10 Jan 2022 02:43:15 -0500 Subject: cygwin-libiconv 1.16 --- .gitignore | 2 +- cygwin-libiconv.spec | 33 +-- libiconv-1.14-aliases.patch | 499 ------------------------------------------ libiconv-1.14-reloc.patch | 269 ----------------------- libiconv-1.14-wchar.patch | 103 --------- libiconv-1.16-aliases.patch | 522 ++++++++++++++++++++++++++++++++++++++++++++ libiconv-1.16-wchar.patch | 92 ++++++++ sources | 1 - 8 files changed, 633 insertions(+), 888 deletions(-) delete mode 100644 libiconv-1.14-aliases.patch delete mode 100644 libiconv-1.14-reloc.patch delete mode 100644 libiconv-1.14-wchar.patch create mode 100644 libiconv-1.16-aliases.patch create mode 100644 libiconv-1.16-wchar.patch delete mode 100644 sources diff --git a/.gitignore b/.gitignore index b18b7e7..db08351 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libiconv-1.14.tar.gz +/libiconv-*.tar.gz diff --git a/cygwin-libiconv.spec b/cygwin-libiconv.spec index 402c89a..9d1fb03 100644 --- a/cygwin-libiconv.spec +++ b/cygwin-libiconv.spec @@ -1,8 +1,8 @@ %{?cygwin_package_header} Name: cygwin-libiconv -Version: 1.14 -Release: 6%{?dist} +Version: 1.16 +Release: 1%{?dist} Summary: GNU libraries and utilities for character set conversion License: GPLv2+ and LGPLv2+ @@ -11,9 +11,8 @@ URL: http://www.gnu.org/software/libiconv/ BuildArch: noarch Source0: http://ftp.gnu.org/pub/gnu/libiconv/libiconv-%{version}.tar.gz -Patch0: libiconv-1.14-wchar.patch -Patch1: libiconv-1.14-reloc.patch -Patch2: libiconv-1.14-aliases.patch +Patch0: libiconv-1.16-wchar.patch +Patch1: libiconv-1.16-aliases.patch BuildRequires: cygwin32-filesystem BuildRequires: cygwin32-gcc @@ -25,7 +24,11 @@ BuildRequires: cygwin64-gcc BuildRequires: cygwin64-binutils BuildRequires: cygwin64 -BuildRequires: autoconf, automake, cygwin-libtool-base, gettext-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: cygwin-libtool-base +BuildRequires: gettext-devel +BuildRequires: make # There's a quasi-circular dependency between cygwin-libiconv and # cygwin-gettext. If gettext is installed when you build this then @@ -71,12 +74,9 @@ Static version of Iconv library for Cygwin x86_64 toolchain. %prep -%setup -q -n libiconv-%{version} -rm -f m4/libtool.m4 m4/lt*.m4 -%patch0 -p2 -%patch1 -p2 -%patch2 -p2 -%cygwin_autoreconf -I `pwd`/m4 -I `pwd`/srcm4 +%autosetup -p1 -n libiconv-%{version} +rm -f m4/{libtool,lt*}.m4 libcharset/m4/{libtool,lt*}.m4 +%cygwin_autoreconf -I `pwd`/m4 -I `pwd`/srcm4 -I `pwd`/libcharset/m4 %build @@ -88,13 +88,13 @@ rm -f m4/libtool.m4 m4/lt*.m4 %install -%cygwin_make install DESTDIR=$RPM_BUILD_ROOT +%cygwin_make_install # Remove documentation which duplicates what is already in # Fedora native packages. -rm -rf $RPM_BUILD_ROOT%{cygwin32_docdir}/libiconv/ +rm -rf $RPM_BUILD_ROOT%{cygwin32_docdir} rm -rf $RPM_BUILD_ROOT%{cygwin32_mandir} -rm -rf $RPM_BUILD_ROOT%{cygwin64_docdir}/libiconv/ +rm -rf $RPM_BUILD_ROOT%{cygwin64_docdir} rm -rf $RPM_BUILD_ROOT%{cygwin64_mandir} # If cygwin-gettext was installed during the build, remove the *.mo @@ -142,6 +142,9 @@ rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/charset.alias %changelog +* Mon Jan 10 2022 Yaakov Selkowitz - 1.16-1 +- new version + * Tue Dec 05 2017 Yaakov Selkowitz - 1.14-6 - Add aliases patch diff --git a/libiconv-1.14-aliases.patch b/libiconv-1.14-aliases.patch deleted file mode 100644 index 382ff22..0000000 --- a/libiconv-1.14-aliases.patch +++ /dev/null @@ -1,499 +0,0 @@ ---- origsrc/libiconv-1.14/lib/encodings.def 2010-11-23 20:24:03.000000000 -0600 -+++ src/libiconv-1.14/lib/encodings.def 2015-03-11 16:36:16.892417700 -0500 -@@ -47,7 +47,7 @@ DEFENCODING(( "US-ASCII", - "IBM367", /* IANA */ - "US", /* IANA */ - "csASCII", /* IANA */ -- /*"ISO646.1991-IRV", X11R6.4 */ -+ "ISO646.1991-IRV", /* X11R6.4 */ - ), - ascii, - { ascii_mbtowc, NULL }, { ascii_wctomb, NULL }) -@@ -59,17 +59,14 @@ DEFALIAS( "646", - /* General multi-byte encodings */ - - DEFENCODING(( "UTF-8", /* IANA, RFC 2279 */ -- /*"UTF8", JDK 1.1 */ -- /*"CP65001", Windows */ -+ "UTF8", /* JDK 1.1 */ -+ "CP65001", /* Windows */ - ), - utf8, - { utf8_mbtowc, NULL }, { utf8_wctomb, NULL }) --#ifdef USE_HPUX_ALIASES --DEFALIAS( "UTF8", /* HP-UX */ -- utf8) --#endif - - DEFENCODING(( "UCS-2", /* glibc */ -+ "UCS2", /* glibc */ - "ISO-10646-UCS-2", /* IANA */ - "csUnicode", /* IANA */ - ), -@@ -77,22 +74,25 @@ DEFENCODING(( "UCS-2", - { ucs2_mbtowc, NULL }, { ucs2_wctomb, NULL }) - - DEFENCODING(( "UCS-2BE", /* glibc */ -+ "UCS2BE", /* glibc */ - "UNICODEBIG", /* glibc */ - "UNICODE-1-1", /* IANA */ - "csUnicode11", /* IANA */ -- /*"CP1201", Windows */ -+ "CP1201", /* Windows */ - ), - ucs2be, - { ucs2be_mbtowc, NULL }, { ucs2be_wctomb, NULL }) - - DEFENCODING(( "UCS-2LE", /* glibc */ -+ "UCS2LE", /* glibc */ - "UNICODELITTLE", /* glibc */ -- /*"CP1200", Windows */ -+ "CP1200", /* Windows */ - ), - ucs2le, - { ucs2le_mbtowc, NULL }, { ucs2le_wctomb, NULL }) - - DEFENCODING(( "UCS-4", /* glibc */ -+ "UCS4", /* glibc */ - "ISO-10646-UCS-4", /* IANA */ - "csUCS4", /* IANA */ - ), -@@ -100,43 +100,52 @@ DEFENCODING(( "UCS-4", - { ucs4_mbtowc, NULL }, { ucs4_wctomb, NULL }) - - DEFENCODING(( "UCS-4BE", /* glibc */ -- /*"CP12001", Windows */ -+ "UCS4BE", /* glibc */ -+ "CP12001", /* Windows */ - ), - ucs4be, - { ucs4be_mbtowc, NULL }, { ucs4be_wctomb, NULL }) - - DEFENCODING(( "UCS-4LE", /* glibc */ -- /*"CP12000", Windows */ -+ "UCS4LE", /* glibc */ -+ "CP12000", /* Windows */ - ), - ucs4le, - { ucs4le_mbtowc, NULL }, { ucs4le_wctomb, NULL }) - - DEFENCODING(( "UTF-16", /* IANA, RFC 2781 */ -+ "UTF16", /* glibc */ - ), - utf16, - { utf16_mbtowc, NULL }, { utf16_wctomb, NULL }) - - DEFENCODING(( "UTF-16BE", /* IANA, RFC 2781 */ -+ "UTF16BE", /* glibc */ - ), - utf16be, - { utf16be_mbtowc, NULL }, { utf16be_wctomb, NULL }) - - DEFENCODING(( "UTF-16LE", /* IANA, RFC 2781 */ -+ "UTF16LE", /* glibc */ -+ "UNICODEFFFE", /* glibc */ - ), - utf16le, - { utf16le_mbtowc, NULL }, { utf16le_wctomb, NULL }) - - DEFENCODING(( "UTF-32", /* IANA, Unicode 3.1 */ -+ "UTF32", /* glibc */ - ), - utf32, - { utf32_mbtowc, NULL }, { utf32_wctomb, NULL }) - - DEFENCODING(( "UTF-32BE", /* IANA, Unicode 3.1 */ -+ "UTF32BE", /* glibc */ - ), - utf32be, - { utf32be_mbtowc, NULL }, { utf32be_wctomb, NULL }) - - DEFENCODING(( "UTF-32LE", /* IANA, Unicode 3.1 */ -+ "UTF32LE", /* glibc */ - ), - utf32le, - { utf32le_mbtowc, NULL }, { utf32le_wctomb, NULL }) -@@ -144,7 +153,7 @@ DEFENCODING(( "UTF-32LE", - DEFENCODING(( "UTF-7", /* IANA, RFC 2152 */ - "UNICODE-1-1-UTF-7", /* IANA, RFC 1642 */ - "csUnicode11UTF7", /* IANA */ -- /*"CP65000", Windows */ -+ "CP65000", /* Windows */ - ), - utf7, - { utf7_mbtowc, NULL }, { utf7_wctomb, utf7_reset }) -@@ -191,8 +200,8 @@ DEFENCODING(( "ISO-8859-1", - "L1", /* IANA */ - "csISOLatin1", /* IANA */ - "ISO8859-1", /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */ -- /*"ISO8859_1", JDK 1.1 */ -- /*"CP28591", Windows */ -+ "ISO8859_1", /* JDK 1.1 */ -+ "CP28591", /* Windows */ - ), - iso8859_1, - { iso8859_1_mbtowc, NULL }, { iso8859_1_wctomb, NULL }) -@@ -209,8 +218,8 @@ DEFENCODING(( "ISO-8859-2", - "L2", /* IANA */ - "csISOLatin2", /* IANA */ - "ISO8859-2", /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */ -- /*"ISO8859_2", JDK 1.1 */ -- /*"CP28592", Windows */ -+ "ISO8859_2", /* JDK 1.1 */ -+ "CP28592", /* Windows */ - ), - iso8859_2, - { iso8859_2_mbtowc, NULL }, { iso8859_2_wctomb, NULL }) -@@ -227,8 +236,8 @@ DEFENCODING(( "ISO-8859-3", - "L3", /* IANA */ - "csISOLatin3", /* IANA */ - "ISO8859-3", /* X11R6.4, glibc, FreeBSD, Solaris */ -- /*"ISO8859_3", JDK 1.1 */ -- /*"CP28593", Windows */ -+ "ISO8859_3", /* JDK 1.1 */ -+ "CP28593", /* Windows */ - ), - iso8859_3, - { iso8859_3_mbtowc, NULL }, { iso8859_3_wctomb, NULL }) -@@ -241,8 +250,8 @@ DEFENCODING(( "ISO-8859-4", - "L4", /* IANA */ - "csISOLatin4", /* IANA */ - "ISO8859-4", /* X11R6.4, glibc, FreeBSD, OSF/1, Solaris */ -- /*"ISO8859_4", JDK 1.1 */ -- /*"CP28594", Windows */ -+ "ISO8859_4", /* JDK 1.1 */ -+ "CP28594", /* Windows */ - ), - iso8859_4, - { iso8859_4_mbtowc, NULL }, { iso8859_4_wctomb, NULL }) -@@ -254,8 +263,8 @@ DEFENCODING(( "ISO-8859-5", - "CYRILLIC", /* IANA */ - "csISOLatinCyrillic", /* IANA */ - "ISO8859-5", /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */ -- /*"ISO8859_5", JDK 1.1 */ -- /*"CP28595", Windows */ -+ "ISO8859_5", /* JDK 1.1 */ -+ "CP28595", /* Windows */ - ), - iso8859_5, - { iso8859_5_mbtowc, NULL }, { iso8859_5_wctomb, NULL }) -@@ -273,8 +282,8 @@ DEFENCODING(( "ISO-8859-6", - "ARABIC", /* IANA */ - "csISOLatinArabic", /* IANA */ - "ISO8859-6", /* X11R6.4, glibc, FreeBSD, AIX, Solaris */ -- /*"ISO8859_6", JDK 1.1 */ -- /*"CP28596", Windows */ -+ "ISO8859_6", /* JDK 1.1 */ -+ "CP28596", /* Windows */ - ), - iso8859_6, - { iso8859_6_mbtowc, NULL }, { iso8859_6_wctomb, NULL }) -@@ -294,8 +303,8 @@ DEFENCODING(( "ISO-8859-7", - "GREEK", /* IANA */ - "csISOLatinGreek", /* IANA */ - "ISO8859-7", /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */ -- /*"ISO8859_7", JDK 1.1 */ -- /*"CP28597", Windows */ -+ "ISO8859_7", /* JDK 1.1 */ -+ "CP28597", /* Windows */ - ), - iso8859_7, - { iso8859_7_mbtowc, NULL }, { iso8859_7_wctomb, NULL }) -@@ -311,9 +320,9 @@ DEFENCODING(( "ISO-8859-8", - "HEBREW", /* IANA */ - "csISOLatinHebrew", /* IANA */ - "ISO8859-8", /* X11R6.4, glibc, FreeBSD, AIX, OSF/1, Solaris */ -- /*"ISO8859_8", JDK 1.1 */ -- /*"CP28598", Windows */ -- /*"CP38598", Windows */ -+ "ISO8859_8", /* JDK 1.1 */ -+ "CP28598", /* Windows */ -+ "CP38598", /* Windows */ - ), - iso8859_8, - { iso8859_8_mbtowc, NULL }, { iso8859_8_wctomb, NULL }) -@@ -330,8 +339,8 @@ DEFENCODING(( "ISO-8859-9", - "L5", /* IANA */ - "csISOLatin5", /* IANA */ - "ISO8859-9", /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */ -- /*"ISO8859_9", JDK 1.1 */ -- /*"CP28599", Windows */ -+ "ISO8859_9", /* JDK 1.1 */ -+ "CP28599", /* Windows */ - ), - iso8859_9, - { iso8859_9_mbtowc, NULL }, { iso8859_9_wctomb, NULL }) -@@ -365,6 +374,7 @@ DEFENCODING(( "ISO-8859-13", - "LATIN7", /* glibc */ - "L7", /* glibc */ - "ISO8859-13", /* glibc, FreeBSD */ -+ "CP28603", /* Windows */ - ), - iso8859_13, - { iso8859_13_mbtowc, NULL }, { iso8859_13_wctomb, NULL }) -@@ -391,7 +401,7 @@ DEFENCODING(( "ISO-8859-15", - "ISO-IR-203", - "LATIN-9", /* IANA */ - "ISO8859-15", /* glibc, FreeBSD, AIX, OSF/1, Solaris */ -- /*"CP28605", Windows */ -+ "CP28605", /* Windows */ - ), - iso8859_15, - { iso8859_15_mbtowc, NULL }, { iso8859_15_wctomb, NULL }) -@@ -413,7 +423,7 @@ DEFENCODING(( "ISO-8859-16", - - DEFENCODING(( "KOI8-R", /* IANA, RFC 1489, X11R6.4, JDK 1.1 */ - "csKOI8R", /* IANA */ -- /*"CP20866", Windows */ -+ "CP20866", /* Windows */ - ), - koi8_r, - { koi8_r_mbtowc, NULL }, { koi8_r_wctomb, NULL }) -@@ -424,6 +434,7 @@ DEFENCODING(( "KOI8-U", - { koi8_u_mbtowc, NULL }, { koi8_u_wctomb, NULL }) - - DEFENCODING(( "KOI8-RU", -+ "CP21866", /* Windows */ - ), - koi8_ru, - { koi8_ru_mbtowc, NULL }, { koi8_ru_wctomb, NULL }) -@@ -547,73 +558,73 @@ DEFENCODING(( "MacRoman", - "MACINTOSH", /* IANA */ - "MAC", /* IANA */ - "csMacintosh", /* IANA */ -- /*"CP10000", Windows */ -+ "CP10000", /* Windows */ - ), - mac_roman, - { mac_roman_mbtowc, NULL }, { mac_roman_wctomb, NULL }) - - DEFENCODING(( "MacCentralEurope", /* JDK 1.1 */ -- /*"CP10029", Windows */ -+ "CP10029", /* Windows */ - ), - mac_centraleurope, - { mac_centraleurope_mbtowc, NULL }, { mac_centraleurope_wctomb, NULL }) - - DEFENCODING(( "MacIceland", /* JDK 1.1 */ -- /*"CP10079", Windows */ -+ "CP10079", /* Windows */ - ), - mac_iceland, - { mac_iceland_mbtowc, NULL }, { mac_iceland_wctomb, NULL }) - - DEFENCODING(( "MacCroatian", /* JDK 1.1 */ -- /*"CP10082", Windows */ -+ "CP10082", /* Windows */ - ), - mac_croatian, - { mac_croatian_mbtowc, NULL }, { mac_croatian_wctomb, NULL }) - - DEFENCODING(( "MacRomania", /* JDK 1.1 */ -- /*"CP10010", Windows */ -+ "CP10010", /* Windows */ - ), - mac_romania, - { mac_romania_mbtowc, NULL }, { mac_romania_wctomb, NULL }) - - DEFENCODING(( "MacCyrillic", /* JDK 1.1 */ -- /*"CP10007", Windows */ -+ "CP10007", /* Windows */ - ), - mac_cyrillic, - { mac_cyrillic_mbtowc, NULL }, { mac_cyrillic_wctomb, NULL }) - - DEFENCODING(( "MacUkraine", /* JDK 1.1 */ -- /*"CP10017", Windows */ -+ "CP10017", /* Windows */ - ), - mac_ukraine, - { mac_ukraine_mbtowc, NULL }, { mac_ukraine_wctomb, NULL }) - - DEFENCODING(( "MacGreek", /* JDK 1.1 */ -- /*"CP10006", Windows */ -+ "CP10006", /* Windows */ - ), - mac_greek, - { mac_greek_mbtowc, NULL }, { mac_greek_wctomb, NULL }) - - DEFENCODING(( "MacTurkish", /* JDK 1.1 */ -- /*"CP10081", Windows */ -+ "CP10081", /* Windows */ - ), - mac_turkish, - { mac_turkish_mbtowc, NULL }, { mac_turkish_wctomb, NULL }) - - DEFENCODING(( "MacHebrew", /* JDK 1.1 */ -- /*"CP10005", Windows */ -+ "CP10005", /* Windows */ - ), - mac_hebrew, - { mac_hebrew_mbtowc, NULL }, { mac_hebrew_wctomb, NULL }) - - DEFENCODING(( "MacArabic", /* JDK 1.1 */ -- /*"CP10004", Windows */ -+ "CP10004", /* Windows */ - ), - mac_arabic, - { mac_arabic_mbtowc, NULL }, { mac_arabic_wctomb, NULL }) - - DEFENCODING(( "MacThai", /* JDK 1.1 */ -- /*"CP10021", Windows */ -+ "CP10021", /* Windows */ - ), - mac_thai, - { mac_thai_mbtowc, NULL }, { mac_thai_wctomb, NULL }) -@@ -738,8 +749,8 @@ DEFENCODING(( "JIS_X0201", - "JISX0201-1976", - "X0201", /* IANA */ - "csHalfWidthKatakana", /* IANA */ -- /*"JISX0201.1976-0", X11R6.4 */ -- /*"JIS0201", JDK 1.1 */ -+ "JISX0201.1976-0", /* X11R6.4 */ -+ "JIS0201", /* JDK 1.1 */ - ), - jisx0201, - { jisx0201_mbtowc, NULL }, { jisx0201_wctomb, NULL }) -@@ -747,14 +758,13 @@ DEFENCODING(( "JIS_X0201", - DEFENCODING(( "JIS_X0208", - "JIS_X0208-1983", /* IANA */ - "JIS_X0208-1990", -- "JIS0208", - "X0208", /* IANA */ - "ISO-IR-87", /* IANA */ - "JIS_C6226-1983", /* IANA */ - "csISO87JISX0208", /* IANA */ -- /*"JISX0208.1983-0", X11R6.4 */ -- /*"JISX0208.1990-0", X11R6.4 */ -- /*"JIS0208", JDK 1.1 */ -+ "JISX0208.1983-0", /* X11R6.4 */ -+ "JISX0208.1990-0", /* X11R6.4 */ -+ "JIS0208", /* JDK 1.1 */ - ), - jisx0208, - { jisx0208_mbtowc, NULL }, { jisx0208_wctomb, NULL }) -@@ -765,8 +775,8 @@ DEFENCODING(( "JIS_X0212", - "X0212", /* IANA */ - "ISO-IR-159", /* IANA */ - "csISO159JISX02121990", /* IANA */ -- /*"JISX0212.1990-0", X11R6.4 */ -- /*"JIS0212", JDK 1.1 */ -+ "JISX0212.1990-0", /* X11R6.4 */ -+ "JIS0212", /* JDK 1.1 */ - ), - jisx0212, - { jisx0212_mbtowc, NULL }, { jisx0212_wctomb, NULL }) -@@ -784,7 +794,7 @@ DEFENCODING(( "GB_2312-80", - "ISO-IR-58", /* IANA */ - "csISO58GB231280", /* IANA */ - "CHINESE", /* IANA */ -- /*"GB2312.1980-0", X11R6.4 */ -+ "GB2312.1980-0", /* X11R6.4 */ - ), - gb2312, - { gb2312_mbtowc, NULL }, { gb2312_wctomb, NULL }) -@@ -801,7 +811,7 @@ DEFENCODING(( "KSC_5601", - "ISO-IR-149", /* IANA */ - "csKSC56011987", /* IANA */ - "KOREAN", /* IANA */ -- /*"KSC5601.1987-0", X11R6.4 */ -+ "KSC5601.1987-0", /* X11R6.4 */ - /*"KSX1001:1992", Ken Lunde */ - ), - ksc5601, -@@ -813,8 +823,8 @@ DEFENCODING(( "EUC-JP", - "EUCJP", /* glibc, HP-UX, IRIX, OSF/1, Solaris */ - "Extended_UNIX_Code_Packed_Format_for_Japanese", /* IANA */ - "csEUCPkdFmtJapanese", /* IANA */ -- /*"EUC_JP", JDK 1.1 */ -- /*"CP51932", Windows */ -+ "EUC_JP", /* JDK 1.1 */ -+ "CP51932", /* Windows */ - ), - euc_jp, - { euc_jp_mbtowc, NULL }, { euc_jp_wctomb, NULL }) -@@ -841,6 +851,7 @@ DEFALIAS( "PCK", - #endif - - DEFENCODING(( "CP932", /* glibc */ -+ "WINDOWS-31J", /* IANA */ - ), - cp932, - { cp932_mbtowc, NULL }, { cp932_wctomb, NULL }) -@@ -851,7 +862,7 @@ DEFALIAS( "IBM-932", - - DEFENCODING(( "ISO-2022-JP", /* IANA, RFC 1468 */ - "csISO2022JP", /* IANA */ -- /*"ISO2022JP", JDK 1.1 */ -+ "ISO2022JP", /* JDK 1.1 */ - ), - iso2022_jp, - { iso2022_jp_mbtowc, NULL }, { iso2022_jp_wctomb, iso2022_jp_reset }) -@@ -872,8 +883,8 @@ DEFENCODING(( "EUC-CN", - "GB2312", /* IANA */ - "CN-GB", /* RFC 1922 */ - "csGB2312", /* IANA */ -- /*"EUC_CN", JDK 1.1 */ -- /*"CP51936", Windows */ -+ "EUC_CN", /* JDK 1.1 */ -+ "CP51936", /* Windows */ - ), - euc_cn, - { euc_cn_mbtowc, NULL }, { euc_cn_wctomb, NULL }) -@@ -903,14 +914,14 @@ DEFENCODING(( "CP936", - { cp936_mbtowc, NULL }, { cp936_wctomb, NULL }) - - DEFENCODING(( "GB18030", /* IANA, glibc */ -- /*"CP54936", Windows */ -+ "CP54936", /* Windows */ - ), - gb18030, - { gb18030_mbtowc, NULL }, { gb18030_wctomb, NULL }) - - DEFENCODING(( "ISO-2022-CN", /* IANA, RFC 1922 */ - "csISO2022CN", -- /*"ISO2022CN", JDK 1.1 */ -+ "ISO2022CN", /* JDK 1.1 */ - ), - iso2022_cn, - { iso2022_cn_mbtowc, NULL }, { iso2022_cn_wctomb, iso2022_cn_reset }) -@@ -922,6 +933,7 @@ DEFENCODING(( "ISO-2022-CN-EXT", - - DEFENCODING(( "HZ", /* RFC 1843 */ - "HZ-GB-2312", /* IANA, RFC 1842 */ -+ "CP52936", /* Windows */ - ), - hz, - { hz_mbtowc, NULL }, { hz_wctomb, hz_reset }) -@@ -929,8 +941,8 @@ DEFENCODING(( "HZ", - DEFENCODING(( "EUC-TW", /* glibc */ - "EUCTW", /* glibc, HP-UX, IRIX, OSF/1 */ - "csEUCTW", -- /*"EUC_TW", JDK 1.1 */ -- /*"CP51950", Windows */ -+ "EUC_TW", /* JDK 1.1 */ -+ "CP51950", /* Windows */ - ), - euc_tw, - { euc_tw_mbtowc, NULL }, { euc_tw_wctomb, NULL }) -@@ -983,8 +995,8 @@ DEFENCODING(( "BIG5-HKSCS", - DEFENCODING(( "EUC-KR", /* IANA, RFC 1557 */ - "EUCKR", /* glibc, HP-UX, IRIX, OSF/1 */ - "csEUCKR", /* IANA */ -- /*"EUC_KR", JDK 1.1 */ -- /*"CP51949", Windows */ -+ "EUC_KR", /* JDK 1.1 */ -+ "CP51949", /* Windows */ - ), - euc_kr, - { euc_kr_mbtowc, NULL }, { euc_kr_wctomb, NULL }) -@@ -1023,7 +1035,8 @@ DEFALIAS( "KO_KR.JOHAP92", - - DEFENCODING(( "ISO-2022-KR", /* IANA, RFC 1557 */ - "csISO2022KR", /* IANA */ -- /*"ISO2022KR", JDK 1.1 */ -+ "ISO2022KR", /* JDK 1.1 */ -+ "CP50225", /* Windows */ - ), - iso2022_kr, - { iso2022_kr_mbtowc, NULL }, { iso2022_kr_wctomb, iso2022_kr_reset }) diff --git a/libiconv-1.14-reloc.patch b/libiconv-1.14-reloc.patch deleted file mode 100644 index e1a1622..0000000 --- a/libiconv-1.14-reloc.patch +++ /dev/null @@ -1,269 +0,0 @@ ---- old/libiconv-1.14/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400 -+++ new/libiconv-1.14/lib/relocatable.c 2011-10-15 03:14:13.195133600 -0400 -@@ -2,20 +2,18 @@ - Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc. - Written by Bruno Haible , 2003. - -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This program is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as published by -+ the Free Software Foundation; either version 2.1 of the License, or -+ (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - - /* Tell glibc's to provide a prototype for getline(). -@@ -87,6 +85,19 @@ - # define FILE_SYSTEM_PREFIX_LEN(P) 0 - #endif - -+/* Whether to enable the more costly support for relocatable libraries. -+ It allows libraries to be have been installed with a different original -+ prefix than the program. But it is quite costly, especially on Cygwin -+ platforms, see below. Therefore we enable it by default only on native -+ Win32 platforms. */ -+#ifndef ENABLE_COSTLY_RELOCATABLE -+# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ -+# define ENABLE_COSTLY_RELOCATABLE 1 -+# else -+# define ENABLE_COSTLY_RELOCATABLE 0 -+# endif -+#endif -+ - /* Original installation prefix. */ - static char *orig_prefix; - static size_t orig_prefix_len; -@@ -156,7 +167,7 @@ - #endif - } - --#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) -+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) - - /* Convenience function: - Computes the current installation prefix, based on the original -@@ -286,7 +297,7 @@ - - #endif /* !IN_LIBRARY || PIC */ - --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - - /* Full pathname of shared library, or NULL. */ - static char *shared_library_fullname; -@@ -332,7 +343,9 @@ - #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ - /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() - function. -- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ -+ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. -+ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on -+ Cygwin 1.7. */ - FILE *fp; - - /* Open the current process' maps file. It describes one VMA per line. */ -@@ -405,7 +418,7 @@ - const char * - relocate (const char *pathname) - { --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - static int initialized; - - /* Initialization code for a shared library. */ ---- old/libiconv-1.14/libcharset/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400 -+++ new/libiconv-1.14/libcharset/lib/relocatable.c 2011-10-15 03:14:27.878133600 -0400 -@@ -2,20 +2,18 @@ - Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc. - Written by Bruno Haible , 2003. - -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This program is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as published by -+ the Free Software Foundation; either version 2.1 of the License, or -+ (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - - /* Tell glibc's to provide a prototype for getline(). -@@ -87,6 +85,19 @@ - # define FILE_SYSTEM_PREFIX_LEN(P) 0 - #endif - -+/* Whether to enable the more costly support for relocatable libraries. -+ It allows libraries to be have been installed with a different original -+ prefix than the program. But it is quite costly, especially on Cygwin -+ platforms, see below. Therefore we enable it by default only on native -+ Win32 platforms. */ -+#ifndef ENABLE_COSTLY_RELOCATABLE -+# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ -+# define ENABLE_COSTLY_RELOCATABLE 1 -+# else -+# define ENABLE_COSTLY_RELOCATABLE 0 -+# endif -+#endif -+ - /* Original installation prefix. */ - static char *orig_prefix; - static size_t orig_prefix_len; -@@ -156,7 +167,7 @@ - #endif - } - --#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) -+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) - - /* Convenience function: - Computes the current installation prefix, based on the original -@@ -286,7 +297,7 @@ - - #endif /* !IN_LIBRARY || PIC */ - --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - - /* Full pathname of shared library, or NULL. */ - static char *shared_library_fullname; -@@ -332,7 +343,9 @@ - #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ - /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() - function. -- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ -+ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. -+ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on -+ Cygwin 1.7. */ - FILE *fp; - - /* Open the current process' maps file. It describes one VMA per line. */ -@@ -405,7 +418,7 @@ - const char * - relocate (const char *pathname) - { --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - static int initialized; - - /* Initialization code for a shared library. */ ---- old/libiconv-1.14/srclib/relocatable.c 2011-08-07 09:42:06.000000000 -0400 -+++ new/libiconv-1.14/srclib/relocatable.c 2011-10-15 03:14:37.739133600 -0400 -@@ -3,16 +3,16 @@ - Written by Bruno Haible , 2003. - - This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -+ it under the terms of the GNU Lesser General Public License as published by -+ the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU General Public License -+ You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - - -@@ -85,6 +85,19 @@ - # define FILE_SYSTEM_PREFIX_LEN(P) 0 - #endif - -+/* Whether to enable the more costly support for relocatable libraries. -+ It allows libraries to be have been installed with a different original -+ prefix than the program. But it is quite costly, especially on Cygwin -+ platforms, see below. Therefore we enable it by default only on native -+ Win32 platforms. */ -+#ifndef ENABLE_COSTLY_RELOCATABLE -+# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ -+# define ENABLE_COSTLY_RELOCATABLE 1 -+# else -+# define ENABLE_COSTLY_RELOCATABLE 0 -+# endif -+#endif -+ - /* Original installation prefix. */ - static char *orig_prefix; - static size_t orig_prefix_len; -@@ -154,7 +167,7 @@ - #endif - } - --#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) -+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) - - /* Convenience function: - Computes the current installation prefix, based on the original -@@ -284,7 +297,7 @@ - - #endif /* !IN_LIBRARY || PIC */ - --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - - /* Full pathname of shared library, or NULL. */ - static char *shared_library_fullname; -@@ -330,7 +343,9 @@ - #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ - /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() - function. -- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ -+ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. -+ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on -+ Cygwin 1.7. */ - FILE *fp; - - /* Open the current process' maps file. It describes one VMA per line. */ -@@ -403,7 +418,7 @@ - const char * - relocate (const char *pathname) - { --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - static int initialized; - - /* Initialization code for a shared library. */ ---- origsrc/libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-07 09:42:12.000000000 -0400 -+++ src/libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-30 02:40:45.597317000 -0400 -@@ -164,6 +164,7 @@ gl_UNISTD_MODULE_INDICATOR([readlink]) - gl_RELOCATABLE([$gl_source_base]) - if test $RELOCATABLE = yes; then - AC_LIBOBJ([progreloc]) -+ AC_LIBOBJ([relocatable]) - fi - gl_FUNC_READLINK_SEPARATE - gl_CANONICALIZE_LGPL_SEPARATE diff --git a/libiconv-1.14-wchar.patch b/libiconv-1.14-wchar.patch deleted file mode 100644 index 77df371..0000000 --- a/libiconv-1.14-wchar.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -urN origsrc//libiconv-1.14/libcharset/lib/localcharset.c src//libiconv-1.14/libcharset/lib/localcharset.c ---- origsrc//libiconv-1.14/libcharset/lib/localcharset.c 2011-02-28 17:43:35.000000000 -0500 -+++ src//libiconv-1.14/libcharset/lib/localcharset.c 2011-08-28 00:16:57.238000000 -0400 -@@ -54,10 +54,6 @@ - # include - # endif - # endif --# ifdef __CYGWIN__ --# define WIN32_LEAN_AND_MEAN --# include --# endif - #elif defined WIN32_NATIVE - # define WIN32_LEAN_AND_MEAN - # include -@@ -124,7 +120,7 @@ - cp = charset_aliases; - if (cp == NULL) - { --#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) -+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE) - const char *dir; - const char *base = "charset.alias"; - char *file_name; -@@ -309,7 +305,7 @@ - "DECKOREAN" "\0" "EUC-KR" "\0"; - # endif - --# if defined WIN32_NATIVE || defined __CYGWIN__ -+# if defined WIN32_NATIVE - /* To avoid the troubles of installing a separate file in the same - directory as the DLL and of retrieving the DLL's directory at - runtime, simply inline the aliases here. */ -@@ -365,64 +361,12 @@ - - # if HAVE_LANGINFO_CODESET - -- /* Most systems support nl_langinfo (CODESET) nowadays. */ -- codeset = nl_langinfo (CODESET); -- --# ifdef __CYGWIN__ -- /* Cygwin < 1.7 does not have locales. nl_langinfo (CODESET) always -- returns "US-ASCII". Return the suffix of the locale name from the -- environment variables (if present) or the codepage as a number. */ -- if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) -- { -- const char *locale; -- static char buf[2 + 10 + 1]; -- -- locale = getenv ("LC_ALL"); -- if (locale == NULL || locale[0] == '\0') -- { -- locale = getenv ("LC_CTYPE"); -- if (locale == NULL || locale[0] == '\0') -- locale = getenv ("LANG"); -- } -- if (locale != NULL && locale[0] != '\0') -- { -- /* If the locale name contains an encoding after the dot, return -- it. */ -- const char *dot = strchr (locale, '.'); -- -- if (dot != NULL) -- { -- const char *modifier; -- -- dot++; -- /* Look for the possible @... trailer and remove it, if any. */ -- modifier = strchr (dot, '@'); -- if (modifier == NULL) -- return dot; -- if (modifier - dot < sizeof (buf)) -- { -- memcpy (buf, dot, modifier - dot); -- buf [modifier - dot] = '\0'; -- return buf; -- } -- } -- } -- -- /* Woe32 has a function returning the locale's codepage as a number: -- GetACP(). This encoding is used by Cygwin, unless the user has set -- the environment variable CYGWIN=codepage:oem (which very few people -- do). -- Output directed to console windows needs to be converted (to -- GetOEMCP() if the console is using a raster font, or to -- GetConsoleOutputCP() if it is using a TrueType font). Cygwin does -- this conversion transparently (see winsup/cygwin/fhandler_console.cc), -- converting to GetConsoleOutputCP(). This leads to correct results, -- except when SetConsoleOutputCP has been called and a raster font is -- in use. */ -- sprintf (buf, "CP%u", GetACP ()); -- codeset = buf; -- } --# endif -+ /* Most systems support nl_langinfo (CODESET) nowadays. -+ POSIX allows that the returned pointer may point to a static area that -+ may be overwritten by subsequent calls to setlocale or nl_langinfo. */ -+ static char codeset_buf[64]; -+ codeset_buf[0] = '\0'; -+ codeset = strncat (codeset_buf, nl_langinfo (CODESET), sizeof (codeset_buf)); - - # else - diff --git a/libiconv-1.16-aliases.patch b/libiconv-1.16-aliases.patch new file mode 100644 index 0000000..17357b2 --- /dev/null +++ b/libiconv-1.16-aliases.patch @@ -0,0 +1,522 @@ +commit 4309f6f45a3b735649f4baa7dad53bd69e9fbefe +Author: Lemures Lemniscati +Date: Sat Jul 11 10:10:24 2020 +0900 + + 1.16-aliases.patch + +diff --git a/lib/encodings.def b/lib/encodings.def +index 402b5e3..3d925e3 100644 +--- a/lib/encodings.def ++++ b/lib/encodings.def +@@ -46,7 +46,7 @@ DEFENCODING(( "US-ASCII", /* IANA */ + "IBM367", /* IANA */ + "US", /* IANA */ + "csASCII", /* IANA */ +- /*"ISO646.1991-IRV", X11R6.4 */ ++ "ISO646.1991-IRV", /* X11R6.4 */ + ), + ascii, + { ascii_mbtowc, NULL }, { ascii_wctomb, NULL }) +@@ -58,17 +58,14 @@ DEFALIAS( "646", /* Solaris */ + /* General multi-byte encodings */ + + DEFENCODING(( "UTF-8", /* IANA, RFC 2279 */ +- /*"UTF8", JDK 1.1 */ +- /*"CP65001", Windows */ ++ "UTF8", /* JDK 1.1 */ ++ "CP65001", /* Windows */ + ), + utf8, + { utf8_mbtowc, NULL }, { utf8_wctomb, NULL }) +-#ifdef USE_HPUX_ALIASES +-DEFALIAS( "UTF8", /* HP-UX */ +- utf8) +-#endif + + DEFENCODING(( "UCS-2", /* glibc */ ++ "UCS2", /* glibc */ + "ISO-10646-UCS-2", /* IANA */ + "csUnicode", /* IANA */ + ), +@@ -76,22 +73,25 @@ DEFENCODING(( "UCS-2", /* glibc */ + { ucs2_mbtowc, NULL }, { ucs2_wctomb, NULL }) + + DEFENCODING(( "UCS-2BE", /* glibc */ ++ "UCS2BE", /* glibc */ + "UNICODEBIG", /* glibc */ + "UNICODE-1-1", /* IANA */ + "csUnicode11", /* IANA */ +- /*"CP1201", Windows */ ++ "CP1201", /* Windows */ + ), + ucs2be, + { ucs2be_mbtowc, NULL }, { ucs2be_wctomb, NULL }) + + DEFENCODING(( "UCS-2LE", /* glibc */ ++ "UCS2LE", /* glibc */ + "UNICODELITTLE", /* glibc */ +- /*"CP1200", Windows */ ++ "CP1200", /* Windows */ + ), + ucs2le, + { ucs2le_mbtowc, NULL }, { ucs2le_wctomb, NULL }) + + DEFENCODING(( "UCS-4", /* glibc */ ++ "UCS4", /* glibc */ + "ISO-10646-UCS-4", /* IANA */ + "csUCS4", /* IANA */ + ), +@@ -99,43 +99,52 @@ DEFENCODING(( "UCS-4", /* glibc */ + { ucs4_mbtowc, NULL }, { ucs4_wctomb, NULL }) + + DEFENCODING(( "UCS-4BE", /* glibc */ +- /*"CP12001", Windows */ ++ "UCS4BE", /* glibc */ ++ "CP12001", /* Windows */ + ), + ucs4be, + { ucs4be_mbtowc, NULL }, { ucs4be_wctomb, NULL }) + + DEFENCODING(( "UCS-4LE", /* glibc */ +- /*"CP12000", Windows */ ++ "UCS4LE", /* glibc */ ++ "CP12000", /* Windows */ + ), + ucs4le, + { ucs4le_mbtowc, NULL }, { ucs4le_wctomb, NULL }) + + DEFENCODING(( "UTF-16", /* IANA, RFC 2781 */ ++ "UTF16", /* glibc */ + ), + utf16, + { utf16_mbtowc, NULL }, { utf16_wctomb, NULL }) + + DEFENCODING(( "UTF-16BE", /* IANA, RFC 2781 */ ++ "UTF16BE", /* glibc */ + ), + utf16be, + { utf16be_mbtowc, NULL }, { utf16be_wctomb, NULL }) + + DEFENCODING(( "UTF-16LE", /* IANA, RFC 2781 */ ++ "UTF16LE", /* glibc */ ++ "UNICODEFFFE", /* glibc */ + ), + utf16le, + { utf16le_mbtowc, NULL }, { utf16le_wctomb, NULL }) + + DEFENCODING(( "UTF-32", /* IANA, Unicode 3.1 */ ++ "UTF32", /* glibc */ + ), + utf32, + { utf32_mbtowc, NULL }, { utf32_wctomb, NULL }) + + DEFENCODING(( "UTF-32BE", /* IANA, Unicode 3.1 */ ++ "UTF32BE", /* glibc */ + ), + utf32be, + { utf32be_mbtowc, NULL }, { utf32be_wctomb, NULL }) + + DEFENCODING(( "UTF-32LE", /* IANA, Unicode 3.1 */ ++ "UTF32LE", /* glibc */ + ), + utf32le, + { utf32le_mbtowc, NULL }, { utf32le_wctomb, NULL }) +@@ -143,7 +152,7 @@ DEFENCODING(( "UTF-32LE", /* IANA, Unicode 3.1 */ + DEFENCODING(( "UTF-7", /* IANA, RFC 2152 */ + "UNICODE-1-1-UTF-7", /* IANA, RFC 1642 */ + "csUnicode11UTF7", /* IANA */ +- /*"CP65000", Windows */ ++ "CP65000", /* Windows */ + ), + utf7, + { utf7_mbtowc, NULL }, { utf7_wctomb, utf7_reset }) +@@ -190,8 +199,8 @@ DEFENCODING(( "ISO-8859-1", /* IANA */ + "L1", /* IANA */ + "csISOLatin1", /* IANA */ + "ISO8859-1", /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */ +- /*"ISO8859_1", JDK 1.1 */ +- /*"CP28591", Windows */ ++ "ISO8859_1", /* JDK 1.1 */ ++ "CP28591", /* Windows */ + ), + iso8859_1, + { iso8859_1_mbtowc, NULL }, { iso8859_1_wctomb, NULL }) +@@ -208,8 +217,8 @@ DEFENCODING(( "ISO-8859-2", /* IANA */ + "L2", /* IANA */ + "csISOLatin2", /* IANA */ + "ISO8859-2", /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */ +- /*"ISO8859_2", JDK 1.1 */ +- /*"CP28592", Windows */ ++ "ISO8859_2", /* JDK 1.1 */ ++ "CP28592", /* Windows */ + ), + iso8859_2, + { iso8859_2_mbtowc, NULL }, { iso8859_2_wctomb, NULL }) +@@ -226,8 +235,8 @@ DEFENCODING(( "ISO-8859-3", /* IANA */ + "L3", /* IANA */ + "csISOLatin3", /* IANA */ + "ISO8859-3", /* X11R6.4, glibc, FreeBSD, Solaris */ +- /*"ISO8859_3", JDK 1.1 */ +- /*"CP28593", Windows */ ++ "ISO8859_3", /* JDK 1.1 */ ++ "CP28593", /* Windows */ + ), + iso8859_3, + { iso8859_3_mbtowc, NULL }, { iso8859_3_wctomb, NULL }) +@@ -240,8 +249,8 @@ DEFENCODING(( "ISO-8859-4", /* IANA */ + "L4", /* IANA */ + "csISOLatin4", /* IANA */ + "ISO8859-4", /* X11R6.4, glibc, FreeBSD, OSF/1, Solaris */ +- /*"ISO8859_4", JDK 1.1 */ +- /*"CP28594", Windows */ ++ "ISO8859_4", /* JDK 1.1 */ ++ "CP28594", /* Windows */ + ), + iso8859_4, + { iso8859_4_mbtowc, NULL }, { iso8859_4_wctomb, NULL }) +@@ -253,8 +262,8 @@ DEFENCODING(( "ISO-8859-5", /* IANA */ + "CYRILLIC", /* IANA */ + "csISOLatinCyrillic", /* IANA */ + "ISO8859-5", /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */ +- /*"ISO8859_5", JDK 1.1 */ +- /*"CP28595", Windows */ ++ "ISO8859_5", /* JDK 1.1 */ ++ "CP28595", /* Windows */ + ), + iso8859_5, + { iso8859_5_mbtowc, NULL }, { iso8859_5_wctomb, NULL }) +@@ -272,8 +281,8 @@ DEFENCODING(( "ISO-8859-6", /* IANA */ + "ARABIC", /* IANA */ + "csISOLatinArabic", /* IANA */ + "ISO8859-6", /* X11R6.4, glibc, FreeBSD, AIX, Solaris */ +- /*"ISO8859_6", JDK 1.1 */ +- /*"CP28596", Windows */ ++ "ISO8859_6", /* JDK 1.1 */ ++ "CP28596", /* Windows */ + ), + iso8859_6, + { iso8859_6_mbtowc, NULL }, { iso8859_6_wctomb, NULL }) +@@ -293,8 +302,8 @@ DEFENCODING(( "ISO-8859-7", /* IANA, RFC 1947 */ + "GREEK", /* IANA */ + "csISOLatinGreek", /* IANA */ + "ISO8859-7", /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */ +- /*"ISO8859_7", JDK 1.1 */ +- /*"CP28597", Windows */ ++ "ISO8859_7", /* JDK 1.1 */ ++ "CP28597", /* Windows */ + ), + iso8859_7, + { iso8859_7_mbtowc, NULL }, { iso8859_7_wctomb, NULL }) +@@ -310,9 +319,9 @@ DEFENCODING(( "ISO-8859-8", /* IANA */ + "HEBREW", /* IANA */ + "csISOLatinHebrew", /* IANA */ + "ISO8859-8", /* X11R6.4, glibc, FreeBSD, AIX, OSF/1, Solaris */ +- /*"ISO8859_8", JDK 1.1 */ +- /*"CP28598", Windows */ +- /*"CP38598", Windows */ ++ "ISO8859_8", /* JDK 1.1 */ ++ "CP28598", /* Windows */ ++ "CP38598", /* Windows */ + ), + iso8859_8, + { iso8859_8_mbtowc, NULL }, { iso8859_8_wctomb, NULL }) +@@ -329,8 +338,8 @@ DEFENCODING(( "ISO-8859-9", /* IANA */ + "L5", /* IANA */ + "csISOLatin5", /* IANA */ + "ISO8859-9", /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */ +- /*"ISO8859_9", JDK 1.1 */ +- /*"CP28599", Windows */ ++ "ISO8859_9", /* JDK 1.1 */ ++ "CP28599", /* Windows */ + ), + iso8859_9, + { iso8859_9_mbtowc, NULL }, { iso8859_9_wctomb, NULL }) +@@ -364,7 +373,7 @@ DEFENCODING(( "ISO-8859-13", /* IANA, glibc */ + "LATIN7", /* glibc */ + "L7", /* glibc */ + "ISO8859-13", /* glibc, FreeBSD */ +- /*"CP28603", Windows */ ++ "CP28603", /* Windows */ + ), + iso8859_13, + { iso8859_13_mbtowc, NULL }, { iso8859_13_wctomb, NULL }) +@@ -391,7 +400,7 @@ DEFENCODING(( "ISO-8859-15", /* IANA, glibc */ + "ISO-IR-203", + "LATIN-9", /* IANA */ + "ISO8859-15", /* glibc, FreeBSD, AIX, OSF/1, Solaris */ +- /*"CP28605", Windows */ ++ "CP28605", /* Windows */ + ), + iso8859_15, + { iso8859_15_mbtowc, NULL }, { iso8859_15_wctomb, NULL }) +@@ -413,7 +422,7 @@ DEFENCODING(( "ISO-8859-16", /* IANA */ + + DEFENCODING(( "KOI8-R", /* IANA, RFC 1489, X11R6.4, JDK 1.1 */ + "csKOI8R", /* IANA */ +- /*"CP20866", Windows */ ++ "CP20866", /* Windows */ + ), + koi8_r, + { koi8_r_mbtowc, NULL }, { koi8_r_wctomb, NULL }) +@@ -424,7 +433,7 @@ DEFENCODING(( "KOI8-U", /* IANA, RFC 2319 */ + { koi8_u_mbtowc, NULL }, { koi8_u_wctomb, NULL }) + + DEFENCODING(( "KOI8-RU", +- /*"CP21866", Windows */ ++ "CP21866", /* Windows */ + ), + koi8_ru, + { koi8_ru_mbtowc, NULL }, { koi8_ru_wctomb, NULL }) +@@ -548,73 +557,73 @@ DEFENCODING(( "MacRoman", /* JDK 1.1 */ + "MACINTOSH", /* IANA */ + "MAC", /* IANA */ + "csMacintosh", /* IANA */ +- /*"CP10000", Windows */ ++ "CP10000", /* Windows */ + ), + mac_roman, + { mac_roman_mbtowc, NULL }, { mac_roman_wctomb, NULL }) + + DEFENCODING(( "MacCentralEurope", /* JDK 1.1 */ +- /*"CP10029", Windows */ ++ "CP10029", /* Windows */ + ), + mac_centraleurope, + { mac_centraleurope_mbtowc, NULL }, { mac_centraleurope_wctomb, NULL }) + + DEFENCODING(( "MacIceland", /* JDK 1.1 */ +- /*"CP10079", Windows */ ++ "CP10079", /* Windows */ + ), + mac_iceland, + { mac_iceland_mbtowc, NULL }, { mac_iceland_wctomb, NULL }) + + DEFENCODING(( "MacCroatian", /* JDK 1.1 */ +- /*"CP10082", Windows */ ++ "CP10082", /* Windows */ + ), + mac_croatian, + { mac_croatian_mbtowc, NULL }, { mac_croatian_wctomb, NULL }) + + DEFENCODING(( "MacRomania", /* JDK 1.1 */ +- /*"CP10010", Windows */ ++ "CP10010", /* Windows */ + ), + mac_romania, + { mac_romania_mbtowc, NULL }, { mac_romania_wctomb, NULL }) + + DEFENCODING(( "MacCyrillic", /* JDK 1.1 */ +- /*"CP10007", Windows */ ++ "CP10007", /* Windows */ + ), + mac_cyrillic, + { mac_cyrillic_mbtowc, NULL }, { mac_cyrillic_wctomb, NULL }) + + DEFENCODING(( "MacUkraine", /* JDK 1.1 */ +- /*"CP10017", Windows */ ++ "CP10017", /* Windows */ + ), + mac_ukraine, + { mac_ukraine_mbtowc, NULL }, { mac_ukraine_wctomb, NULL }) + + DEFENCODING(( "MacGreek", /* JDK 1.1 */ +- /*"CP10006", Windows */ ++ "CP10006", /* Windows */ + ), + mac_greek, + { mac_greek_mbtowc, NULL }, { mac_greek_wctomb, NULL }) + + DEFENCODING(( "MacTurkish", /* JDK 1.1 */ +- /*"CP10081", Windows */ ++ "CP10081", /* Windows */ + ), + mac_turkish, + { mac_turkish_mbtowc, NULL }, { mac_turkish_wctomb, NULL }) + + DEFENCODING(( "MacHebrew", /* JDK 1.1 */ +- /*"CP10005", Windows */ ++ "CP10005", /* Windows */ + ), + mac_hebrew, + { mac_hebrew_mbtowc, NULL }, { mac_hebrew_wctomb, NULL }) + + DEFENCODING(( "MacArabic", /* JDK 1.1 */ +- /*"CP10004", Windows */ ++ "CP10004", /* Windows */ + ), + mac_arabic, + { mac_arabic_mbtowc, NULL }, { mac_arabic_wctomb, NULL }) + + DEFENCODING(( "MacThai", /* JDK 1.1 */ +- /*"CP10021", Windows */ ++ "CP10021", /* Windows */ + ), + mac_thai, + { mac_thai_mbtowc, NULL }, { mac_thai_wctomb, NULL }) +@@ -739,8 +748,8 @@ DEFENCODING(( "JIS_X0201", /* IANA */ + "JISX0201-1976", + "X0201", /* IANA */ + "csHalfWidthKatakana", /* IANA */ +- /*"JISX0201.1976-0", X11R6.4 */ +- /*"JIS0201", JDK 1.1 */ ++ "JISX0201.1976-0", /* X11R6.4 */ ++ "JIS0201", /* JDK 1.1 */ + ), + jisx0201, + { jisx0201_mbtowc, NULL }, { jisx0201_wctomb, NULL }) +@@ -748,14 +757,13 @@ DEFENCODING(( "JIS_X0201", /* IANA */ + DEFENCODING(( "JIS_X0208", + "JIS_X0208-1983", /* IANA */ + "JIS_X0208-1990", +- "JIS0208", + "X0208", /* IANA */ + "ISO-IR-87", /* IANA */ + "JIS_C6226-1983", /* IANA */ + "csISO87JISX0208", /* IANA */ +- /*"JISX0208.1983-0", X11R6.4 */ +- /*"JISX0208.1990-0", X11R6.4 */ +- /*"JIS0208", JDK 1.1 */ ++ "JISX0208.1983-0", /* X11R6.4 */ ++ "JISX0208.1990-0", /* X11R6.4 */ ++ "JIS0208", /* JDK 1.1 */ + ), + jisx0208, + { jisx0208_mbtowc, NULL }, { jisx0208_wctomb, NULL }) +@@ -766,8 +774,8 @@ DEFENCODING(( "JIS_X0212", + "X0212", /* IANA */ + "ISO-IR-159", /* IANA */ + "csISO159JISX02121990", /* IANA */ +- /*"JISX0212.1990-0", X11R6.4 */ +- /*"JIS0212", JDK 1.1 */ ++ "JISX0212.1990-0", /* X11R6.4 */ ++ "JIS0212", /* JDK 1.1 */ + ), + jisx0212, + { jisx0212_mbtowc, NULL }, { jisx0212_wctomb, NULL }) +@@ -785,7 +793,7 @@ DEFENCODING(( "GB_2312-80", /* IANA */ + "ISO-IR-58", /* IANA */ + "csISO58GB231280", /* IANA */ + "CHINESE", /* IANA */ +- /*"GB2312.1980-0", X11R6.4 */ ++ "GB2312.1980-0", /* X11R6.4 */ + ), + gb2312, + { gb2312_mbtowc, NULL }, { gb2312_wctomb, NULL }) +@@ -802,8 +810,8 @@ DEFENCODING(( "KSC_5601", /* IANA */ + "ISO-IR-149", /* IANA */ + "csKSC56011987", /* IANA */ + "KOREAN", /* IANA */ +- /*"KSC5601.1987-0", X11R6.4 */ +- /*"KSX1001:1992", Ken Lunde */ ++ "KSC5601.1987-0", /* X11R6.4 */ ++ "KSX1001:1992", /* Ken Lunde */ + ), + ksc5601, + { ksc5601_mbtowc, NULL }, { ksc5601_wctomb, NULL }) +@@ -814,8 +822,8 @@ DEFENCODING(( "EUC-JP", /* IANA */ + "EUCJP", /* glibc, HP-UX, IRIX, OSF/1, Solaris */ + "Extended_UNIX_Code_Packed_Format_for_Japanese", /* IANA */ + "csEUCPkdFmtJapanese", /* IANA */ +- /*"EUC_JP", JDK 1.1 */ +- /*"CP51932", Windows */ ++ "EUC_JP", /* JDK 1.1 */ ++ "CP51932", /* Windows */ + ), + euc_jp, + { euc_jp_mbtowc, NULL }, { euc_jp_wctomb, NULL }) +@@ -842,6 +850,7 @@ DEFALIAS( "PCK", /* Solaris */ + #endif + + DEFENCODING(( "CP932", /* glibc */ ++ "WINDOWS-31J", /* IANA */ + ), + cp932, + { cp932_mbtowc, NULL }, { cp932_wctomb, NULL }) +@@ -852,7 +861,7 @@ DEFALIAS( "IBM-932", /* AIX */ + + DEFENCODING(( "ISO-2022-JP", /* IANA, RFC 1468 */ + "csISO2022JP", /* IANA */ +- /*"ISO2022JP", JDK 1.1 */ ++ "ISO2022JP", /* JDK 1.1 */ + ), + iso2022_jp, + { iso2022_jp_mbtowc, NULL }, { iso2022_jp_wctomb, iso2022_jp_reset }) +@@ -870,7 +879,7 @@ DEFENCODING(( "ISO-2022-JP-2", /* IANA, RFC 1554 */ + + DEFENCODING(( "ISO-2022-JP-MS", + "CP50221", +- /*"ISO-2022-JP-ESC", Windows */ ++ "ISO-2022-JP-ESC", /* Windows */ + ), + iso2022_jpms, + { iso2022_jpms_mbtowc, NULL }, { iso2022_jpms_wctomb, iso2022_jpms_reset }) +@@ -880,8 +889,8 @@ DEFENCODING(( "EUC-CN", /* glibc */ + "GB2312", /* IANA */ + "CN-GB", /* RFC 1922 */ + "csGB2312", /* IANA */ +- /*"EUC_CN", JDK 1.1 */ +- /*"CP51936", Windows */ ++ "EUC_CN", /* JDK 1.1 */ ++ "CP51936", /* Windows */ + ), + euc_cn, + { euc_cn_mbtowc, NULL }, { euc_cn_wctomb, NULL }) +@@ -911,14 +920,14 @@ DEFENCODING(( "CP936", /* IANA */ + { cp936_mbtowc, NULL }, { cp936_wctomb, NULL }) + + DEFENCODING(( "GB18030", /* IANA, glibc */ +- /*"CP54936", Windows */ ++ "CP54936", /* Windows */ + ), + gb18030, + { gb18030_mbtowc, NULL }, { gb18030_wctomb, NULL }) + + DEFENCODING(( "ISO-2022-CN", /* IANA, RFC 1922 */ + "csISO2022CN", +- /*"ISO2022CN", JDK 1.1 */ ++ "ISO2022CN", /* JDK 1.1 */ + ), + iso2022_cn, + { iso2022_cn_mbtowc, NULL }, { iso2022_cn_wctomb, iso2022_cn_reset }) +@@ -930,7 +939,7 @@ DEFENCODING(( "ISO-2022-CN-EXT", /* IANA, RFC 1922 */ + + DEFENCODING(( "HZ", /* RFC 1843 */ + "HZ-GB-2312", /* IANA, RFC 1842 */ +- /*"CP52936", Windows */ ++ "CP52936", /* Windows */ + ), + hz, + { hz_mbtowc, NULL }, { hz_wctomb, hz_reset }) +@@ -938,8 +947,8 @@ DEFENCODING(( "HZ", /* RFC 1843 */ + DEFENCODING(( "EUC-TW", /* glibc */ + "EUCTW", /* glibc, HP-UX, IRIX, OSF/1 */ + "csEUCTW", +- /*"EUC_TW", JDK 1.1 */ +- /*"CP51950", Windows */ ++ "EUC_TW", /* JDK 1.1 */ ++ "CP51950", /* Windows */ + ), + euc_tw, + { euc_tw_mbtowc, NULL }, { euc_tw_wctomb, NULL }) +@@ -992,8 +1001,8 @@ DEFENCODING(( "BIG5-HKSCS", /* IANA */ + DEFENCODING(( "EUC-KR", /* IANA, RFC 1557 */ + "EUCKR", /* glibc, HP-UX, IRIX, OSF/1 */ + "csEUCKR", /* IANA */ +- /*"EUC_KR", JDK 1.1 */ +- /*"CP51949", Windows */ ++ "EUC_KR", /* JDK 1.1 */ ++ "CP51949", /* Windows */ + ), + euc_kr, + { euc_kr_mbtowc, NULL }, { euc_kr_wctomb, NULL }) +@@ -1032,8 +1041,8 @@ DEFALIAS( "KO_KR.JOHAP92", /* Solaris */ + + DEFENCODING(( "ISO-2022-KR", /* IANA, RFC 1557 */ + "csISO2022KR", /* IANA */ +- /*"ISO2022KR", JDK 1.1 */ +- /*"CP50225", Windows */ ++ "ISO2022KR", /* JDK 1.1 */ ++ "CP50225", /* Windows */ + ), + iso2022_kr, + { iso2022_kr_mbtowc, NULL }, { iso2022_kr_wctomb, iso2022_kr_reset }) diff --git a/libiconv-1.16-wchar.patch b/libiconv-1.16-wchar.patch new file mode 100644 index 0000000..ed51800 --- /dev/null +++ b/libiconv-1.16-wchar.patch @@ -0,0 +1,92 @@ +commit 6a8348e65546fab85e79cea7da5c5b44c3ac80c9 +Author: Lemures Lemniscati +Date: Sat Jul 11 10:11:35 2020 +0900 + + 1.16-wchar.patch + +diff --git a/libcharset/lib/localcharset.c b/libcharset/lib/localcharset.c +index 3effe1d..462aade 100644 +--- a/libcharset/lib/localcharset.c ++++ b/libcharset/lib/localcharset.c +@@ -51,10 +51,6 @@ + # include + # endif + # endif +-# ifdef __CYGWIN__ +-# define WIN32_LEAN_AND_MEAN +-# include +-# endif + #elif defined WINDOWS_NATIVE + # define WIN32_LEAN_AND_MEAN + # include +@@ -692,64 +688,12 @@ locale_charset (void) + + # if HAVE_LANGINFO_CODESET + +- /* Most systems support nl_langinfo (CODESET) nowadays. */ +- codeset = nl_langinfo (CODESET); +- +-# ifdef __CYGWIN__ +- /* Cygwin < 1.7 does not have locales. nl_langinfo (CODESET) always +- returns "US-ASCII". Return the suffix of the locale name from the +- environment variables (if present) or the codepage as a number. */ +- if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) +- { +- const char *locale; +- static char buf[2 + 10 + 1]; +- +- locale = getenv ("LC_ALL"); +- if (locale == NULL || locale[0] == '\0') +- { +- locale = getenv ("LC_CTYPE"); +- if (locale == NULL || locale[0] == '\0') +- locale = getenv ("LANG"); +- } +- if (locale != NULL && locale[0] != '\0') +- { +- /* If the locale name contains an encoding after the dot, return +- it. */ +- const char *dot = strchr (locale, '.'); +- +- if (dot != NULL) +- { +- const char *modifier; +- +- dot++; +- /* Look for the possible @... trailer and remove it, if any. */ +- modifier = strchr (dot, '@'); +- if (modifier == NULL) +- return dot; +- if (modifier - dot < sizeof (buf)) +- { +- memcpy (buf, dot, modifier - dot); +- buf [modifier - dot] = '\0'; +- return buf; +- } +- } +- } +- +- /* The Windows API has a function returning the locale's codepage as a +- number: GetACP(). This encoding is used by Cygwin, unless the user +- has set the environment variable CYGWIN=codepage:oem (which very few +- people do). +- Output directed to console windows needs to be converted (to +- GetOEMCP() if the console is using a raster font, or to +- GetConsoleOutputCP() if it is using a TrueType font). Cygwin does +- this conversion transparently (see winsup/cygwin/fhandler_console.cc), +- converting to GetConsoleOutputCP(). This leads to correct results, +- except when SetConsoleOutputCP has been called and a raster font is +- in use. */ +- sprintf (buf, "CP%u", GetACP ()); +- codeset = buf; +- } +-# endif ++ /* Most systems support nl_langinfo (CODESET) nowadays. ++ POSIX allows that the returned pointer may point to a static area that ++ may be overwritten by subsequent calls to setlocale or nl_langinfo. */ ++ static char codeset_buf[64]; ++ codeset_buf[0] = '\0'; ++ codeset = strncat (codeset_buf, nl_langinfo (CODESET), sizeof (codeset_buf)); + + if (codeset == NULL) + /* The canonical name cannot be determined. */ diff --git a/sources b/sources deleted file mode 100644 index 62311aa..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -e34509b1623cec449dfeb73d7ce9c6c6 libiconv-1.14.tar.gz -- cgit