diff options
| -rw-r--r-- | unicode/ChangeLog | 4 | ||||
| -rw-r--r-- | unicode/configure.ac | 2 | ||||
| -rw-r--r-- | unicode/courier-unicode.spec.in | 1 | ||||
| -rw-r--r-- | unicode/m4/.gitignore | 5 | ||||
| -rw-r--r-- | unicode/unicodecpp.C | 3 | ||||
| -rw-r--r-- | unicode/unicodetest.c | 2 |
6 files changed, 15 insertions, 2 deletions
diff --git a/unicode/ChangeLog b/unicode/ChangeLog index 12106dd..42278a8 100644 --- a/unicode/ChangeLog +++ b/unicode/ChangeLog @@ -1,3 +1,7 @@ +2018-04-27 Sam Varshavchik <mrsam@courier-mta.com> + + * gcc 8 update, fix assertions. libtool and toolchain updates. + 2.0 2017-03-06 Sam Varshavchik <mrsam@courier-mta.com> diff --git a/unicode/configure.ac b/unicode/configure.ac index fe6aa3b..dd69461 100644 --- a/unicode/configure.ac +++ b/unicode/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([courier-unicode], [2.0], [courier-users@lists.sourceforge.net]) +AC_INIT([courier-unicode], [2.0.20180427], [courier-users@lists.sourceforge.net]) >confdefs.h # Kill PACKAGE_ macros diff --git a/unicode/courier-unicode.spec.in b/unicode/courier-unicode.spec.in index 143ef77..64c9420 100644 --- a/unicode/courier-unicode.spec.in +++ b/unicode/courier-unicode.spec.in @@ -8,6 +8,7 @@ URL: http://www.courier-mta.org/unicode/ Source: http://download.sourceforge.net/courier/courier-unicode-@VERSION@.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl +BuildRequires: gcc-c++ %package devel Summary: Courier Unicode Library development files diff --git a/unicode/m4/.gitignore b/unicode/m4/.gitignore new file mode 100644 index 0000000..464ba5c --- /dev/null +++ b/unicode/m4/.gitignore @@ -0,0 +1,5 @@ +libtool.m4 +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 diff --git a/unicode/unicodecpp.C b/unicode/unicodecpp.C index 1cec379..51bed3c 100644 --- a/unicode/unicodecpp.C +++ b/unicode/unicodecpp.C @@ -179,6 +179,9 @@ std::string unicode::iconvert::convert(const std::u32string &uc, size_t csize; int err; + if (uc.empty()) + return buf; + if (unicode_convert_fromu_tobuf(&uc[0], uc.size(), dstcharset.c_str(), &c, &csize, &err)) diff --git a/unicode/unicodetest.c b/unicode/unicodetest.c index 08f0b41..b59fab3 100644 --- a/unicode/unicodetest.c +++ b/unicode/unicodetest.c @@ -47,7 +47,7 @@ static void test1() cb.cnt=0; cb.size=sizeof(outputbuf); - if ((h=unicode_convert_init("UCS-4BE", "UTF-8", + if ((h=unicode_convert_init("UCS-4BE", "ISO-8859-1", save_output, &cb)) == NULL) { perror("unicode_convert_init"); |