From fa85bc7b3ef017b35e73873d4678249bd65c5afd Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 13 Jul 2015 02:50:34 -0400 Subject: [PATCH] libandroid-support: Fix dangling extern C linkage in libintl.h --- packages/libandroid-support/build.sh | 2 +- packages/libandroid-support/libintl.h.patch | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh index 1efb9aeea..65ecc4311 100755 --- a/packages/libandroid-support/build.sh +++ b/packages/libandroid-support/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html TERMUX_PKG_DESCRIPTION="Library extending the Android C library (Bionic) for additional multibyte, locale and math support" # Increase last digit each time a patch changes. -TERMUX_PKG_VERSION=${TERMUX_NDK_VERSION}.3 +TERMUX_PKG_VERSION=${TERMUX_NDK_VERSION}.4 TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_ESSENTIAL=yes diff --git a/packages/libandroid-support/libintl.h.patch b/packages/libandroid-support/libintl.h.patch index 1290993f2..421726589 100644 --- a/packages/libandroid-support/libintl.h.patch +++ b/packages/libandroid-support/libintl.h.patch @@ -1,7 +1,7 @@ diff -N -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/libintl.h ./include/libintl.h --- /home/fornwall/lib/android-ndk/sources/android/support/include/libintl.h 1969-12-31 19:00:00.000000000 -0500 +++ ./include/libintl.h 2014-11-27 10:50:18.306215538 -0500 -@@ -0,0 +1,35 @@ +@@ -0,0 +1,39 @@ +#ifndef NDK_ANDROID_SUPPORT_LIBINTL_H +#define NDK_ANDROID_SUPPORT_LIBINTL_H + @@ -36,4 +36,8 @@ diff -N -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/lib +/* Specify the character encoding in which the messages from the DOMAINNAME message catalog will be returned. */ +char *bind_textdomain_codeset (const char *__domainname, const char *__codeset); + ++#ifdef __cplusplus ++} ++#endif ++ +#endif // NDK_ANDROID_SUPPORT_LIBINTL_H