libgc: Update from 7.6.0 to 7.6.2

[termux-packages] / packages / aapt / build.sh

diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh
index ea80ef7..4373c12 100644 (file)
--- a/packages/aapt/build.sh
+++ b/packages/aapt/build.sh
@@ -1,15 +1,17 @@
-# FIXME: We would like to enable checksums when downloading
-# tar files, but they change each time as the tar metadata
-# differs: https://github.com/google/gitiles/issues/84
 TERMUX_PKG_HOMEPAGE=http://elinux.org/Android_aapt
 TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool"
 _TAG_VERSION=7.1.2
 _TAG_REVISION=33
 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli"
 
 termux_step_make_install () {
+       # FIXME: We would like to enable checksums when downloading
+       # tar files, but they change each time as the tar metadata
+       # differs: https://github.com/google/gitiles/issues/84
+
        local _TAGNAME=${_TAG_VERSION}_r${_TAG_REVISION}
 
        SYSTEM_CORE_INCLUDE_TARFILE=$TERMUX_PKG_CACHEDIR/system_core_include_${_TAGNAME}.tar.gz
@@ -198,7 +200,7 @@ termux_step_make_install () {
                zip_archive.cc \
                zip_archive_stream_entry.cc \
                zip_writer.cc"
-       sed -i 's%next_in = reinterpret_cast<const uint8_t\*>(data)%next_in = const_cast<uint8_t\*>(reinterpret_cast<const uint8_t\*>(data))%' zip_writer.cc
+       patch -p0 < $TERMUX_PKG_BUILDER_DIR/libziparchive.patch.txt
        $CXX $CXXFLAGS $LDFLAGS -std=c++11 \
                -DZLIB_CONST \
                -isystem $AOSP_INCLUDE_DIR \
@@ -297,8 +299,8 @@ termux_step_make_install () {
        rm -rf android-jar
        mkdir android-jar
        cd android-jar
-       cp $ANDROID_HOME/platforms/android-26/android.jar .
+       cp $ANDROID_HOME/platforms/android-27/android.jar .
        unzip -q android.jar
        mkdir -p $TERMUX_PREFIX/share/aapt
-       zip -q $TERMUX_PREFIX/share/aapt/android.jar AndroidManifest.xml resources.arsc
+       jar cfM $TERMUX_PREFIX/share/aapt/android.jar AndroidManifest.xml resources.arsc
 }