From 66f3991fb392c98c10c2097fe9fcbaaa520786b7 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 22 Nov 2016 18:51:13 -0500
Subject: [PATCH] Specify zlib as 1.2.8, not 1.2.3 as ndk claims

---
 build-package.sh              | 12 ++++++++++--
 packages/ndk-sysroot/build.sh |  7 +++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/build-package.sh b/build-package.sh
index 667d0fee0..d966918a9 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -581,7 +581,7 @@ fi
 TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}"
 # Bump the below version if a change is made in toolchain setup to ensure
 # that everyone gets an updated toolchain:
-TERMUX_STANDALONE_TOOLCHAIN+="-v2"
+TERMUX_STANDALONE_TOOLCHAIN+="-v3"
 
 # We put this after system PATH to avoid picking up toolchain stripped python
 export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
@@ -684,6 +684,14 @@ if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
 
 	$TERMUX_ELF_CLEANER usr/lib/*.so
 
+	# zlib is really version 1.2.8 in the Android platform (at least
+	# starting from Android 5), not older as the NDK headers claim.
+	for file in zconf.h zlib.h; do
+		curl -o $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/$file \
+		 https://raw.githubusercontent.com/madler/zlib/v1.2.8/$file
+	done
+	unset file
+
 	mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN
 fi
 
@@ -723,7 +731,7 @@ chmod +x $PKG_CONFIG
 cat > $PKG_CONFIG_LIBDIR/zlib.pc <<HERE
 Name: zlib
 Description: zlib compression library
-Version: 1.2.3
+Version: 1.2.8
 
 Requires:
 Libs: -lz
diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh
index 3b2ca55a0..f5d05a760 100644
--- a/packages/ndk-sysroot/build.sh
+++ b/packages/ndk-sysroot/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
 TERMUX_PKG_DESCRIPTION="System header and library files from the Android NDK needed for compiling C programs"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
-TERMUX_PKG_BUILD_REVISION=5
+TERMUX_PKG_BUILD_REVISION=6
 TERMUX_PKG_NO_DEVELSPLIT=yes
 # Depend on libandroid-support-dev so that iconv.h and libintl.h are available:
 TERMUX_PKG_DEPENDS="libandroid-support-dev"
@@ -19,11 +19,10 @@ termux_step_extract_into_massagedir () {
 	cat > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/pkgconfig/zlib.pc <<HERE
 Name: zlib
 Description: zlib compression library
-Version: 1.2.3
+Version: 1.2.8
 
 Requires:
-Libs: -L$TERMUX_PREFIX/lib -lz
-Cflags: -I$TERMUX_PREFIX/include
+Libs: -lz
 HERE
 
 	local LIBATOMIC_PATH=$TERMUX_STANDALONE_TOOLCHAIN/$TERMUX_HOST_PLATFORM/lib