upgpkg: mingw-w64-recode 3.7.7-1

new upstream release

3 files changed, 7 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1241504f42eb..459e9c13f7a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Oct  7 22:12:07 UTC 2019
 pkgbase = mingw-w64-recode
 	pkgdesc = Converts files between various character sets and usages (mingw-w64)
-	pkgver = 3.7.6
-	pkgrel = 2
+	pkgver = 3.7.7
+	pkgrel = 1
 	url = https://github.com/rrthomas/recode
 	arch = any
 	license = GPL3
@@ -18,10 +16,10 @@ pkgbase = mingw-w64-recode
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://github.com/rrthomas/recode/releases/download/v3.7.6/recode-3.7.6.tar.gz
+	source = https://github.com/rrthomas/recode/releases/download/v3.7.7/recode-3.7.7.tar.gz
 	source = autotools.patch
 	source = help2man.patch
-	sha256sums = 46c5828ac6f5fb759ecf98b16a674188d901b84675b0dbbc0afc03c542d3a954
+	sha256sums = 0946f63b706719e6aa74ea5c0c2276c265ca1ced2cb44e05f2b5654c0e7f38fb
 	sha256sums = 4f431b274c5bba1f00325285c59825032c35893da61a539439d605839d8e906c
 	sha256sums = ca789328432b01ebe066ca594ac611ca43bd19083ed499e88c4410b15cc8492a
 
diff --git a/PKGBUILD b/PKGBUILD
index 3feb18aad9d1..1f2b5bc286ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
 pkgname=mingw-w64-recode
-pkgver=3.7.6
-pkgrel=2
+pkgver=3.7.7
+pkgrel=1
 pkgdesc="Converts files between various character sets and usages (mingw-w64)"
 arch=('any')
 url='https://github.com/rrthomas/recode'
@@ -12,7 +12,7 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-configure' 'mingw-w64-wine' 'python' 'he
 source=("https://github.com/rrthomas/recode/releases/download/v${pkgver}/recode-${pkgver}.tar.gz"
         "autotools.patch"
         "help2man.patch")
-sha256sums=('46c5828ac6f5fb759ecf98b16a674188d901b84675b0dbbc0afc03c542d3a954'
+sha256sums=('0946f63b706719e6aa74ea5c0c2276c265ca1ced2cb44e05f2b5654c0e7f38fb'
             '4f431b274c5bba1f00325285c59825032c35893da61a539439d605839d8e906c'
             'ca789328432b01ebe066ca594ac611ca43bd19083ed499e88c4410b15cc8492a')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
diff --git a/mingw.patch b/mingw.patch
deleted file mode 100644
index 9d9b25ef48df..000000000000
--- a/mingw.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ru pinard-Recode-2127b34/src/common.h patched/src/common.h
---- pinard-Recode-2127b34/src/common.h	2008-02-19 05:13:35.000000000 +0100
-+++ patched/src/common.h	2014-01-01 01:31:11.144541519 +0100
-@@ -106,7 +106,7 @@
- # endif
- #endif
- 
--#include <argmatch.h>
-+#include "argmatch.h"
- 
- #include <errno.h>
- #ifndef errno
-diff -ru pinard-Recode-2127b34/src/task.c patched/src/task.c
---- pinard-Recode-2127b34/src/task.c	2008-02-19 05:13:35.000000000 +0100
-+++ patched/src/task.c	2014-01-01 01:25:00.459235302 +0100
-@@ -25,7 +25,9 @@
- 
- #include <sys/types.h>
- 
-+#ifndef __MINGW32__
- #include <sys/wait.h>
-+#endif
- /* Bruno suggests the following, from GNU make 3.79.0.2 in `job.c'.  He also
-    remarks that on Linux, WEXITSTATUS are bits 15..8 and WTERMSIG are bits
-    7..0, while BeOS uses the contrary.  */
---- pinard-Recode-2127b34/src/argmatch.c	2008-02-19 05:13:35.000000000 +0100
-+++ patched/src/argmatch.c	2014-01-01 14:53:19.232440132 +0100
-@@ -159,7 +159,12 @@
- 			? _("invalid argument %s for `%s'")
- 			: _("ambiguous argument %s for `%s'"));
- 
-+#ifdef __MINGW32__
-+  printf(format, quotearg_style (ARGMATCH_QUOTING_STYLE, value), context);
-+  exit(0); 
-+#else
-   error (0, 0, format, quotearg_style (ARGMATCH_QUOTING_STYLE, value), context);
-+#endif
- }
- 
- /* List the valid arguments for argmatch.
---- pinard-Recode-2127b34/src/xmalloc.c	2008-02-19 05:13:35.000000000 +0100
-+++ patched/src/xmalloc.c	2014-01-01 14:54:28.480302476 +0100
-@@ -70,10 +70,14 @@
- {
-   if (xalloc_fail_func)
-     (*xalloc_fail_func) ();
-+#ifdef __MINGW32__
-+  printf("%s", _(xalloc_msg_memory_exhausted));
-+#else
-   error (xalloc_exit_failure, 0, "%s", _(xalloc_msg_memory_exhausted));
-   /* The `noreturn' cannot be given to error, since it may return if
-      its first argument is 0.  To help compilers understand the
-      xalloc_die does terminate, call exit. */
-+#endif
-   exit (EXIT_FAILURE);
- }
-