X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/5227dace692e7e6341605042d248dc7e961f7981..02baa030aa6273c97592f6790499f8892cb59223:/packages/libandroid-support/build.sh

diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh
index e5f08bc9..a9f44078 100755
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@@ -1,12 +1,11 @@
 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}.9
+TERMUX_PKG_VERSION=${TERMUX_NDK_VERSION}.10
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_ESSENTIAL=yes
 
 termux_step_post_extract_package () {
-        cd $TERMUX_PKG_SRCDIR
 	mkdir -p src/musl-locale/ src/musl-multibyte/ include/ src/musl-ctype/
 	cp $NDK/sources/android/support/src/musl-multibyte/{mblen.c,mbsrtowcs.c,mbsnrtowcs.c,libc.h,internal.h,internal.c} src/musl-multibyte/
 	cp $NDK/sources/android/support/src/musl-locale/{catclose.c,catgets.c,catopen.c} src/musl-locale/
@@ -15,6 +14,9 @@ termux_step_post_extract_package () {
 
 	cp $NDK/sources/android/support/include/* include/
 	cp $NDK/sources/android/support/src/musl-locale/{libc.h,codepages.h,legacychars.h,jis0208.h,gb18030.h,big5.h,hkscs.h,ksc.h} include/
+
+	# Use up-to-date (Unicode 9) wcwidth:
+	cp $TERMUX_PKG_BUILDER_DIR/wcwidth.c $NDK/sources/android/support/src/musl-ctype/wcwidth.c
 }
 
 termux_step_make_install () {