diff options
| author | Maksim <MoNTE48@mail.ua> | 2020-01-13 07:10:15 +0100 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2020-01-13 07:10:15 +0100 |
| commit | c3968006298bcce46e7659d11c6cbee56bbed4f0 (patch) | |
| tree | e08577089c4b7e5d8e3fe3c60b2aecedbb8a54ae /build | |
| parent | 8d75c118d99b3ccf383ceb3b7bbc9b84a1d837b2 (diff) | |
| download | minetest-c3968006298bcce46e7659d11c6cbee56bbed4f0.tar.gz minetest-c3968006298bcce46e7659d11c6cbee56bbed4f0.tar.bz2 minetest-c3968006298bcce46e7659d11c6cbee56bbed4f0.zip | |
Android: fix cyrillic characters, update iconv lib (#9117)
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/Makefile | 5 | ||||
| -rw-r--r-- | build/android/patches/libiconv_android.patch | 39 | ||||
| -rw-r--r-- | build/android/patches/libiconv_stdio.patch | 13 |
3 files changed, 1 insertions, 56 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index c5a21c290..9ec237a75 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -112,7 +112,7 @@ FREETYPE_TIMESTAMP = $(FREETYPE_DIR)timestamp FREETYPE_TIMESTAMP_INT = $(ANDR_ROOT)/deps/freetype_timestamp FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android -ICONV_VERSION = 1.14 +ICONV_VERSION = 1.16 ICONV_DIR = $(ANDR_ROOT)/deps/libiconv/ ICONV_LIB = $(ICONV_DIR)/lib/.libs/libiconv.so ICONV_TIMESTAMP = $(ICONV_DIR)timestamp @@ -445,9 +445,6 @@ iconv_download : tar -xzf libiconv-${ICONV_VERSION}.tar.gz || exit 1; \ rm libiconv-${ICONV_VERSION}.tar.gz; \ ln -s libiconv-${ICONV_VERSION} libiconv; \ - cd ${ICONV_DIR}; \ - patch -p1 < ${ANDR_ROOT}/patches/libiconv_android.patch; \ - patch -p1 < ${ANDR_ROOT}/patches/libiconv_stdio.patch; \ fi iconv : $(ICONV_LIB) diff --git a/build/android/patches/libiconv_android.patch b/build/android/patches/libiconv_android.patch deleted file mode 100644 index 4eca0a4ef..000000000 --- a/build/android/patches/libiconv_android.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/libcharset/lib/localcharset.c 2015-06-10 11:55:25.933870724 +0200 -+++ b/libcharset/lib/localcharset.c 2015-06-10 11:55:39.578063493 +0200 -@@ -47,7 +47,7 @@ - - #if !defined WIN32_NATIVE - # include <unistd.h> --# if HAVE_LANGINFO_CODESET -+# if HAVE_LANGINFO_CODESET && !(defined __ANDROID__) - # include <langinfo.h> - # else - # if 0 /* see comment below */ -@@ -124,7 +124,7 @@ get_charset_aliases (void) - cp = charset_aliases; - if (cp == NULL) - { --#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) -+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__ || defined __ANDROID__) - const char *dir; - const char *base = "charset.alias"; - char *file_name; -@@ -338,6 +338,9 @@ get_charset_aliases (void) - "CP54936" "\0" "GB18030" "\0" - "CP65001" "\0" "UTF-8" "\0"; - # endif -+# if defined __ANDROID__ -+ cp = "*" "\0" "UTF-8" "\0"; -+# endif - #endif - - charset_aliases = cp; -@@ -361,7 +364,7 @@ locale_charset (void) - const char *codeset; - const char *aliases; - --#if !(defined WIN32_NATIVE || defined OS2) -+#if !(defined WIN32_NATIVE || defined OS2 || defined __ANDROID__) - - # if HAVE_LANGINFO_CODESET - diff --git a/build/android/patches/libiconv_stdio.patch b/build/android/patches/libiconv_stdio.patch deleted file mode 100644 index 9fa50f79a..000000000 --- a/build/android/patches/libiconv_stdio.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/srclib/stdio.in.h 2011-08-07 15:42:06.000000000 +0200 -+++ b/srclib/stdio.in.h 2015-06-10 09:27:58.129056262 +0200 -@@ -695,8 +696,9 @@ _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+/*_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");*/ -+#define gets(a) fgets( a, sizeof(*(a)), stdin) - #endif - - -#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ |