mdw@git.distorted.org.uk Git - termux-packages/blob - packages/libarchive/archive_string.c.patch

   1 diff -u -r ../libarchive-3.1.2/libarchive/archive_string.c ./libarchive/archive_string.c
   2 --- ../libarchive-3.1.2/libarchive/archive_string.c     2013-01-14 02:43:45.000000000 +0100
   3 +++ ./libarchive/archive_string.c       2014-07-15 19:07:54.334848056 +0200
   4 @@ -414,7 +414,9 @@
   5  default_iconv_charset(const char *charset) {
   6         if (charset != NULL && charset[0] != '\0')
   7                 return charset;
   8 -#if HAVE_LOCALE_CHARSET && !defined(__APPLE__)
   9 +#ifdef __ANDROID__
  10 +        return "UTF-8";
  11 +#elif HAVE_LOCALE_CHARSET && !defined(__APPLE__)
  12         /* locale_charset() is broken on Mac OS */
  13         return locale_charset();
  14  #elif HAVE_NL_LANGINFO