#
#
# patch "charset.cc"
#  from [f71e4e053df8cfde7175a67bf9b6ba0fbbf7368e]
#    to [fe37c21b3438f983aae8f388e09c6dabe6139a03]
# 
# patch "m4/iconv_translit.m4"
#  from [06c1b493c96b704e4ee77c278535f133c5eebb2d]
#    to [678acdf87c07e421eb68ececb8831065a612bc27]
#
============================================================
--- charset.cc	f71e4e053df8cfde7175a67bf9b6ba0fbbf7368e
+++ charset.cc	fe37c21b3438f983aae8f388e09c6dabe6139a03
@@ -50,7 +50,7 @@ charset_convert(string const & src_chars
       string dst_charset_real(dst_charset);
 #ifdef ICONV_TRANSLIT
       if (best_effort)
-        dst_charset_real += "//IGNORE//TRANSLIT";
+        dst_charset_real += "//TRANSLIT";
 #endif
       char * converted = stringprep_convert(src.c_str(),
                                             dst_charset_real.c_str(),
============================================================
--- m4/iconv_translit.m4	06c1b493c96b704e4ee77c278535f133c5eebb2d
+++ m4/iconv_translit.m4	678acdf87c07e421eb68ececb8831065a612bc27
@@ -1,5 +1,5 @@ AC_DEFUN([AC_FUNC_ICONV_TRANSLIT],
 AC_DEFUN([AC_FUNC_ICONV_TRANSLIT],
-[AC_CACHE_CHECK([if iconv supports //IGNORE//TRANSLIT],
+[AC_CACHE_CHECK([if iconv supports //TRANSLIT],
     ac_cv_iconv_translit, [
     am_save_CPPFLAGS="$CPPFLAGS"
     AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
@@ -10,7 +10,7 @@ int main()
 
 int main()
 {
-  iconv_t i = iconv_open("ASCII//IGNORE//TRANSLIT", "UTF-8");
+  iconv_t i = iconv_open("ASCII//TRANSLIT", "UTF-8");
   return i == (iconv_t)(-1);
 }
 ],
@@ -21,5 +21,5 @@ if test "$ac_cv_iconv_translit" = "yes";
     CPPFLAGS="$am_save_CPPFLAGS"
     ])
 if test "$ac_cv_iconv_translit" = "yes"; then
-  AC_DEFINE(ICONV_TRANSLIT, 1, [Define if iconv supports //IGNORE//TRANSLIT.])
+  AC_DEFINE(ICONV_TRANSLIT, 1, [Define if iconv supports //TRANSLIT.])
 fi])