upgpkg: mingw-w64-recode 3.7.14-1: new upstream release

4 files changed, 13 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 909b8008d13e..9d6559147172 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-recode
 	pkgdesc = Converts files between various character sets and usages (mingw-w64)
-	pkgver = 3.7.13
+	pkgver = 3.7.14
 	pkgrel = 1
 	url = https://github.com/rrthomas/recode
 	arch = any
@@ -16,11 +16,9 @@ pkgbase = mingw-w64-recode
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://github.com/rrthomas/recode/releases/download/v3.7.13/recode-3.7.13.tar.gz
+	source = https://github.com/rrthomas/recode/releases/download/v3.7.14/recode-3.7.14.tar.gz
 	source = autotools.patch
-	source = help2man.patch
-	sha256sums = 22bbdf79725a59f4d84c3dad63a911c5e8f443f109443c032cad564900b6b733
-	sha256sums = 49d6019103484d4b81188d7eba39f35704a0a92049cdcb0b086e53c134595f1b
-	sha256sums = ca789328432b01ebe066ca594ac611ca43bd19083ed499e88c4410b15cc8492a
+	sha256sums = 786aafd544851a2b13b0a377eac1500f820ce62615ccc2e630b501e7743b9f33
+	sha256sums = 10d2f285ba33589b05713c4c11debfa84a7b7ca2041ec7ecb0fa195b6cc1098e
 
 pkgname = mingw-w64-recode
diff --git a/PKGBUILD b/PKGBUILD
index 807020075870..4f009bd70a4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
 pkgname=mingw-w64-recode
-pkgver=3.7.13
+pkgver=3.7.14
 pkgrel=1
 pkgdesc="Converts files between various character sets and usages (mingw-w64)"
 arch=('any')
@@ -10,11 +10,9 @@ depends=('mingw-w64-crt' 'mingw-w64-gettext')
 options=('!strip' '!buildflags' 'staticlibs')
 makedepends=('mingw-w64-gcc' 'mingw-w64-configure' 'mingw-w64-wine' 'python' 'help2man')
 source=("https://github.com/rrthomas/recode/releases/download/v${pkgver}/recode-${pkgver}.tar.gz"
-        "autotools.patch"
-        "help2man.patch")
-sha256sums=('22bbdf79725a59f4d84c3dad63a911c5e8f443f109443c032cad564900b6b733'
-            '49d6019103484d4b81188d7eba39f35704a0a92049cdcb0b086e53c134595f1b'
-            'ca789328432b01ebe066ca594ac611ca43bd19083ed499e88c4410b15cc8492a')
+        "autotools.patch")
+sha256sums=('786aafd544851a2b13b0a377eac1500f820ce62615ccc2e630b501e7743b9f33'
+	    '10d2f285ba33589b05713c4c11debfa84a7b7ca2041ec7ecb0fa195b6cc1098e')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
@@ -24,7 +22,6 @@ prepare() {
   libtoolize
 
   patch -Np1 -i ${srcdir}/autotools.patch
-  patch -Np1 -i ${srcdir}/help2man.patch
 }
 
 build() {
diff --git a/autotools.patch b/autotools.patch
index 3173ed600fb2..106934fd819c 100644
--- a/autotools.patch
+++ b/autotools.patch
@@ -30,7 +30,7 @@ diff -ruN recode-3.7.6/configure patched/configure
 diff -ruN recode-3.7.6/configure.ac patched/configure.ac
 --- recode-3.7.6/configure.ac	2019-09-13 14:23:45.000000000 +0200
 +++ patched/configure.ac	2019-10-03 12:41:04.101747962 +0200
-@@ -113,5 +113,13 @@
+@@ -111,6 +111,14 @@
  AM_GNU_GETTEXT(external)
  AM_XGETTEXT_OPTION([--from-code=UTF-8])
  
@@ -42,8 +42,10 @@ diff -ruN recode-3.7.6/configure.ac patched/configure.ac
 +AC_MSG_RESULT([$LIBRECODE_LDFLAGS])
 +AC_SUBST([LIBRECODE_LDFLAGS])
 +
- AC_OUTPUT(Makefile contrib/Makefile doc/Makefile lib/Makefile
-           po/Makefile.in src/Makefile tests/Makefile tests/setup.py)
+ AC_CONFIG_FILES([Makefile contrib/Makefile doc/Makefile lib/Makefile
+           po/Makefile.in src/Makefile tests/Makefile tests/setup.py])
+ AC_OUTPUT
+
 diff -ruN recode-3.7.6/m4/libtool.m4 patched/m4/libtool.m4
 --- recode-3.7.6/m4/libtool.m4	2016-02-08 00:39:37.000000000 +0100
 +++ patched/m4/libtool.m4	2019-10-03 12:41:04.105081310 +0200
diff --git a/help2man.patch b/help2man.patch
deleted file mode 100644
index 46fc9c86da00..000000000000
--- a/help2man.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN recode-3.7/src/Makefile.am patched/src/Makefile.am
---- recode-3.7/src/Makefile.am	2018-10-04 00:47:09.733993844 +0200
-+++ patched/src/Makefile.am	2018-10-04 00:45:21.051955465 +0200
-@@ -104,7 +104,7 @@
- 	$(AM_V_GEN)if ( touch $@.w && rm -f $@.w; ) >/dev/null 2>&1; then \
- 	  $(top_srcdir)/build-aux/missing --run $(HELP2MAN) \
- 		--name="converts files between character sets" \
--		--output=$@ ./recode; \
-+		--output=$@ ./recode$(EXEEXT); \
- 	fi
- 
- main.o: main.c ../config.status