aria2: Update from 1.19.2 to 1.19.3

diff --git a/packages/aria2/Makefile.am.patch b/packages/aria2/Makefile.am.patch
new file mode 100644 (file)
index 0000000..51a5686
--- /dev/null
+++ b/packages/aria2/Makefile.am.patch
@@ -0,0 +1,24 @@
+diff -u -r ../aria2-1.19.3/src/Makefile.am ./src/Makefile.am
+--- ../aria2-1.19.3/src/Makefile.am    2015-12-06 08:59:48.000000000 -0500
++++ ./src/Makefile.am  2015-12-17 09:25:37.002930095 -0500
+@@ -275,20 +275,6 @@
+ SRCS += android/android.c
+ endif # ANDROID
+ 
+-# Android NDK R8e does not provide ftruncate64. Use assembly code from
+-# android source code and link it.
+-if ANDROID_ARM
+-SRCS += android/arm-ftruncate64.S
+-endif # ANDROID_ARM
+-
+-if ANDROID_MIPS
+-SRCS += android/mips-ftruncate64.S
+-endif # ANDROID_MIPS
+-
+-if ANDROID_X86
+-SRCS += android/x86-ftruncate64.S android/x86-asm.h
+-endif # ANDROID_X86
+-
+ if MINGW_BUILD
+ SRCS += WinConsoleFile.cc WinConsoleFile.h
+ endif # MINGW_BUILD

diff --git a/packages/aria2/Makefile.in.patch b/packages/aria2/Makefile.in.patch
deleted file mode 100644 (file)
index 8e0f2b3..0000000
--- a/packages/aria2/Makefile.in.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -u -r ../aria2-1.18.8/src/Makefile.in ./src/Makefile.in
---- ../aria2-1.18.8/src/Makefile.in    2014-09-11 12:24:36.000000000 -0400
-+++ ./src/Makefile.in  2014-12-21 13:24:10.507656196 -0500
-@@ -84,11 +84,6 @@
- bin_PROGRAMS = aria2c$(EXEEXT)
- @ANDROID_TRUE@am__append_1 = android/android.c
- 
--# Android NDK R8e does not provide ftruncate64. Use assembly code from
--# android source code and link it.
--@ANDROID_ARM_TRUE@am__append_2 = android/arm-ftruncate64.S
--@ANDROID_MIPS_TRUE@am__append_3 = android/mips-ftruncate64.S
--@ANDROID_X86_TRUE@am__append_4 = android/x86-ftruncate64.S android/x86-asm.h
- @MINGW_BUILD_TRUE@am__append_5 = WinConsoleFile.cc WinConsoleFile.h
- @ENABLE_WEBSOCKET_TRUE@am__append_6 = \
- @ENABLE_WEBSOCKET_TRUE@       WebSocketInteractionCommand.cc WebSocketInteractionCommand.h\
-@@ -602,8 +597,6 @@
-       XmlRpcRequestParserController.cc \
-       XmlRpcRequestParserController.h OpenedFileCounter.cc \
-       OpenedFileCounter.h android/android.c \
--      android/arm-ftruncate64.S android/mips-ftruncate64.S \
--      android/x86-ftruncate64.S android/x86-asm.h WinConsoleFile.cc \
-       WinConsoleFile.h WebSocketInteractionCommand.cc \
-       WebSocketInteractionCommand.h WebSocketResponseCommand.cc \
-       WebSocketResponseCommand.h WebSocketSession.cc \
-@@ -801,9 +794,6 @@
-       KeepRunningCommand.cc KeepRunningCommand.h
- am__dirstamp = $(am__leading_dot)dirstamp
- @ANDROID_TRUE@am__objects_1 = android/android.lo
--@ANDROID_ARM_TRUE@am__objects_2 = android/arm-ftruncate64.lo
--@ANDROID_MIPS_TRUE@am__objects_3 = android/mips-ftruncate64.lo
--@ANDROID_X86_TRUE@am__objects_4 = android/x86-ftruncate64.lo
- @MINGW_BUILD_TRUE@am__objects_5 = WinConsoleFile.lo
- @ENABLE_WEBSOCKET_TRUE@am__objects_6 = WebSocketInteractionCommand.lo \
- @ENABLE_WEBSOCKET_TRUE@       WebSocketResponseCommand.lo \
-@@ -1708,12 +1698,6 @@
-       @: > android/$(DEPDIR)/$(am__dirstamp)
- android/android.lo: android/$(am__dirstamp) \
-       android/$(DEPDIR)/$(am__dirstamp)
--android/arm-ftruncate64.lo: android/$(am__dirstamp) \
--      android/$(DEPDIR)/$(am__dirstamp)
--android/mips-ftruncate64.lo: android/$(am__dirstamp) \
--      android/$(DEPDIR)/$(am__dirstamp)
--android/x86-ftruncate64.lo: android/$(am__dirstamp) \
--      android/$(DEPDIR)/$(am__dirstamp)
- 
- libaria2.la: $(libaria2_la_OBJECTS) $(libaria2_la_DEPENDENCIES) $(EXTRA_libaria2_la_DEPENDENCIES) 
-       $(AM_V_CXXLD)$(CXXLINK) $(am_libaria2_la_rpath) $(libaria2_la_OBJECTS) $(libaria2_la_LIBADD) $(LIBS)
-@@ -2199,9 +2183,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version_usage.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wallclock.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@android/$(DEPDIR)/android.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@android/$(DEPDIR)/arm-ftruncate64.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@android/$(DEPDIR)/mips-ftruncate64.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@android/$(DEPDIR)/x86-ftruncate64.Plo@am__quote@
- 
- .S.o:
- @am__fastdepCCAS_TRUE@        $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\

diff --git a/packages/aria2/build.sh b/packages/aria2/build.sh
index eec2f469784337562e2bc81771cd6fa328cb5828..39d334f16e8eec66d39736084631e8a6a5a91484 100644 (file)
--- a/packages/aria2/build.sh
+++ b/packages/aria2/build.sh
@@ -1,9 +1,13 @@
 TERMUX_PKG_HOMEPAGE=http://aria2.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Multi-protocol & multi-source command-line download utility supporting HTTP/HTTPS, FTP, BitTorrent and Metalink"
 TERMUX_PKG_HOMEPAGE=http://aria2.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Multi-protocol & multi-source command-line download utility supporting HTTP/HTTPS, FTP, BitTorrent and Metalink"

-TERMUX_PKG_VERSION=1.19.2
+TERMUX_PKG_VERSION=1.19.3

 TERMUX_PKG_SRCURL=https://github.com/tatsuhiro-t/aria2/releases/download/release-$TERMUX_PKG_VERSION/aria2-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="c-ares, openssl, libxml2, libgnustl"
 # sqlite3 is only used for loading cookies from firefox or chrome:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-openssl --without-gnutls --without-libuv --without-sqlite3 ac_cv_search_getaddrinfo=no ac_cv_func_getaddrinfo=yes ac_cv_func_gettimeofday=yes ac_cv_func_sleep=yes ac_cv_func_usleep=yes ac_cv_func_basename=yes"
 
 TERMUX_PKG_SRCURL=https://github.com/tatsuhiro-t/aria2/releases/download/release-$TERMUX_PKG_VERSION/aria2-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="c-ares, openssl, libxml2, libgnustl"
 # sqlite3 is only used for loading cookies from firefox or chrome:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-openssl --without-gnutls --without-libuv --without-sqlite3 ac_cv_search_getaddrinfo=no ac_cv_func_getaddrinfo=yes ac_cv_func_gettimeofday=yes ac_cv_func_sleep=yes ac_cv_func_usleep=yes ac_cv_func_basename=yes"
 

-export CXXFLAGS="$CXXFLAGS -lgnustl_shared"
+termux_step_pre_configure () {
+       export CXXFLAGS="$CXXFLAGS -lgnustl_shared"
+       cd $TERMUX_PKG_SRCDIR
+       autoreconf
+}