[termux-packages] / packages / libarchive / archive_write_set_format_zip.c.patch

diff -u -r ../libarchive-3.1.2/libarchive/archive_write_set_format_zip.c ./libarchive/archive_write_set_format_zip.c
--- ../libarchive-3.1.2/libarchive/archive_write_set_format_zip.c	2013-01-14 02:43:45.000000000 +0100
+++ ./libarchive/archive_write_set_format_zip.c	2014-07-15 19:11:00.070843621 +0200
@@ -413,7 +413,10 @@
 			if (strcmp(archive_string_conversion_charset_name(
 			    zip->opt_sconv), "UTF-8") == 0)
 				zip->flags |= ZIP_FLAGS_UTF8_NAME;
-#if HAVE_NL_LANGINFO
+#ifdef __ANDROID__
+                } else if (1) {
+			zip->flags |= ZIP_FLAGS_UTF8_NAME;
+#elif HAVE_NL_LANGINFO
 		} else if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) {
 			zip->flags |= ZIP_FLAGS_UTF8_NAME;
 #endif
Commit	Line	Data
59f0d218 FF	1	diff -u -r ../libarchive-3.1.2/libarchive/archive_write_set_format_zip.c ./libarchive/archive_write_set_format_zip.c
	2	--- ../libarchive-3.1.2/libarchive/archive_write_set_format_zip.c 2013-01-14 02:43:45.000000000 +0100
	3	+++ ./libarchive/archive_write_set_format_zip.c 2014-07-15 19:11:00.070843621 +0200
	4	@@ -413,7 +413,10 @@
	5	if (strcmp(archive_string_conversion_charset_name(
	6	zip->opt_sconv), "UTF-8") == 0)
	7	zip->flags \|= ZIP_FLAGS_UTF8_NAME;
	8	-#if HAVE_NL_LANGINFO
	9	+#ifdef __ANDROID__
	10	+ } else if (1) {
	11	+ zip->flags \|= ZIP_FLAGS_UTF8_NAME;
	12	+#elif HAVE_NL_LANGINFO
	13	} else if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) {
	14	zip->flags \|= ZIP_FLAGS_UTF8_NAME;
	15	#endif