4.16.0

3 files changed, 7 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b780d8bf270e..8f59be90d250 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Jun  8 18:57:44 UTC 2018
 pkgbase = mingw-w64-libtasn1
 	pkgdesc = The ASN.1 library used in GNUTLS (mingw-w64)
-	pkgver = 4.13
+	pkgver = 4.16.0
 	pkgrel = 1
 	url = http://www.gnu.org/software/libtasn1
 	arch = any
@@ -12,10 +10,8 @@ pkgbase = mingw-w64-libtasn1
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.13.tar.gz
-	source = 0001-Rename-gnulib-symbols.patch
-	sha256sums = 7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca
-	sha256sums = a2246295cbfa6806095b7a9a0c45bf2acbdd972eee21561a097638edaf9663aa
+	source = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.16.0.tar.gz
+	sha256sums = 0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d
 
 pkgname = mingw-w64-libtasn1
 
diff --git a/0001-Rename-gnulib-symbols.patch b/0001-Rename-gnulib-symbols.patch
deleted file mode 100644
index cd703d3b1fd7..000000000000
--- a/0001-Rename-gnulib-symbols.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Fri, 14 Aug 2015 18:40:16 +0200
-Subject: [PATCH] Rename gnulib symbols
-
----
- configure.ac           | 1 +
- lib/glm4/strverscmp.m4 | 5 +++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 551ad3f..d72b1d6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,6 +35,7 @@ AC_SUBST(LT_AGE, 5)
- AC_PROG_CC
- gl_EARLY
- lgl_EARLY
-+AC_DEFINE([hash_pjw_bare], [libtasn_hash_pjw_bare], [Rename hash_pjw_bare])
- AC_PROG_YACC
- 
- AC_ARG_ENABLE(doc,
-diff --git a/lib/glm4/strverscmp.m4 b/lib/glm4/strverscmp.m4
-index cbcca3f..7a9f2e1 100644
---- a/lib/glm4/strverscmp.m4
-+++ b/lib/glm4/strverscmp.m4
-@@ -14,6 +14,11 @@ AC_DEFUN([gl_FUNC_STRVERSCMP],
-   if test $ac_cv_func_strverscmp = no; then
-     HAVE_STRVERSCMP=0
-   fi
-+
-+  if test "x$HAVE_STRVERSCMP" == "x0"; then
-+    AC_DEFINE([strverscmp], [libtasn_strverscmp], [Rename strverscmp])
-+    AC_DEFINE([__strverscmp], [libtasn_strverscmp], [Rename strverscmp])
-+  fi
- ])
- 
- # Prerequisites of lib/strverscmp.c.
--- 
-2.11.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 652c3bfa7ebc..cccc0f70d630 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-libtasn1
-pkgver=4.13
+pkgver=4.16.0
 pkgrel=1
 pkgdesc="The ASN.1 library used in GNUTLS (mingw-w64)"
 arch=(any)
@@ -8,18 +8,14 @@ license=("GPL3, LGPL")
 makedepends=(mingw-w64-configure)
 depends=(mingw-w64-crt)
 options=(staticlibs !strip !buildflags)
-source=("http://ftp.gnu.org/gnu/libtasn1/libtasn1-${pkgver}.tar.gz"
-        0001-Rename-gnulib-symbols.patch)
-sha256sums=('7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca'
-            'a2246295cbfa6806095b7a9a0c45bf2acbdd972eee21561a097638edaf9663aa')
+source=("http://ftp.gnu.org/gnu/libtasn1/libtasn1-${pkgver}.tar.gz")
+#sha256sums=('7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca'
+sha256sums=('0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "${srcdir}"/libtasn1-${pkgver}
-  # https://cgit.freedesktop.org/gstreamer/cerbero/tree/recipes/libtasn1/0001-Rename-gnulib-symbols.patch
-  patch -p1 -i "${srcdir}"/0001-Rename-gnulib-symbols.patch
-  autoreconf -vfi
 }
 
 build() {