From 86d718feda93e6d61dd50436f3eaba1058a8630a Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Tue, 20 Oct 2015 08:22:21 +0300
Subject: [PATCH] aria2: Update to 1.19.2

---
 mingw-w64-aria2/PKGBUILD              | 17 +++-----
 mingw-w64-aria2/mingw-inline.patch    | 62 ---------------------------
 mingw-w64-aria2/windows-libintl.patch | 14 ------
 3 files changed, 6 insertions(+), 87 deletions(-)
 delete mode 100644 mingw-w64-aria2/mingw-inline.patch
 delete mode 100644 mingw-w64-aria2/windows-libintl.patch

diff --git a/mingw-w64-aria2/PKGBUILD b/mingw-w64-aria2/PKGBUILD
index 3c5eb854db..6f08c1aae6 100644
--- a/mingw-w64-aria2/PKGBUILD
+++ b/mingw-w64-aria2/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: David Macek <david.macek.0@gmail.com>
 
 _realname=aria2
+pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.19.0
-pkgrel=2
+pkgver=1.19.2
+pkgrel=1
 pkgdesc="A multi-protocol & multi-source, cross platform download utility (mingw-w64)"
 arch=('any')
 url="http://aria2.sourceforge.net/"
@@ -23,18 +24,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          )
 optdepends=("${MINGW_PACKAGE_PREFIX}-ruby: aria2rpc and aria2mon")
-source=(${_realname}-${pkgver}.tar.gz::https://github.com/tatsuhiro-t/aria2/archive/release-${pkgver}.tar.gz
-        'mingw-inline.patch'
-        'windows-libintl.patch')
-md5sums=('efc081865ed268e13f6beeb735a12dad'
-         '87cb82e55fb023021980e1c6994e42ff'
-         '25d25975420c8ca3c3dbffe3d89fa657')
+source=(${_realname}-${pkgver}.tar.gz::https://github.com/tatsuhiro-t/aria2/archive/release-${pkgver}.tar.gz)
+md5sums=('38e18cb9856bc592c5fc8c2dd687bf38')
 
 prepare() {
   cd "${_realname}-release-${pkgver}"
-  patch -p1 -i "${srcdir}/mingw-inline.patch"
-  patch -p1 -i "${srcdir}/windows-libintl.patch"
-  autoreconf -fi
+  autoreconf -fiv
 }
 
 build() {
diff --git a/mingw-w64-aria2/mingw-inline.patch b/mingw-w64-aria2/mingw-inline.patch
deleted file mode 100644
index 3be9077059..0000000000
--- a/mingw-w64-aria2/mingw-inline.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- aria2-1.18.10/configure.ac.orig	2015-02-23 15:34:01.000000000 +0100
-+++ aria2-1.18.10/configure.ac	2015-04-02 21:03:27.947473400 +0200
-@@ -29,9 +29,10 @@
-   *mingw*)
-     win_build=yes
-     LIBS="$LIBS -lws2_32 -lwsock32 -lgdi32 -lwinmm -liphlpapi -lpsapi"
--    # C++ headers defines __USE_MINGW_ANSI_STDIO to 1 unconditionally.
--    # We have to use it as well nonetheless.
--    CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS"
-+    # Define _POSIX_C_SOURCE to 1. This makes {asc,local}time_r available
-+    # from <time.h> even without (un)helpful interference from <pthread.h>,
-+    # and also defines __USE_MINGW_ANSI_STDIO.
-+    CPPFLAGS="-D_POSIX_C_SOURCE=1 $CPPFLAGS"
-     # Build with ASLR (dynamicbase) and NX compatiblity (nxcompat)
-     # Enable pie once upstream/binutils gets fixed to produce correct binaries with it.
-     LDFLAGS="$LDFLAGS -Wl,--dynamicbase -Wl,--nxcompat"
-@@ -840,10 +840,32 @@
-   [test "x$have_posix_fallocate" = "xyes" || test "x$have_fallocate" = "xyes" \
-   || test "x$have_osx" = "xyes" || test "x$win_build" = "xyes"])
-
-+AC_MSG_CHECKING([for asctime_r])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-+    #include <time.h>
-+  ]], [[
-+    struct tm r; char *c;
-+    asctime_r(&r, c);
-+  ]])],
-+  [AM_CONDITIONAL([HAVE_ASCTIME_R], true)
-+   AC_MSG_RESULT([yes])
-+   AC_DEFINE([HAVE_ASCTIME_R], [1], [Define to 1 if you have the `asctime_r' function or macro.])],
-+  [AC_MSG_RESULT([no])
-+   AM_CONDITIONAL([HAVE_ASCTIME_R], false)])
-+
-+AC_MSG_CHECKING([for localtime_r])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-+    #include <time.h>
-+  ]], [[
-+    time_t t; struct tm r;
-+    localtime_r(&t, &r);
-+  ]])],
-+  [AM_CONDITIONAL([HAVE_LOCALTIME_R], true)
-+   AC_MSG_RESULT([yes])
-+   AC_DEFINE([HAVE_LOCALTIME_R], [1], [Define to 1 if you have the `localtime_r' function or macro.])],
-+  [AC_MSG_RESULT([no])
-+   AM_CONDITIONAL([HAVE_LOCALTIME_R], false)])
-
--AC_CHECK_FUNCS([asctime_r],
--	[AM_CONDITIONAL([HAVE_ASCTIME_R], true)],
--	[AM_CONDITIONAL([HAVE_ASCTIME_R], false)])
- AC_CHECK_FUNCS([basename],
- 	[AM_CONDITIONAL([HAVE_BASENAME], true)],
- 	[AM_CONDITIONAL([HAVE_BASENAME], false)])
-@@ -855,9 +873,6 @@
- AC_CHECK_FUNCS([gettimeofday],
- 	[AM_CONDITIONAL([HAVE_GETTIMEOFDAY], true)],
- 	[AM_CONDITIONAL([HAVE_GETTIMEOFDAY], false)])
--AC_CHECK_FUNCS([localtime_r],
--	[AM_CONDITIONAL([HAVE_LOCALTIME_R], true)],
--	[AM_CONDITIONAL([HAVE_LOCALTIME_R], false)])
- AC_CHECK_FUNCS([strptime],
- 	[AM_CONDITIONAL([HAVE_STRPTIME], true)],
- 	[AM_CONDITIONAL([HAVE_STRPTIME], false)])
diff --git a/mingw-w64-aria2/windows-libintl.patch b/mingw-w64-aria2/windows-libintl.patch
deleted file mode 100644
index 8f5738cef4..0000000000
--- a/mingw-w64-aria2/windows-libintl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- aria2-1.18.10/src/Makefile.am.orig	2015-04-02 22:02:29.635051500 +0200
-+++ aria2-1.18.10/src/Makefile.am	2015-04-02 22:02:39.234635300 +0200
-@@ -713,9 +713,9 @@
- 
- libaria2_la_SOURCES = $(SRCS)
- 
--libaria2_la_LIBADD = @WSLAY_LIBS@
-+libaria2_la_LIBADD = @WSLAY_LIBS@ @LTLIBINTL@
- 
--LDADD = libaria2.la @LIBINTL@ @ALLOCA@ #-lprofiler
-+LDADD = libaria2.la @ALLOCA@ #-lprofiler
- #aria2c_LDFLAGS = -pg
- AM_CPPFLAGS =  -Wall\
- 	-I$(top_srcdir)/lib -I$(top_srcdir)/intl\